You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2012/08/16 17:18:16 UTC
svn commit: r1373879 - in /incubator/syncope/trunk/console/src/main:
java/org/apache/syncope/console/pages/
java/org/apache/syncope/console/pages/panels/
java/org/apache/syncope/console/rest/
resources/org/apache/syncope/console/pages/ resources/org/ap...
Author: mdisabatino
Date: Thu Aug 16 15:18:15 2012
New Revision: 1373879
URL: http://svn.apache.org/viewvc?rev=1373879&view=rev
Log:
Fixes SYNCOPE-147 add refresh button in task and report modal windows
Added:
incubator/syncope/trunk/console/src/main/webapp/img/reload.png (with props)
Modified:
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ReportRestClient.java
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResultSetPanel.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java Thu Aug 16 15:18:15 2012
@@ -61,6 +61,7 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.commons.HttpResourceStream;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
import org.apache.syncope.console.markup.html.CrontabContainer;
+import org.apache.syncope.console.pages.TaskModalPage.TaskExecutionsProvider;
import org.apache.syncope.console.rest.ReportRestClient;
import org.apache.syncope.console.wicket.ajax.form.AbstractAjaxDownloadBehavior;
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
@@ -464,6 +465,29 @@ public class ReportModalPage extends Bas
final AjaxFallbackDefaultDataTable table = new AjaxFallbackDefaultDataTable("executionsTable", columns,
new ReportExecutionsProvider(reportTO), 10);
executions.add(table);
+
+ final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (target != null) {
+ final ReportTO currentReportTO = reportTO.getId() == 0
+ ? reportTO
+ : restClient.read(reportTO.getId());
+ reportTO.setExecutions(currentReportTO.getExecutions());
+ final AjaxFallbackDefaultDataTable currentTable =
+ new AjaxFallbackDefaultDataTable("executionsTable", columns,
+ new ReportExecutionsProvider(reportTO), 10);
+ currentTable.setOutputMarkupId(true);
+ executions.addOrReplace(currentTable);
+ target.add(currentTable);
+ target.add(executions);
+ }
+ }
+ };
+
+ executions.add(reload);
}
public void setExportFormat(final String exportFormat) {
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Thu Aug 16 15:18:15 2012
@@ -74,6 +74,9 @@ import org.apache.syncope.console.wicket
import org.apache.syncope.types.AuditElements.Category;
import org.apache.syncope.types.AuditElements.Result;
import org.apache.syncope.types.AuditLoggerName;
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.ComponentTag;
/**
* Auditing and Reporting.
@@ -216,6 +219,36 @@ public class Reports extends BasePage {
reportContainer.add(reportTable);
reportContainer.setOutputMarkupId(true);
+
+ final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (target != null) {
+ target.add(reportTable);
+ }
+ }
+ };
+
+ reload.add(new Behavior() {
+
+ private static final long serialVersionUID = 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+
+ if (reportTable.getRowCount() > paginatorRows) {
+ tag.remove("class");
+ tag.put("class", "settingsPosMultiPage");
+ } else {
+ tag.remove("class");
+ tag.put("class", "settingsPos");
+ }
+ }
+ });
+
+ reportContainer.add(reload);
add(reportContainer);
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java Thu Aug 16 15:18:15 2012
@@ -37,6 +37,8 @@ import org.apache.syncope.console.wicket
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -74,17 +76,6 @@ public abstract class TaskModalPage exte
protected Form form;
public TaskModalPage(final TaskTO taskTO) {
- final TaskTO actual = taskTO.getId() == 0
- ? taskTO
- : taskTO instanceof PropagationTaskTO
- ? taskRestClient.readPropagationTask(taskTO.getId())
- : taskTO instanceof NotificationTaskTO
- ? taskRestClient.readNotificationTask(taskTO.getId())
- : taskTO instanceof SyncTaskTO
- ? taskRestClient.readSchedTask(SyncTaskTO.class, taskTO.getId())
- : taskRestClient.readSchedTask(SchedTaskTO.class, taskTO.getId());
-
- taskTO.setExecutions(actual.getExecutions());
final ModalWindow taskExecMessageWin = new ModalWindow("taskExecMessageWin");
taskExecMessageWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
@@ -183,9 +174,28 @@ public abstract class TaskModalPage exte
});
final AjaxFallbackDefaultDataTable table = new AjaxFallbackDefaultDataTable("executionsTable", columns,
- new TaskExecutionsProvider(taskTO), 10);
+ new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), 10);
executions.add(table);
+
+ final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (target != null) {
+ final AjaxFallbackDefaultDataTable currentTable =
+ new AjaxFallbackDefaultDataTable("executionsTable", columns,
+ new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), 10);
+ currentTable.setOutputMarkupId(true);
+ executions.addOrReplace(currentTable);
+ target.add(currentTable);
+ target.add(executions);
+ }
+ }
+ };
+
+ executions.add(reload);
}
protected static class TaskExecutionsProvider extends SortableDataProvider<TaskExecTO> {
@@ -232,4 +242,19 @@ public abstract class TaskModalPage exte
};
}
}
+
+ private TaskTO getCurrentTaskExecution(final TaskTO taskTO) {
+ final TaskTO currentTask = taskTO.getId() == 0
+ ? taskTO
+ : taskTO instanceof PropagationTaskTO
+ ? taskRestClient.readPropagationTask(taskTO.getId())
+ : taskTO instanceof NotificationTaskTO
+ ? taskRestClient.readNotificationTask(taskTO.getId())
+ : taskTO instanceof SyncTaskTO
+ ? taskRestClient.readSchedTask(SyncTaskTO.class, taskTO.getId())
+ : taskRestClient.readSchedTask(SchedTaskTO.class, taskTO.getId());
+
+ taskTO.setExecutions(currentTask.getExecutions());
+ return taskTO;
+ }
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java Thu Aug 16 15:18:15 2012
@@ -20,15 +20,32 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.List;
+import org.apache.syncope.client.to.NotificationTaskTO;
+import org.apache.syncope.client.to.TaskTO;
+import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
+import org.apache.syncope.console.commons.PreferenceManager;
+import org.apache.syncope.console.commons.XMLRolesReader;
+import org.apache.syncope.console.pages.NotificationTaskModalPage;
+import org.apache.syncope.console.pages.Tasks;
+import org.apache.syncope.console.pages.Tasks.TasksProvider;
+import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
+import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -39,19 +56,6 @@ import org.apache.wicket.model.PropertyM
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.client.to.NotificationTaskTO;
-import org.apache.syncope.client.to.PropagationTaskTO;
-import org.apache.syncope.client.to.TaskTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.commons.Constants;
-import org.apache.syncope.console.commons.PreferenceManager;
-import org.apache.syncope.console.commons.XMLRolesReader;
-import org.apache.syncope.console.pages.NotificationTaskModalPage;
-import org.apache.syncope.console.pages.Tasks;
-import org.apache.syncope.console.pages.Tasks.TasksProvider;
-import org.apache.syncope.console.rest.TaskRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
-import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
public class NotificationTasks extends Panel {
@@ -187,8 +191,36 @@ public class NotificationTasks extends P
container.add(table);
- window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
+ final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (target != null) {
+ target.add(table);
+ }
+ }
+ };
+
+ reload.add(new Behavior() {
+
+ private static final long serialVersionUID = 1469628524240283489L;
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+
+ if (table.getRowCount() > paginatorRows) {
+ tag.remove("class");
+ tag.put("class", "settingsPosMultiPage");
+ } else {
+ tag.remove("class");
+ tag.put("class", "settingsPos");
+ }
+ }
+ });
+
+ container.add(reload);
+ window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
private static final long serialVersionUID = 8804221891699487139L;
@Override
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java Thu Aug 16 15:18:15 2012
@@ -20,16 +20,34 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.List;
-
+import org.apache.syncope.client.to.PropagationTaskTO;
+import org.apache.syncope.client.to.TaskTO;
+import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
+import org.apache.syncope.console.commons.PreferenceManager;
+import org.apache.syncope.console.commons.XMLRolesReader;
+import org.apache.syncope.console.pages.PropagationTaskModalPage;
+import org.apache.syncope.console.pages.Tasks;
+import org.apache.syncope.console.pages.Tasks.TasksProvider;
+import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
+import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
+import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxFallbackLink;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -40,19 +58,6 @@ import org.apache.wicket.model.PropertyM
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.client.to.PropagationTaskTO;
-import org.apache.syncope.client.to.TaskTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.commons.Constants;
-import org.apache.syncope.console.commons.PreferenceManager;
-import org.apache.syncope.console.commons.XMLRolesReader;
-import org.apache.syncope.console.pages.PropagationTaskModalPage;
-import org.apache.syncope.console.pages.Tasks;
-import org.apache.syncope.console.pages.Tasks.TasksProvider;
-import org.apache.syncope.console.rest.TaskRestClient;
-import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
-import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
-import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
/**
* Tasks page.
@@ -109,9 +114,9 @@ public class PropagationTasks extends Pa
columns.add(new PropertyColumn(new ResourceModel("propagationOperation"), "propagationOperation",
"propagationOperation"));
-
+
columns.add(new DatePropertyColumn(new ResourceModel("startDate"), "startDate", "startDate"));
-
+
columns.add(new DatePropertyColumn(new ResourceModel("endDate"), "endDate", "endDate"));
columns.add(new PropertyColumn(new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
@@ -219,6 +224,35 @@ public class PropagationTasks extends Pa
window.setInitialWidth(WIN_WIDTH);
window.setCookieName("view-task-win");
+ final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (target != null) {
+ target.add(table);
+ }
+ }
+ };
+
+ reload.add(new Behavior() {
+ private static final long serialVersionUID = 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+
+ if (table.getRowCount() > paginatorRows) {
+ tag.remove("class");
+ tag.put("class", "settingsPosMultiPage");
+ } else {
+ tag.remove("class");
+ tag.put("class", "settingsPos");
+ }
+ }
+ });
+
+ container.add(reload);
+
Form paginatorForm = new Form("PaginatorForm");
final DropDownChoice rowsChooser = new DropDownChoice(
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java Thu Aug 16 15:18:15 2012
@@ -275,6 +275,36 @@ public class ResultSetPanel extends Pane
displayAttrsLink, ENABLE, xmlRolesReader.getAllAllowedRoles("Users", "changeView"));
container.add(displayAttrsLink);
+
+ final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (target != null) {
+ target.add(resultTable);
+ }
+ }
+ };
+
+ reload.add(new Behavior() {
+ private static final long serialVersionUID = 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+
+ if (resultTable.getRowCount() > rows) {
+ tag.remove("class");
+ tag.put("class", "settingsPosMultiPage");
+ } else {
+ tag.remove("class");
+ tag.put("class", "settingsPos");
+ }
+ }
+ });
+
+ container.add(reload);
+
// ---------------------------
// ---------------------------
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java Thu Aug 16 15:18:15 2012
@@ -57,6 +57,9 @@ import org.apache.syncope.console.rest.T
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.ComponentTag;
public class SchedTasks extends Panel {
@@ -218,6 +221,35 @@ public class SchedTasks extends Panel {
0);
container.add(table);
+
+ final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (target != null) {
+ target.add(table);
+ }
+ }
+ };
+
+ reload.add(new Behavior() {
+ private static final long serialVersionUID = 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+
+ if (table.getRowCount() > paginatorRows) {
+ tag.remove("class");
+ tag.put("class", "settingsPosMultiPage");
+ } else {
+ tag.remove("class");
+ tag.put("class", "settingsPos");
+ }
+ }
+ });
+
+ container.add(reload);
Form paginatorForm = new Form("PaginatorForm");
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java Thu Aug 16 15:18:15 2012
@@ -34,12 +34,14 @@ import org.apache.syncope.console.rest.T
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
@@ -47,6 +49,7 @@ import org.apache.wicket.extensions.mark
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -238,6 +241,35 @@ public class SyncTasks extends Panel {
0);
container.add(table);
+
+ final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (target != null) {
+ target.add(table);
+ }
+ }
+ };
+
+ reload.add(new Behavior() {
+ private static final long serialVersionUID = 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+
+ if (table.getRowCount() > paginatorRows) {
+ tag.remove("class");
+ tag.put("class", "settingsPosMultiPage");
+ } else {
+ tag.remove("class");
+ tag.put("class", "settingsPos");
+ }
+ }
+ });
+
+ container.add(reload);
Form paginatorForm = new Form("PaginatorForm");
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ReportRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ReportRestClient.java?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ReportRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ReportRestClient.java Thu Aug 16 15:18:15 2012
@@ -40,6 +40,11 @@ public class ReportRestClient extends Ab
}
return reportletClasses;
}
+
+ public ReportTO read(final Long reportId) {
+ return SyncopeSession.get().getRestTemplate().getForObject(
+ baseURL + "report/read/{taskId}", ReportTO.class, reportId);
+ }
public List<ReportTO> list() {
return Arrays.asList(SyncopeSession.get().getRestTemplate().getForObject(
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html Thu Aug 16 15:18:15 2012
@@ -12,94 +12,108 @@
limitations under the License.
under the License.
-->
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:19px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
<wicket:extend>
- <div id="dialog-form">
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
- <form wicket:id="form">
- <div id="tabs">
- <ul>
- <li class="tabs-selected"><a href="#profile"><span><wicket:message key="profile"/></span></a></li>
- <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
- </ul>
- <div id="profile">
- <div id="users-contain" class="ui-widget">
- <span wicket:id="profile">
- <div id="formtable">
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <span wicket:id="idLabel">[Id]</span>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="sender"><wicket:message key="sender"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="sender">[sender]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="recipients"><wicket:message key="recipients"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="recipients">[recipients]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="subject"><wicket:message key="subject"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="subject">[subject]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="textBody"><wicket:message key="textBody"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <textarea wicket:id="textBody" cols="50" rows="10">[textBody]</textarea>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="htmlBody"><wicket:message key="htmlBody"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <textarea wicket:id="htmlBody" cols="50" rows="10">[textBody]</textarea>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="traceLevel"><wicket:message key="traceLevel"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="traceLevel">[traceLevel]</span>
- </div>
- </div>
- </div>
- </span>
- </div>
- </div>
- <div id="executions">
- <span wicket:id="executions">
- <table id="executions" class="ui-widget ui-widget-content"
- wicket:id="executionsTable" style="width: 100%"/>
- </span>
- </div>
- </div>
- </form>
- </div>
- <div wicket:id="taskExecMessageWin"/>
+ <div id="dialog-form">
+ <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
+ <form wicket:id="form">
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected"><a href="#profile"><span><wicket:message key="profile"/></span></a></li>
+ <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
+ </ul>
+ <div id="profile">
+ <div id="users-contain" class="ui-widget">
+ <span wicket:id="profile">
+ <div id="formtable">
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="idLabel">[Id]</span>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="id">[id]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="sender"><wicket:message key="sender"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="sender">[sender]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="recipients"><wicket:message key="recipients"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="recipients">[recipients]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="subject"><wicket:message key="subject"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="subject">[subject]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="textBody"><wicket:message key="textBody"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <textarea wicket:id="textBody" cols="50" rows="10">[textBody]</textarea>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="htmlBody"><wicket:message key="htmlBody"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <textarea wicket:id="htmlBody" cols="50" rows="10">[textBody]</textarea>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="traceLevel"><wicket:message key="traceLevel"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="traceLevel">[traceLevel]</span>
+ </div>
+ </div>
+ </div>
+ </span>
+ </div>
+ </div>
+ <div id="executions">
+ <span wicket:id="executions">
+ <a wicket:id="reload" class="settingsPos">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
+ <table id="executions" class="ui-widget ui-widget-content"
+ wicket:id="executionsTable" style="width: 100%"/>
+ </span>
+ </div>
+ </div>
+ </form>
+ </div>
+ <div wicket:id="taskExecMessageWin"/>
</wicket:extend>
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html Thu Aug 16 15:18:15 2012
@@ -12,59 +12,73 @@
limitations under the License.
under the License.
-->
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:19px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
<wicket:extend>
- <div id="dialog-form">
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
- <form wicket:id="form">
- <div id="tabs">
- <ul>
- <li class="tabs-selected"><a href="#profile"><span><wicket:message key="profile"/></span></a></li>
- <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
- </ul>
- <div id="profile">
- <div id="users-contain" class="ui-widget">
- <span wicket:id="profile">
- <div id="formtable">
+ <div id="dialog-form">
+ <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
+ <form wicket:id="form">
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected"><a href="#profile"><span><wicket:message key="profile"/></span></a></li>
+ <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
+ </ul>
+ <div id="profile">
+ <div id="users-contain" class="ui-widget">
+ <span wicket:id="profile">
+ <div id="formtable">
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <span wicket:id="idLabel">[Id]</span>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="accountId"><wicket:message key="accountId"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="accountId">[accountId]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="resource"><wicket:message key="resource"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="resource">[resource]</span>
- </div>
- </div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="idLabel">[Id]</span>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="id">[id]</span>
+ </div>
+ </div>
- </div>
- </span>
- </div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="accountId"><wicket:message key="accountId"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="accountId">[accountId]</span>
+ </div>
</div>
- <div id="executions">
- <span wicket:id="executions">
- <table id="executions" class="ui-widget ui-widget-content"
- wicket:id="executionsTable" style="width: 100%"/>
- </span>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="resource"><wicket:message key="resource"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="resource">[resource]</span>
+ </div>
</div>
- </div>
- </form>
- </div>
- <div wicket:id="taskExecMessageWin"/>
+
+ </div>
+ </span>
+ </div>
+ </div>
+ <div id="executions">
+ <span wicket:id="executions">
+ <a wicket:id="reload">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
+ <table id="executions" class="ui-widget ui-widget-content"
+ wicket:id="executionsTable" style="width: 100%"/>
+ </span>
+ </div>
+ </div>
+ </form>
+ </div>
+ <div wicket:id="taskExecMessageWin"/>
</wicket:extend>
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html Thu Aug 16 15:18:15 2012
@@ -12,6 +12,17 @@
limitations under the License.
under the License.
-->
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:19px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
<wicket:extend>
<div style="margin:10px">
<p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
@@ -106,6 +117,9 @@
</div>
<div id="executions">
<span wicket:id="executions" style="width: 100%">
+ <a wicket:id="reload" class="settingsPos">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
<table id="executions" class="ui-widget ui-widget-content"
wicket:id="executionsTable" style="width: 100%"/>
</span>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html Thu Aug 16 15:18:15 2012
@@ -12,6 +12,25 @@
limitations under the License.
under the License.
-->
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:34px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+
+ .settingsPosMultiPage{
+ position:relative;
+ top:64px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
<wicket:extend>
<div id="tabs">
@@ -23,6 +42,9 @@
<div id="tabs-1">
<div id="users-contain" class="ui-widget" style="width:inherit;">
<span wicket:id="reportContainer">
+ <a wicket:id="reload" class="settingsPos">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
<table class="ui-widget ui-widget-content table-hover" wicket:id="reportTable"/>
</span>
<span style="float:right">
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage.html Thu Aug 16 15:18:15 2012
@@ -12,101 +12,115 @@
limitations under the License.
under the License.
-->
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:19px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
<wicket:extend>
- <div style="margin:10px">
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
- <form wicket:id="form">
- <div id="tabs">
- <ul>
- <li class="tabs-selected"><a href="#profile"><span><wicket:message key="profile"/></span></a></li>
- <li><a href="#crontab"><span><wicket:message key="crontab"/></span></a></li>
- <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
- </ul>
- <div id="profile">
- <div id="users-contain" class="ui-widget">
- <span wicket:id="profile">
- <div id="formtable">
+ <div style="margin:10px">
+ <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
+ <form wicket:id="form">
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected"><a href="#profile"><span><wicket:message key="profile"/></span></a></li>
+ <li><a href="#crontab"><span><wicket:message key="crontab"/></span></a></li>
+ <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
+ </ul>
+ <div id="profile">
+ <div id="users-contain" class="ui-widget">
+ <span wicket:id="profile">
+ <div id="formtable">
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <span wicket:id="idLabel">[Id]</span>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="jobClassName"><wicket:message key="class"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="jobClassName">[jobClassName]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="lastExec"><wicket:message key="lastExec"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="lastExec">[lastExec]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="nextExec"><wicket:message key="nextExec"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="nextExec">[nextExec]</span>
- </div>
- </div>
- </div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="idLabel">[Id]</span>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="id">[id]</span>
+ </div>
+ </div>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
- </span>
- </div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="jobClassName"><wicket:message key="class"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="jobClassName">[jobClassName]</span>
+ </div>
</div>
- <div id="crontab">
- <span wicket:id="crontab">
- <div id="formtable">
- <div class="tablerow alt">
- <label for="cron"><wicket:message key="cron"/></label>
- </div>
- <div class="tablerow">
- <input type="text" id="seconds" class="text ui-widget-content ui-corner-all" wicket:id="seconds" style="width: 50px;float: left" />
- <input type="text" id="minutes" class="text ui-widget-content ui-corner-all" wicket:id="minutes" style="width: 50px;float: left" />
- <input type="text" id="hours" class="text ui-widget-content ui-corner-all" wicket:id="hours" style="width: 50px;float: left" />
- <input type="text" id="daysOfMonth" class="text ui-widget-content ui-corner-all" wicket:id="daysOfMonth" style="width: 50px;float: left" />
- <input type="text" id="months" class="text ui-widget-content ui-corner-all" wicket:id="months" style="width: 50px;float: left" />
- <input type="text" id="daysOfWeek" class="text ui-widget-content ui-corner-all" wicket:id="daysOfWeek" style="width: 50px" />
- </div>
- <div class="tablerow alt">
- <label for="cronExpression"><wicket:message key="templates"/></label>
- </div>
- <div class="tablerow">
- <select class="text ui-widget-content ui-corner-all" wicket:id="cronTemplateChooser" style="width: 250px"/>
- </div>
- </div>
- </span>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="lastExec"><wicket:message key="lastExec"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="lastExec">[lastExec]</span>
+ </div>
</div>
- <div id="executions">
- <span wicket:id="executions" style="width: 100%">
- <table id="executions" class="ui-widget ui-widget-content"
- wicket:id="executionsTable" style="width: 100%"/>
- </span>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="nextExec"><wicket:message key="nextExec"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="nextExec">[nextExec]</span>
+ </div>
</div>
+ </div>
+
+ <script type="text/javascript">
+ $(function() {
+ $('#formtable div.tablerow:even').addClass("alt");
+ });
+ </script>
+ </span>
+ </div>
+ </div>
+ <div id="crontab">
+ <span wicket:id="crontab">
+ <div id="formtable">
+ <div class="tablerow alt">
+ <label for="cron"><wicket:message key="cron"/></label>
+ </div>
+ <div class="tablerow">
+ <input type="text" id="seconds" class="text ui-widget-content ui-corner-all" wicket:id="seconds" style="width: 50px;float: left" />
+ <input type="text" id="minutes" class="text ui-widget-content ui-corner-all" wicket:id="minutes" style="width: 50px;float: left" />
+ <input type="text" id="hours" class="text ui-widget-content ui-corner-all" wicket:id="hours" style="width: 50px;float: left" />
+ <input type="text" id="daysOfMonth" class="text ui-widget-content ui-corner-all" wicket:id="daysOfMonth" style="width: 50px;float: left" />
+ <input type="text" id="months" class="text ui-widget-content ui-corner-all" wicket:id="months" style="width: 50px;float: left" />
+ <input type="text" id="daysOfWeek" class="text ui-widget-content ui-corner-all" wicket:id="daysOfWeek" style="width: 50px" />
+ </div>
+ <div class="tablerow alt">
+ <label for="cronExpression"><wicket:message key="templates"/></label>
+ </div>
+ <div class="tablerow">
+ <select class="text ui-widget-content ui-corner-all" wicket:id="cronTemplateChooser" style="width: 250px"/>
+ </div>
</div>
- <div style="margin: 20px 10px 0">
- <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="apply"/>
- <input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="cancel"/>
- </div>
- </form>
- </div>
- <div wicket:id="taskExecMessageWin"/>
+ </span>
+ </div>
+ <div id="executions">
+ <span wicket:id="executions" style="width: 100%">
+ <a wicket:id="reload" class="settingsPos">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
+ <table id="executions" class="ui-widget ui-widget-content"
+ wicket:id="executionsTable" style="width: 100%"/>
+ </span>
+ </div>
+ </div>
+ <div style="margin: 20px 10px 0">
+ <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="apply"/>
+ <input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="cancel"/>
+ </div>
+ </form>
+ </div>
+ <div wicket:id="taskExecMessageWin"/>
</wicket:extend>
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html Thu Aug 16 15:18:15 2012
@@ -12,6 +12,17 @@
limitations under the License.
under the License.
-->
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:19px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
<wicket:extend>
<div style="margin:10px">
<p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
@@ -149,6 +160,9 @@
</div>
<div id="executions">
<span wicket:id="executions" style="width: 100%">
+ <a wicket:id="reload" class="settingsPos">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
<table id="executions" class="ui-widget ui-widget-content"
wicket:id="executionsTable" style="width: 100%"/>
</span>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html Thu Aug 16 15:18:15 2012
@@ -12,24 +12,46 @@
limitations under the License.
under the License.
-->
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:34px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+
+ .settingsPosMultiPage{
+ position:relative;
+ top:64px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
<html>
- <wicket:panel>
- <div id="users-contain" class="ui-widget" style="width:auto">
- <span wicket:id="container">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="datatable"/>
- </span>
+ <wicket:panel>
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <span wicket:id="container">
+ <a wicket:id="reload">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="datatable"/>
+ </span>
- <span style="float:right">
- <form wicket:id="PaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
- <div wicket:id="taskWin">
- [Show modal window for viewing task]
- </div>
- </wicket:panel>
+ <span style="float:right">
+ <form wicket:id="PaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
+ <div wicket:id="taskWin">
+ [Show modal window for viewing task]
+ </div>
+ </wicket:panel>
</html>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html Thu Aug 16 15:18:15 2012
@@ -12,24 +12,45 @@
limitations under the License.
under the License.
-->
-<html>
- <wicket:panel>
- <div id="users-contain" class="ui-widget" style="width:auto">
- <span wicket:id="container">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="datatable"/>
- </span>
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:34px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
- <span style="float:right">
- <form wicket:id="PaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
- <div wicket:id="taskWin">
- [Show modal window for viewing task]
- </div>
- </wicket:panel>
+ .settingsPosMultiPage{
+ position:relative;
+ top:64px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
+<html>
+ <wicket:panel>
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <span wicket:id="container">
+ <a wicket:id="reload">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="datatable"/>
+ </span>
+ <span style="float:right">
+ <form wicket:id="PaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
+ <div wicket:id="taskWin">
+ [Show modal window for viewing task]
+ </div>
+ </wicket:panel>
</html>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResultSetPanel.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResultSetPanel.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResultSetPanel.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResultSetPanel.html Thu Aug 16 15:18:15 2012
@@ -17,15 +17,17 @@
.settingsPos{
position:relative;
top:34px;
- left:97%;
+ left:95%;
width:10px;
+ text-decoration: none;
}
.settingsPosMultiPage{
position:relative;
top:64px;
- left:97%;
+ left:95%;
width:10px;
+ text-decoration: none;
}
</style>
</wicket:head>
@@ -33,6 +35,9 @@
<wicket:panel>
<div wicket:id="container">
+ <a wicket:id="reload">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
+ </a>
<a wicket:id="displayAttrsLink">
<img src="img/settings-icon.png" alt="settings icon" class="drop_button" />
</a>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html Thu Aug 16 15:18:15 2012
@@ -12,28 +12,50 @@
limitations under the License.
under the License.
-->
-<html>
- <wicket:panel>
- <div id="users-contain" class="ui-widget" style="width:auto">
- <span wicket:id="container">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="datatable"/>
- </span>
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:34px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
- <span style="float:right">
- <form wicket:id="PaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
- <div wicket:id="taskWin">
- [Show modal window for viewing task]
- </div>
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createLink">
- <wicket:message key="create_task"/>
+ .settingsPosMultiPage{
+ position:relative;
+ top:64px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
+<html>
+ <wicket:panel>
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <span wicket:id="container">
+ <a wicket:id="reload">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
</a>
- </wicket:panel>
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="datatable"/>
+ </span>
+
+ <span style="float:right">
+ <form wicket:id="PaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
+ <div wicket:id="taskWin">
+ [Show modal window for viewing task]
+ </div>
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createLink">
+ <wicket:message key="create_task"/>
+ </a>
+ </wicket:panel>
</html>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html?rev=1373879&r1=1373878&r2=1373879&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html Thu Aug 16 15:18:15 2012
@@ -12,28 +12,50 @@
limitations under the License.
under the License.
-->
-<html>
- <wicket:panel>
- <div id="users-contain" class="ui-widget" style="width:auto">
- <span wicket:id="container">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="datatable"/>
- </span>
+<wicket:head>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:34px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
- <span style="float:right">
- <form wicket:id="PaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
- <div wicket:id="taskWin">
- [Show modal window for viewing task]
- </div>
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createLink">
- <wicket:message key="create_task"/>
+ .settingsPosMultiPage{
+ position:relative;
+ top:64px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
+</wicket:head>
+<html>
+ <wicket:panel>
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <span wicket:id="container">
+ <a wicket:id="reload">
+ <img src="img/reload.png" alt="reload" class="drop_button" />
</a>
- </wicket:panel>
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="datatable"/>
+ </span>
+
+ <span style="float:right">
+ <form wicket:id="PaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
+ <div wicket:id="taskWin">
+ [Show modal window for viewing task]
+ </div>
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createLink">
+ <wicket:message key="create_task"/>
+ </a>
+ </wicket:panel>
</html>
Added: incubator/syncope/trunk/console/src/main/webapp/img/reload.png
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/webapp/img/reload.png?rev=1373879&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/syncope/trunk/console/src/main/webapp/img/reload.png
------------------------------------------------------------------------------
svn:mime-type = image/png