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/13 18:07:57 UTC
svn commit: r1372486 [1/2] - in /incubator/syncope/trunk/console/src/main:
java/org/apache/syncope/console/pages/
resources/org/apache/syncope/console/pages/
Author: mdisabatino
Date: Mon Aug 13 16:07:55 2012
New Revision: 1372486
URL: http://svn.apache.org/viewvc?rev=1372486&view=rev
Log:
Fixes SYNCOPE-148 Add cancel button for all modal windows
Modified:
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
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/ReportletConfModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.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/UserModalPage.java
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.properties
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage_it.properties
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.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/ReportletConfModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.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/SchemaModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/StatusModalPage.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/UserModalPage.html
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/VirtualSchemaModalPage.html
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java Mon Aug 13 16:07:55 2012
@@ -27,6 +27,16 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
+import org.apache.syncope.client.to.WorkflowFormPropertyTO;
+import org.apache.syncope.client.to.WorkflowFormTO;
+import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.MapChoiceRenderer;
+import org.apache.syncope.console.rest.ApprovalRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.DateTimeFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -40,17 +50,8 @@ import org.apache.wicket.markup.html.lis
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.client.to.WorkflowFormPropertyTO;
-import org.apache.syncope.client.to.WorkflowFormTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.commons.MapChoiceRenderer;
-import org.apache.syncope.console.rest.ApprovalRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.DateTimeFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
public class ApprovalModalPage extends BaseModalPage {
@@ -63,7 +64,6 @@ public class ApprovalModalPage extends B
super();
IModel<List<WorkflowFormPropertyTO>> formProps = new LoadableDetachableModel<List<WorkflowFormPropertyTO>>() {
-
private static final long serialVersionUID = 3169142472626817508L;
@Override
@@ -73,7 +73,6 @@ public class ApprovalModalPage extends B
};
final ListView<WorkflowFormPropertyTO> propView = new ListView<WorkflowFormPropertyTO>("propView", formProps) {
-
private static final long serialVersionUID = 9101744072914090143L;
@Override
@@ -116,7 +115,6 @@ public class ApprovalModalPage extends B
field = new AjaxDropDownChoicePanel("value", label.getDefaultModelObjectAsString(),
new Model(prop.getValue())).setChoiceRenderer(enumCR).setChoices(new Model() {
-
private static final long serialVersionUID = -858521070366432018L;
@Override
@@ -147,7 +145,6 @@ public class ApprovalModalPage extends B
};
final AjaxButton submit = new IndicatingAjaxButton("apply", new Model(getString("submit"))) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -199,9 +196,25 @@ public class ApprovalModalPage extends B
}
};
+ final AjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+
Form form = new Form("form");
form.add(propView);
form.add(submit);
+ form.add(cancel);
MetaDataRoleAuthorizationStrategy.authorize(form, ENABLE, xmlRolesReader.getAllAllowedRoles("Approval",
"submit"));
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java Mon Aug 13 16:07:55 2012
@@ -18,6 +18,10 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.syncope.client.to.ConfigurationTO;
+import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.rest.ConfigurationRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -28,11 +32,8 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.client.to.ConfigurationTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.rest.ConfigurationRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
/**
* Modal window with Connector form.
@@ -70,7 +71,6 @@ public class ConfigurationModalPage exte
value.addRequiredLabel();
submit = new IndicatingAjaxButton("apply", new Model<String>(getString("submit"))) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -103,6 +103,22 @@ public class ConfigurationModalPage exte
}
};
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+ form.add(cancel);
+
String allowedRoles = createFlag
? xmlRolesReader.getAllAllowedRoles("Configuration", "create")
: xmlRolesReader.getAllAllowedRoles("Configuration", "update");
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java Mon Aug 13 16:07:55 2012
@@ -105,7 +105,6 @@ public class ConnectorModalPage extends
: connectorTO.getCapabilities());
final IModel<List<ConnectorCapability>> capabilities = new LoadableDetachableModel<List<ConnectorCapability>>() {
-
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -115,7 +114,6 @@ public class ConnectorModalPage extends
};
final IModel<List<ConnBundleTO>> bundles = new LoadableDetachableModel<List<ConnBundleTO>>() {
-
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -147,7 +145,6 @@ public class ConnectorModalPage extends
bundle.setStyleShet("long_dynamicsize");
bundle.setChoices(bundles.getObject());
bundle.setChoiceRenderer(new ChoiceRenderer<ConnBundleTO>() {
-
private static final long serialVersionUID = -1945543182376191187L;
@Override
@@ -166,7 +163,6 @@ public class ConnectorModalPage extends
((DropDownChoice) bundle.getField()).setNullValid(true);
bundle.setRequired(true);
bundle.getField().add(new AjaxFormComponentUpdatingBehavior("onchange") {
-
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -184,7 +180,6 @@ public class ConnectorModalPage extends
}
});
bundle.getField().setModel(new IModel<ConnBundleTO>() {
-
private static final long serialVersionUID = -3736598995576061229L;
@Override
@@ -212,7 +207,6 @@ public class ConnectorModalPage extends
final ListView<ConnConfProperty> view = new ListView<ConnConfProperty>(
"connectorProperties", new PropertyModel(this, "properties")) {
-
private static final long serialVersionUID = 9101744072914090143L;
@Override
@@ -314,7 +308,6 @@ public class ConnectorModalPage extends
connectorPropForm.add(view);
final AjaxLink check = new IndicatingAjaxLink("check", new ResourceModel("check")) {
-
private static final long serialVersionUID = -7978723352517770644L;
@Override
@@ -335,7 +328,6 @@ public class ConnectorModalPage extends
connectorPropForm.add(check);
final AjaxButton submit = new IndicatingAjaxButton("apply", new Model(getString("submit"))) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -373,6 +365,21 @@ public class ConnectorModalPage extends
}
};
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+
String roles = connectorTO.getId() == 0
? xmlRolesReader.getAllAllowedRoles("Connectors", "create")
: xmlRolesReader.getAllAllowedRoles("Connectors", "update");
@@ -389,6 +396,7 @@ public class ConnectorModalPage extends
connectorForm.add(capabilitiesPalette);
connectorForm.add(submit);
+ connectorForm.add(cancel);
add(connectorForm);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java Mon Aug 13 16:07:55 2012
@@ -21,6 +21,7 @@ package org.apache.syncope.console.pages
import org.apache.syncope.client.AbstractBaseBean;
import org.apache.syncope.client.to.DerivedSchemaTO;
import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.types.AttributableType;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -31,7 +32,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
/**
* Modal window with Schema form.
@@ -67,7 +67,6 @@ public class DerivedSchemaModalPage exte
name.setEnabled(createFlag);
final IndicatingAjaxButton submit = new IndicatingAjaxButton("apply", new ResourceModel("submit")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -99,6 +98,21 @@ public class DerivedSchemaModalPage exte
}
};
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+
String allowedRoles;
if (createFlag) {
@@ -113,6 +127,7 @@ public class DerivedSchemaModalPage exte
schemaForm.add(expression);
schemaForm.add(submit);
+ schemaForm.add(cancel);
add(schemaForm);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java Mon Aug 13 16:07:55 2012
@@ -77,7 +77,6 @@ public class DisplayAttributesModalPage
private SchemaRestClient schemaRestClient;
final private IModel<List<String>> dnames = new LoadableDetachableModel<List<String>>() {
-
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -103,7 +102,6 @@ public class DisplayAttributesModalPage
};
final private IModel<List<String>> names = new LoadableDetachableModel<List<String>>() {
-
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -120,7 +118,6 @@ public class DisplayAttributesModalPage
};
final private IModel<List<String>> dsnames = new LoadableDetachableModel<List<String>>() {
-
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -137,7 +134,6 @@ public class DisplayAttributesModalPage
};
final private IModel<List<String>> vsnames = new LoadableDetachableModel<List<String>>() {
-
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -180,7 +176,6 @@ public class DisplayAttributesModalPage
form.add(dgroup);
final ListView<String> details = new ListView<String>("details", dnames) {
-
private static final long serialVersionUID = 9101744072914090143L;
@Override
@@ -199,7 +194,6 @@ public class DisplayAttributesModalPage
fragment.add(sgroup);
final ListView<String> schemas = new ListView<String>("schemas", names) {
-
private static final long serialVersionUID = 9101744072914090143L;
@Override
@@ -224,7 +218,6 @@ public class DisplayAttributesModalPage
fragment.add(vsgroup);
final ListView<String> virSchemas = new ListView<String>("virSchemas", vsnames) {
-
private static final long serialVersionUID = 9101744072914090143L;
@Override
@@ -249,7 +242,6 @@ public class DisplayAttributesModalPage
fragment.add(dsgroup);
final ListView<String> derSchemas = new ListView<String>("derSchemas", dsnames) {
-
private static final long serialVersionUID = 9101744072914090143L;
@Override
@@ -267,7 +259,6 @@ public class DisplayAttributesModalPage
}
final IndicatingAjaxButton submit = new IndicatingAjaxButton("submit", new ResourceModel("submit")) {
-
private static final long serialVersionUID = -4804368561204623354L;
@Override
@@ -306,6 +297,22 @@ public class DisplayAttributesModalPage
form.add(submit);
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+ form.add(cancel);
+
add(form);
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java Mon Aug 13 16:07:55 2012
@@ -30,6 +30,7 @@ import org.apache.syncope.client.to.Memb
import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.console.pages.panels.DerivedAttributesPanel;
import org.apache.syncope.console.pages.panels.VirtualAttributesPanel;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
/**
* MembershipModalPage.
@@ -50,7 +51,6 @@ public class MembershipModalPage extends
form.setModel(new CompoundPropertyModel(membershipTO));
submit = new AjaxButton("submit", new ResourceModel("submit")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -73,6 +73,22 @@ public class MembershipModalPage extends
form.add(submit);
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+ form.add(cancel);
+
//--------------------------------
// Attributes panel
//--------------------------------
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Mon Aug 13 16:07:55 2012
@@ -24,6 +24,18 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.syncope.client.to.NotificationTO;
+import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.pages.panels.UserSearchPanel;
+import org.apache.syncope.console.rest.NotificationRestClient;
+import org.apache.syncope.console.rest.SchemaRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.types.AttributableType;
+import org.apache.syncope.types.IntMappingType;
+import org.apache.syncope.types.TraceLevel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -40,18 +52,6 @@ import org.apache.wicket.model.ResourceM
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.validation.validator.EmailAddressValidator;
-import org.apache.syncope.client.to.NotificationTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.pages.panels.UserSearchPanel;
-import org.apache.syncope.console.rest.NotificationRestClient;
-import org.apache.syncope.console.rest.SchemaRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.types.AttributableType;
-import org.apache.syncope.types.IntMappingType;
-import org.apache.syncope.types.TraceLevel;
class NotificationModalPage extends BaseModalPage {
@@ -125,7 +125,6 @@ class NotificationModalPage extends Base
form.add(recipientAttrName);
recipientAttrType.getField().add(new AjaxFormComponentUpdatingBehavior(onchange) {
-
@Override
protected void onUpdate(final AjaxRequestTarget target) {
recipientAttrName.setChoices(getSchemaNames(notificationTO.getRecipientAttrType()));
@@ -162,7 +161,6 @@ class NotificationModalPage extends Base
recipients.setEnabled(checkRecipients.getModelObject());
selfAsRecipient.getField().add(new AjaxFormComponentUpdatingBehavior(onchange) {
-
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -178,7 +176,6 @@ class NotificationModalPage extends Base
});
checkRecipients.getField().add(new AjaxFormComponentUpdatingBehavior(onchange) {
-
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -194,7 +191,6 @@ class NotificationModalPage extends Base
});
AjaxButton submit = new IndicatingAjaxButton("apply", new Model<String>(getString("submit"))) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -202,7 +198,7 @@ class NotificationModalPage extends Base
notificationTO.setAbout(about.buildSearchCond());
notificationTO.setRecipients(checkRecipients.getModelObject() ? recipients.buildSearchCond() : null);
-
+
try {
if (createFlag) {
restClient.createNotification(notificationTO);
@@ -228,12 +224,28 @@ class NotificationModalPage extends Base
}
};
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+
String allowedRoles = createFlag
? xmlRolesReader.getAllAllowedRoles("Notification", "create")
: xmlRolesReader.getAllAllowedRoles("Notification", "update");
MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, allowedRoles);
form.add(submit);
+ form.add(cancel);
add(form);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java Mon Aug 13 16:07:55 2012
@@ -47,6 +47,7 @@ import org.apache.syncope.types.SyncPoli
public class PolicyModalPage<T extends PolicyTO> extends BaseModalPage {
private static final long serialVersionUID = -7325772767481076679L;
+
@SpringBean
private PolicyRestClient policyRestClient;
@@ -101,7 +102,6 @@ public class PolicyModalPage<T extends P
form.add(new PolicyBeanPanel("panel", policy));
final IndicatingAjaxButton submit = new IndicatingAjaxButton("apply", new ResourceModel("apply")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -133,6 +133,22 @@ public class PolicyModalPage<T extends P
};
form.add(submit);
+
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+ form.add(cancel);
}
private AbstractPolicySpec getPolicySpecification(final PolicyTO policyTO) {
@@ -169,7 +185,7 @@ public class PolicyModalPage<T extends P
switch (policyTO.getType()) {
case GLOBAL_ACCOUNT:
case ACCOUNT:
- if (!(specification instanceof AccountPolicySpec)) {
+ if (!(specification instanceof AccountPolicySpec)) {
throw new ClassCastException("policy is type Account, but spec is not: " + specification.getClass().getName());
}
((AccountPolicyTO) policyTO).setSpecification((AccountPolicySpec) specification);
@@ -177,7 +193,7 @@ public class PolicyModalPage<T extends P
case GLOBAL_PASSWORD:
case PASSWORD:
- if (!(specification instanceof PasswordPolicySpec)) {
+ if (!(specification instanceof PasswordPolicySpec)) {
throw new ClassCastException("policy is type Password, but spec is not: " + specification.getClass().getName());
}
((PasswordPolicyTO) policyTO).setSpecification((PasswordPolicySpec) specification);
@@ -185,7 +201,7 @@ public class PolicyModalPage<T extends P
case GLOBAL_SYNC:
case SYNC:
- if (!(specification instanceof SyncPolicySpec)) {
+ if (!(specification instanceof SyncPolicySpec)) {
throw new ClassCastException("policy is type Sync, but spec is not: " + specification.getClass().getName());
}
((SyncPolicyTO) policyTO).setSpecification((SyncPolicySpec) specification);
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=1372486&r1=1372485&r2=1372486&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 Mon Aug 13 16:07:55 2012
@@ -121,7 +121,6 @@ public class ReportModalPage extends Bas
form.add(crontab);
final IndicatingAjaxButton submit = new IndicatingAjaxButton("apply", new ResourceModel("apply")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -163,6 +162,22 @@ public class ReportModalPage extends Bas
}
form.add(submit);
+
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+ form.add(cancel);
}
private void setupProfile() {
@@ -176,7 +191,6 @@ public class ReportModalPage extends Bas
reportletConfWin.setInitialHeight(REPORTLET_CONF_WIN_HEIGHT);
reportletConfWin.setInitialWidth(REPORTLET_CONF_WIN_WIDTH);
reportletConfWin.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
-
private static final long serialVersionUID = 8804221891699487139L;
@Override
@@ -230,7 +244,6 @@ public class ReportModalPage extends Bas
final SingleColumnPalette<ReportletConf> reportlets = new SingleColumnPalette<ReportletConf>("reportlets",
new PropertyModel<List<? extends ReportletConf>>(reportTO, "reportletConfs"),
new IChoiceRenderer<ReportletConf>() {
-
private static final long serialVersionUID = 1048000918946220007L;
@Override
@@ -246,7 +259,6 @@ public class ReportModalPage extends Bas
}, 5, true);
reportlets.setOutputMarkupId(true);
reportlets.addRecordBehavior(new AjaxFormComponentUpdatingBehavior("onchange") {
-
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -254,7 +266,6 @@ public class ReportModalPage extends Bas
}
});
reportlets.addRecordBehavior(new AjaxFormComponentUpdatingBehavior("onselect") {
-
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -264,7 +275,6 @@ public class ReportModalPage extends Bas
&& reportlets.getSelectedItem() != null) {
reportletConfWin.setPageCreator(new ModalWindow.PageCreator() {
-
private static final long serialVersionUID = -7834632442532690940L;
@Override
@@ -280,13 +290,11 @@ public class ReportModalPage extends Bas
}
});
reportlets.setAddLink(new AjaxLink(ADD_BUTTON_ID) {
-
private static final long serialVersionUID = -7978723352517770644L;
-
+
@Override
public void onClick(final AjaxRequestTarget target) {
reportletConfWin.setPageCreator(new ModalWindow.PageCreator() {
-
private static final long serialVersionUID = -7834632442532690940L;
@Override
@@ -301,7 +309,6 @@ public class ReportModalPage extends Bas
}
});
reportlets.setEditLink(new AjaxLink(EDIT_BUTTON_ID) {
-
private static final long serialVersionUID = -7978723352517770644L;
@Override
@@ -312,7 +319,6 @@ public class ReportModalPage extends Bas
@Override
protected IAjaxCallDecorator getAjaxCallDecorator() {
return new AjaxPreprocessingCallDecorator(super.getAjaxCallDecorator()) {
-
private static final long serialVersionUID = -7927968187160354605L;
@Override
@@ -323,7 +329,6 @@ public class ReportModalPage extends Bas
}
});
reportlets.setRemoveLink(new AjaxLink(REMOVE_BUTTON_ID) {
-
private static final long serialVersionUID = -7978723352517770644L;
@Override
@@ -333,7 +338,6 @@ public class ReportModalPage extends Bas
@Override
protected IAjaxCallDecorator getAjaxCallDecorator() {
return new AjaxPreprocessingCallDecorator(super.getAjaxCallDecorator()) {
-
private static final long serialVersionUID = -7927968187160354605L;
@Override
@@ -363,7 +367,6 @@ public class ReportModalPage extends Bas
reportExecExportWin.setInitialHeight(EXEC_EXPORT_WIN_HEIGHT);
reportExecExportWin.setInitialWidth(EXEC_EXPORT_WIN_WIDTH);
reportExecExportWin.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
-
private static final long serialVersionUID = 8804221891699487139L;
@Override
@@ -382,7 +385,6 @@ public class ReportModalPage extends Bas
columns.add(new DatePropertyColumn(new ResourceModel("endDate"), "endDate", "endDate"));
columns.add(new PropertyColumn(new ResourceModel("status"), "status", "status"));
columns.add(new AbstractColumn<ReportExecTO>(new ResourceModel("actions", "")) {
-
private static final long serialVersionUID = 2054811145491901166L;
@Override
@@ -399,13 +401,11 @@ public class ReportModalPage extends Bas
final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
panel.add(new ActionLink() {
-
private static final long serialVersionUID = -3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget target) {
reportExecMessageWin.setPageCreator(new ModalWindow.PageCreator() {
-
private static final long serialVersionUID = -7834632442532690940L;
@Override
@@ -418,13 +418,11 @@ public class ReportModalPage extends Bas
}, ActionLink.ActionType.EDIT, "Reports", "read", StringUtils.hasText(model.getObject().getMessage()));
panel.add(new ActionLink() {
-
private static final long serialVersionUID = -3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget target) {
reportExecExportWin.setPageCreator(new ModalWindow.PageCreator() {
-
private static final long serialVersionUID = -7834632442532690940L;
@Override
@@ -440,7 +438,6 @@ public class ReportModalPage extends Bas
model.getObject().getStatus()));
panel.add(new ActionLink() {
-
private static final long serialVersionUID = -3722207913631435501L;
@Override
@@ -510,7 +507,6 @@ public class ReportModalPage extends Bas
public IModel<ReportExecTO> model(final ReportExecTO taskExecution) {
return new AbstractReadOnlyModel<ReportExecTO>() {
-
private static final long serialVersionUID = 7485475149862342421L;
@Override
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java Mon Aug 13 16:07:55 2012
@@ -67,13 +67,14 @@ import org.apache.syncope.console.wicket
import org.apache.syncope.console.wicket.markup.html.form.DateTimeFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
public class ReportletConfModalPage extends BaseModalPage {
private static final long serialVersionUID = 3910027601200382958L;
- private static final String[] EXCLUDE_PROPERTIES = new String[] { "serialVersionUID", "class", "name",
- "reportletClassName" };
+ private static final String[] EXCLUDE_PROPERTIES = new String[]{"serialVersionUID", "class", "name",
+ "reportletClassName"};
@SpringBean
private ReportRestClient restClient;
@@ -110,37 +111,35 @@ public class ReportletConfModalPage exte
final AjaxDropDownChoicePanel<String> reportletClass = new AjaxDropDownChoicePanel<String>("reportletClass",
"reportletClass", new IModel<String>() {
+ private static final long serialVersionUID = -2316468110411802130L;
- private static final long serialVersionUID = -2316468110411802130L;
-
- @Override
- public String getObject() {
- return ReportletConfModalPage.this.reportletConf == null
- ? null
- : ReportletConfModalPage.this.reportletConf.getClass().getName();
- }
+ @Override
+ public String getObject() {
+ return ReportletConfModalPage.this.reportletConf == null
+ ? null
+ : ReportletConfModalPage.this.reportletConf.getClass().getName();
+ }
- @Override
- public void setObject(final String object) {
- try {
- Class reportletClass = Class.forName(object);
- ReportletConfModalPage.this.reportletConf = (ReportletConf) reportletClass.newInstance();
- propertiesContainer.replace(buildPropView());
- } catch (Exception e) {
- LOG.error("Cannot find or initialize {}", object, e);
- }
- }
+ @Override
+ public void setObject(final String object) {
+ try {
+ Class reportletClass = Class.forName(object);
+ ReportletConfModalPage.this.reportletConf = (ReportletConf) reportletClass.newInstance();
+ propertiesContainer.replace(buildPropView());
+ } catch (Exception e) {
+ LOG.error("Cannot find or initialize {}", object, e);
+ }
+ }
- @Override
- public void detach() {
- }
- });
+ @Override
+ public void detach() {
+ }
+ });
reportletClass.setStyleShet("long_dynamicsize");
reportletClass.setChoices(restClient.getReportletConfClasses());
((DropDownChoice) reportletClass.getField()).setNullValid(true);
reportletClass.addRequiredLabel();
reportletClass.getField().add(new AjaxFormComponentUpdatingBehavior("onchange") {
-
private static final long serialVersionUID = 5538299138211283825L;
@Override
@@ -155,7 +154,6 @@ public class ReportletConfModalPage exte
propertiesContainer.add(buildPropView());
final AjaxButton submit = new AjaxButton("apply", new ResourceModel("apply")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -187,6 +185,22 @@ public class ReportletConfModalPage exte
}
};
form.add(submit);
+
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+ form.add(cancel);
}
private FieldPanel buildSinglePanel(final Class<?> type, final String fieldName, final String id) {
@@ -215,7 +229,6 @@ public class ReportletConfModalPage exte
private ListView<String> buildPropView() {
LoadableDetachableModel<List<String>> propViewModel = new LoadableDetachableModel<List<String>>() {
-
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -234,7 +247,6 @@ public class ReportletConfModalPage exte
};
propView = new ListView<String>("propView", propViewModel) {
-
private static final long serialVersionUID = 9101744072914090143L;
@Override
@@ -248,8 +260,8 @@ public class ReportletConfModalPage exte
try {
field = ReportletConfModalPage.this.reportletConf.getClass().getDeclaredField(fieldName);
} catch (Exception e) {
- LOG.error("Could not find field {} in class {}", new Object[] { fieldName,
- ReportletConfModalPage.this.reportletConf.getClass(), e });
+ LOG.error("Could not find field {} in class {}", new Object[]{fieldName,
+ ReportletConfModalPage.this.reportletConf.getClass(), e});
}
if (field == null) {
return;
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java Mon Aug 13 16:07:55 2012
@@ -18,6 +18,13 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.syncope.client.to.ResourceTO;
+import org.apache.syncope.client.to.SchemaMappingTO;
+import org.apache.syncope.console.pages.panels.ResourceConnConfPanel;
+import org.apache.syncope.console.pages.panels.ResourceDetailsPanel;
+import org.apache.syncope.console.pages.panels.ResourceMappingPanel;
+import org.apache.syncope.console.pages.panels.ResourceSecurityPanel;
+import org.apache.syncope.console.rest.ResourceRestClient;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -28,13 +35,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.client.to.ResourceTO;
-import org.apache.syncope.client.to.SchemaMappingTO;
-import org.apache.syncope.console.pages.panels.ResourceConnConfPanel;
-import org.apache.syncope.console.pages.panels.ResourceDetailsPanel;
-import org.apache.syncope.console.pages.panels.ResourceMappingPanel;
-import org.apache.syncope.console.pages.panels.ResourceSecurityPanel;
-import org.apache.syncope.console.rest.ResourceRestClient;
/**
* Modal window with Resource form.
@@ -79,7 +79,6 @@ public class ResourceModalPage extends B
//--------------------------------
final AjaxButton submit = new IndicatingAjaxButton("apply", new ResourceModel("submit", "submit")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -126,12 +125,29 @@ public class ResourceModalPage extends B
};
form.add(submit);
+
+ final AjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+ form.add(cancel);
+
add(form);
MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, xmlRolesReader.getAllAllowedRoles("Resources",
createFlag
- ? "create"
- : "update"));
+ ? "create"
+ : "update"));
}
/**
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java Mon Aug 13 16:07:55 2012
@@ -23,6 +23,8 @@ import java.util.List;
import org.apache.syncope.client.mod.RoleMod;
import org.apache.syncope.client.to.RoleTO;
import org.apache.syncope.client.util.AttributableOperations;
+import org.apache.syncope.console.pages.panels.RoleAttributesPanel;
+import org.apache.syncope.console.rest.RoleRestClient;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -34,8 +36,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.console.pages.panels.RoleAttributesPanel;
-import org.apache.syncope.console.rest.RoleRestClient;
/**
* Modal window with Role form.
@@ -71,7 +71,6 @@ public class RoleModalPage extends BaseM
form.add(attributesPanel);
final AjaxButton submit = new IndicatingAjaxButton("submit", new ResourceModel("submit")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -109,12 +108,28 @@ public class RoleModalPage extends BaseM
}
};
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+
MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, xmlRolesReader.getAllAllowedRoles("Roles",
createFlag
- ? "create"
- : "update"));
+ ? "create"
+ : "update"));
form.add(submit);
+ form.add(cancel);
add(form);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java Mon Aug 13 16:07:55 2012
@@ -25,6 +25,15 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
+import org.apache.syncope.client.AbstractBaseBean;
+import org.apache.syncope.client.to.SchemaTO;
+import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
+import org.apache.syncope.types.AttributableType;
+import org.apache.syncope.types.SchemaType;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -42,15 +51,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.util.string.Strings;
-import org.apache.syncope.client.AbstractBaseBean;
-import org.apache.syncope.client.to.SchemaTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
-import org.apache.syncope.types.AttributableType;
-import org.apache.syncope.types.SchemaType;
/**
* Modal window with Schema form.
@@ -88,7 +88,6 @@ public class SchemaModalPage extends Abs
getString("conversionPattern"), new PropertyModel<String>(schema, "conversionPattern"));
final IModel<List<String>> validatorsList = new LoadableDetachableModel<List<String>>() {
-
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -133,7 +132,6 @@ public class SchemaModalPage extends Abs
}
type.getField().add(new AjaxFormComponentUpdatingBehavior("onchange") {
-
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -163,7 +161,6 @@ public class SchemaModalPage extends Abs
});
final AutoCompleteTextField mandatoryCondition = new AutoCompleteTextField("mandatoryCondition") {
-
private static final long serialVersionUID = -2428903969518079100L;
@Override
@@ -186,7 +183,6 @@ public class SchemaModalPage extends Abs
};
mandatoryCondition.add(new AjaxFormComponentUpdatingBehavior("onchange") {
-
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -204,7 +200,6 @@ public class SchemaModalPage extends Abs
getString("uniqueConstraint"), new PropertyModel<Boolean>(schema, "uniqueConstraint"));
final AjaxButton submit = new IndicatingAjaxButton("apply", new ResourceModel("submit")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -245,6 +240,21 @@ public class SchemaModalPage extends Abs
}
};
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+
String allowedRoles;
if (createFlag) {
@@ -265,6 +275,7 @@ public class SchemaModalPage extends Abs
schemaForm.add(uniqueConstraint);
schemaForm.add(submit);
+ schemaForm.add(cancel);
add(schemaForm);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java Mon Aug 13 16:07:55 2012
@@ -20,6 +20,10 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.List;
+import org.apache.syncope.client.to.UserTO;
+import org.apache.syncope.console.commons.StatusBean;
+import org.apache.syncope.console.pages.panels.StatusPanel;
+import org.apache.syncope.console.rest.UserRestClient;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -28,10 +32,6 @@ import org.apache.wicket.extensions.ajax
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.console.commons.StatusBean;
-import org.apache.syncope.console.pages.panels.StatusPanel;
-import org.apache.syncope.console.rest.UserRestClient;
public class StatusModalPage extends BaseModalPage {
@@ -53,7 +53,6 @@ public class StatusModalPage extends Bas
form.add(statusPanel);
final AjaxButton disable = new IndicatingAjaxButton("disable", new ResourceModel("disable", "Disable")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -82,7 +81,6 @@ public class StatusModalPage extends Bas
};
final AjaxButton enable = new IndicatingAjaxButton("enable", new ResourceModel("enable", "Enable")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -108,7 +106,23 @@ public class StatusModalPage extends Bas
}
};
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = -958724007591692537L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+
form.add(disable);
form.add(enable);
+ form.add(cancel);
}
}
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=1372486&r1=1372485&r2=1372486&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 Mon Aug 13 16:07:55 2012
@@ -22,6 +22,19 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.syncope.client.to.NotificationTaskTO;
+import org.apache.syncope.client.to.PropagationTaskTO;
+import org.apache.syncope.client.to.SchedTaskTO;
+import org.apache.syncope.client.to.SyncTaskTO;
+import org.apache.syncope.client.to.TaskExecTO;
+import org.apache.syncope.client.to.TaskTO;
+import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.SortableDataProviderComparator;
+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.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
@@ -43,19 +56,6 @@ import org.apache.wicket.model.PropertyM
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.springframework.util.StringUtils;
-import org.apache.syncope.client.to.NotificationTaskTO;
-import org.apache.syncope.client.to.PropagationTaskTO;
-import org.apache.syncope.client.to.SchedTaskTO;
-import org.apache.syncope.client.to.SyncTaskTO;
-import org.apache.syncope.client.to.TaskExecTO;
-import org.apache.syncope.client.to.TaskTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.commons.SortableDataProviderComparator;
-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.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
/**
* Modal window with Task form (to stop and start execution).
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Mon Aug 13 16:07:55 2012
@@ -49,7 +49,6 @@ public abstract class UserModalPage exte
ADMIN,
SELF,
TEMPLATE;
-
}
private static final long serialVersionUID = 5002005009737457667L;
@@ -176,12 +175,27 @@ public abstract class UserModalPage exte
fragment.add(form);
form.add(submit);
+ final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ private static final long serialVersionUID = 530608535790823587L;
+
+ @Override
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ window.close(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form form) {
+ }
+ };
+
+ cancel.setDefaultFormProcessing(false);
+ form.add(cancel);
+
return form;
}
protected AjaxButton getOnSubmit() {
return new IndicatingAjaxButton("apply", new ResourceModel("submit")) {
-
private static final long serialVersionUID = -958724007591692537L;
@Override
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage.html?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage.html Mon Aug 13 16:07:55 2012
@@ -46,6 +46,9 @@
<input type="submit"
class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
wicket:id="apply"/>
+ <input type="button"
+ accept=""class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="cancel"/>
</div>
</div>
</div>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html Mon Aug 13 16:07:55 2012
@@ -13,50 +13,50 @@
under the License.
-->
<html>
- <head>
- <link rel="shortcut icon" href="img/favicon.ico"/>
+ <head>
+ <link rel="shortcut icon" href="img/favicon.ico"/>
- <link rel="stylesheet" type="text/css" href="css/jquery.ui.button.css" />
- <link rel="stylesheet" type="text/css" href="css/jquery.ui.core.css" />
- <link rel="stylesheet" type="text/css" href="css/jquery.ui.dialog.css" />
- <link rel="stylesheet" type="text/css" href="css/jquery.ui.resizable.css" />
- <link rel="stylesheet" type="text/css" href="css/jquery.ui.tabs.css" />
- <link rel="stylesheet" type="text/css" href="css/jquery.ui.theme.css" />
- <link rel="stylesheet" type="text/css" href="css/jquery.ui.tabs.css" media="all"/>
-
- <link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
- <link rel="stylesheet" type="text/css" href="css/fieldstyle.css" />
-
- <script type="text/javascript" src="scripts/jquery-1.4.2.min.js"></script>
- <script type="text/javascript" src="scripts/jquery-ui-1.8.5.custom.min.js"></script>
-
- <script type="text/javascript" src="scripts/singlecolumnpalette.js"></script>
-
- <script type="text/javascript">
- $(function() {
- $("#tabs").tabs();
- });
- </script>
-
- <style type="text/css">
- table.palette td.header {
- background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
- repeat-x scroll 50% 50% #E6E6E6 !important;
- }
-
- /* tr.alt td {
- background: #eff3ea;
- }
-
- .stripedTable{
- border:1px solid #AAAAAA;
- }*/
-
- </style>
- </head>
- <body>
- <div wicket:id="feedback"/>
+ <link rel="stylesheet" type="text/css" href="css/jquery.ui.button.css" />
+ <link rel="stylesheet" type="text/css" href="css/jquery.ui.core.css" />
+ <link rel="stylesheet" type="text/css" href="css/jquery.ui.dialog.css" />
+ <link rel="stylesheet" type="text/css" href="css/jquery.ui.resizable.css" />
+ <link rel="stylesheet" type="text/css" href="css/jquery.ui.tabs.css" />
+ <link rel="stylesheet" type="text/css" href="css/jquery.ui.theme.css" />
+ <link rel="stylesheet" type="text/css" href="css/jquery.ui.tabs.css" media="all"/>
+
+ <link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
+ <link rel="stylesheet" type="text/css" href="css/fieldstyle.css" />
+
+ <script type="text/javascript" src="scripts/jquery-1.4.2.min.js"></script>
+ <script type="text/javascript" src="scripts/jquery-ui-1.8.5.custom.min.js"></script>
+
+ <script type="text/javascript" src="scripts/singlecolumnpalette.js"></script>
+
+ <script type="text/javascript">
+ $(function() {
+ $("#tabs").tabs();
+ });
+ </script>
+
+ <style type="text/css">
+ table.palette td.header {
+ background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
+ repeat-x scroll 50% 50% #E6E6E6 !important;
+ }
+
+ /* tr.alt td {
+ background: #eff3ea;
+ }
+
+ .stripedTable{
+ border:1px solid #AAAAAA;
+ }*/
+
+ </style>
+ </head>
+ <body>
+ <div wicket:id="feedback"/>
- <wicket:child />
+ <wicket:child />
</body>
</html>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.properties?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.properties Mon Aug 13 16:07:55 2012
@@ -17,3 +17,4 @@
submit=Save
add=Add
remove=Delete
+cancel=Cancel
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage_it.properties?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage_it.properties Mon Aug 13 16:07:55 2012
@@ -17,3 +17,4 @@
submit=Salva
add=Aggiungi
remove=Elimina
+cancel=Annulla
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html Mon Aug 13 16:07:55 2012
@@ -13,32 +13,35 @@
under the License.
-->
<wicket:extend>
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title" /></p>
+ <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title" /></p>
<div style="margin:10px">
- <form wicket:id="form">
- <div id="formtable">
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="key"><wicket:message key="key"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="key">[key]</span>
- </div>
- </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="value"><wicket:message key="value"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="value">[value]</span>
- </div>
- </div>
+ <form wicket:id="form">
+ <div id="formtable">
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="key"><wicket:message key="key"/></label>
</div>
- <div style="margin: 10px 0px 0">
- <input type="submit"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="apply"/>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="key">[key]</span>
</div>
- </form>
+ </div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="value"><wicket:message key="value"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="value">[value]</span>
+ </div>
+ </div>
+ </div>
+ <div style="margin: 10px 0px 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>
</wicket:extend>
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html Mon Aug 13 16:07:55 2012
@@ -13,119 +13,122 @@
under the License.
-->
<wicket:head>
- <style type="text/css">
- table.palette td.header {
- background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
- repeat-x scroll 50% 50% #E6E6E6 !important;
- }
-
- table.palette td.header {
- background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
- repeat-x scroll 50% 50% #E6E6E6 !important;
- }
- </style>
+ <style type="text/css">
+ table.palette td.header {
+ background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
+ repeat-x scroll 50% 50% #E6E6E6 !important;
+ }
+
+ table.palette td.header {
+ background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
+ repeat-x scroll 50% 50% #E6E6E6 !important;
+ }
+ </style>
</wicket:head>
<wicket:extend>
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
+ <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
<div style="margin:10px">
- <form wicket:id="form">
- <div id="tabs">
- <ul>
- <li class="tabs-selected"><a href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li>
- <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
- <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
- </ul>
- <div id="tabs-1">
- <div id="formtable">
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="displayName"><wicket:message key="displayName"/></label>
- </div>
- <div class="tablecolumn_field short_dynamicsize">
- <span wicket:id="displayName">[displayName]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="bundleName"><wicket:message key="bundleName"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="bundle">[bundle]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="name"><wicket:message key="name"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="connectorName">[name]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="version"><wicket:message key="version"/></label>
- </div>
- <div class="tablecolumn_field short_dynamicsize">
- <span wicket:id="version">[version]</span>
- </div>
- </div>
- </div>
- <!-- inside the container in order to re-process javascript -->
- <script type="text/javascript">
- $(function() {
- $('#tabs-1 #formtable div.tablerow:even').addClass("alt");
- });
- </script>
- </div>
- <div id="tabs-2">
- <div id="formtable">
- <span wicket:id="container">
- <div style="border-bottom: 10px">
- <div style="width: 40px; text-align: center; font-size: 7px">
- <label for="version"><wicket:message key="overridable"/></label>
- </div>
- </div>
- <form wicket:id="connectorPropForm">
- <div class="tablerow" wicket:id="connectorProperties">
-
- <div class="tablecolumn_check" style="width: 27px; text-align: center; margin-right: 10px">
- <span wicket:id="connPropAttrOverridable">[connPropAttrOverridable]</span>
- </div>
- <div class="tablecolumn_label short_dynamicsize">
- <span wicket:id="connPropAttrSchema">[connPropAttrSchema]</span>
- </div>
- <div class="tablecolumn_field short_dynamicsize">
- <span wicket:id="panel">[panel]</span>
- </div>
- </div>
- <div>
- <label style="position: absolute; top: 10px; right:55px;"><wicket:message key="check"/></label>
- <a style="position: absolute; top: 2px; right:20px;" wicket:id="check">
- <img src="img/ping.png" width="30" height="30" /></a>
- </div>
- </form>
- <!-- inside the container in order to re-process javascript -->
- <script type="text/javascript">
- $(function() {
- $('#tabs-2 #formtable div.tablerow:even').addClass("alt");
- });
- </script>
- </span>
- </div>
+ <form wicket:id="form">
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected"><a href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li>
+ <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
+ <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
+ </ul>
+ <div id="tabs-1">
+ <div id="formtable">
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="displayName"><wicket:message key="displayName"/></label>
+ </div>
+ <div class="tablecolumn_field short_dynamicsize">
+ <span wicket:id="displayName">[displayName]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="bundleName"><wicket:message key="bundleName"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="bundle">[bundle]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="name"><wicket:message key="name"/></label>
</div>
- <div id="tabs-3">
- <span wicket:id="capabilitiesPalette"/>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="connectorName">[name]</span>
</div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="version"><wicket:message key="version"/></label>
+ </div>
+ <div class="tablecolumn_field short_dynamicsize">
+ <span wicket:id="version">[version]</span>
+ </div>
+ </div>
</div>
+ <!-- inside the container in order to re-process javascript -->
+ <script type="text/javascript">
+ $(function() {
+ $('#tabs-1 #formtable div.tablerow:even').addClass("alt");
+ });
+ </script>
+ </div>
+ <div id="tabs-2">
+ <div id="formtable">
+ <span wicket:id="container">
+ <div style="border-bottom: 10px">
+ <div style="width: 40px; text-align: center; font-size: 7px">
+ <label for="version"><wicket:message key="overridable"/></label>
+ </div>
+ </div>
+ <form wicket:id="connectorPropForm">
+ <div class="tablerow" wicket:id="connectorProperties">
- <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"/>
+ <div class="tablecolumn_check" style="width: 27px; text-align: center; margin-right: 10px">
+ <span wicket:id="connPropAttrOverridable">[connPropAttrOverridable]</span>
+ </div>
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="connPropAttrSchema">[connPropAttrSchema]</span>
+ </div>
+ <div class="tablecolumn_field short_dynamicsize">
+ <span wicket:id="panel">[panel]</span>
+ </div>
+ </div>
+ <div>
+ <label style="position: absolute; top: 10px; right:55px;"><wicket:message key="check"/></label>
+ <a style="position: absolute; top: 2px; right:20px;" wicket:id="check">
+ <img src="img/ping.png" width="30" height="30" /></a>
+ </div>
+ </form>
+ <!-- inside the container in order to re-process javascript -->
+ <script type="text/javascript">
+ $(function() {
+ $('#tabs-2 #formtable div.tablerow:even').addClass("alt");
+ });
+ </script>
+ </span>
</div>
- </form>
+ </div>
+ <div id="tabs-3">
+ <span wicket:id="capabilitiesPalette"/>
+ </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>
</wicket:extend>
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html?rev=1372486&r1=1372485&r2=1372486&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html Mon Aug 13 16:07:55 2012
@@ -38,6 +38,9 @@
<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>