You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by co...@apache.org on 2012/09/05 11:58:50 UTC
svn commit: r1381122 - in /incubator/syncope/trunk/console/src/main:
java/org/apache/syncope/console/pages/
resources/org/apache/syncope/console/pages/
Author: coheigea
Date: Wed Sep 5 09:58:50 2012
New Revision: 1381122
URL: http://svn.apache.org/viewvc?rev=1381122&view=rev
Log:
[SYNCOPE-197] - TaskModalPage Refresh button misaligned
Modified:
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.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/SchedTaskModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html
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=1381122&r1=1381121&r2=1381122&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 Wed Sep 5 09:58:50 2012
@@ -36,9 +36,11 @@ import org.apache.syncope.console.wicket
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
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;
@@ -48,6 +50,7 @@ import org.apache.wicket.extensions.mark
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.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -69,13 +72,13 @@ public abstract class TaskModalPage exte
@SpringBean
protected TaskRestClient taskRestClient;
-
+
protected WebMarkupContainer profile;
protected WebMarkupContainer executions;
protected Form form;
-
+
public TaskModalPage(final TaskTO taskTO) {
final ModalWindow taskExecMessageWin = new ModalWindow("taskExecMessageWin");
@@ -104,7 +107,7 @@ public abstract class TaskModalPage exte
id.setEnabled(false);
profile.add(id);
-
+
final List<IColumn> columns = new ArrayList<IColumn>();
columns.add(new PropertyColumn(new ResourceModel("id"), "id", "id"));
@@ -175,8 +178,9 @@ public abstract class TaskModalPage exte
}
});
+ final int paginatorRows = 10;
final AjaxFallbackDefaultDataTable table = new AjaxFallbackDefaultDataTable("executionsTable", columns,
- new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), 10);
+ new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
executions.add(table);
@@ -188,13 +192,28 @@ public abstract class TaskModalPage exte
if (target != null) {
final AjaxFallbackDefaultDataTable currentTable =
new AjaxFallbackDefaultDataTable("executionsTable", columns,
- new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), 10);
+ new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
currentTable.setOutputMarkupId(true);
target.add(currentTable);
executions.addOrReplace(currentTable);
}
}
};
+
+ reload.add(new Behavior() {
+
+ @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");
+ }
+ }
+ });
executions.addOrReplace(reload);
}
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=1381122&r1=1381121&r2=1381122&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 Wed Sep 5 09:58:50 2012
@@ -21,6 +21,14 @@
width:10px;
text-decoration: none;
}
+
+ .settingsPosMultiPage{
+ position:relative;
+ top:50px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
</style>
</wicket:head>
<wicket:extend>
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=1381122&r1=1381121&r2=1381122&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 Wed Sep 5 09:58:50 2012
@@ -21,6 +21,14 @@
width:10px;
text-decoration: none;
}
+
+ .settingsPosMultiPage{
+ position:relative;
+ top:50px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
</style>
</wicket:head>
<wicket:extend>
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=1381122&r1=1381121&r2=1381122&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 Wed Sep 5 09:58:50 2012
@@ -21,6 +21,14 @@
width:10px;
text-decoration: none;
}
+
+ .settingsPosMultiPage{
+ position:relative;
+ top:50px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
</style>
</wicket:head>
<wicket:extend>
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=1381122&r1=1381121&r2=1381122&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 Wed Sep 5 09:58:50 2012
@@ -21,6 +21,14 @@
width:10px;
text-decoration: none;
}
+
+ .settingsPosMultiPage{
+ position:relative;
+ top:50px;
+ left:90%;
+ width:10px;
+ text-decoration: none;
+ }
</style>
</wicket:head>
<wicket:extend>