You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/04/02 14:43:21 UTC
svn commit: r1463508 - in /syncope/trunk/console/src/main:
java/org/apache/syncope/console/pages/NotificationModalPage.java
java/org/apache/syncope/console/pages/PolicyModalPage.java
resources/org/apache/syncope/console/pages/PolicyModalPage.html
Author: ilgrosso
Date: Tue Apr 2 12:43:21 2013
New Revision: 1463508
URL: http://svn.apache.org/r1463508
Log:
Moving some ClearIndicating to Indicating (avoid AJAX warnings)
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1463508&r1=1463507&r2=1463508&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Tue Apr 2 12:43:21 2013
@@ -32,7 +32,6 @@ import org.apache.syncope.common.validat
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.ajax.markup.html.ClearIndicatingAjaxButton;
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;
@@ -42,6 +41,7 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -195,12 +195,12 @@ class NotificationModalPage extends Base
}
});
- AjaxButton submit = new ClearIndicatingAjaxButton("apply", new Model<String>(getString("submit")), pageRef) {
+ AjaxButton submit = new IndicatingAjaxButton("apply", new Model<String>(getString("submit"))) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
notificationTO.setAbout(about.buildSearchCond());
notificationTO.setRecipients(checkRecipients.getModelObject() ? recipients.buildSearchCond() : null);
@@ -229,12 +229,12 @@ class NotificationModalPage extends Base
}
};
- final AjaxButton cancel = new ClearIndicatingAjaxButton("cancel", new ResourceModel("cancel"), pageRef) {
+ final AjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
window.close(target);
}
};
@@ -248,7 +248,7 @@ class NotificationModalPage extends Base
form.add(submit);
form.setDefaultButton(submit);
-
+
form.add(cancel);
add(form);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java?rev=1463508&r1=1463507&r2=1463508&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java Tue Apr 2 12:43:21 2013
@@ -30,7 +30,6 @@ import org.apache.syncope.common.types.P
import org.apache.syncope.common.types.SyncPolicySpec;
import org.apache.syncope.console.pages.panels.PolicyBeanPanel;
import org.apache.syncope.console.rest.PolicyRestClient;
-import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.PageReference;
@@ -79,17 +78,17 @@ public class PolicyModalPage<T extends P
switch (policyTO.getType()) {
case GLOBAL_ACCOUNT:
case ACCOUNT:
- type.setChoices(Arrays.asList(new PolicyType[]{PolicyType.GLOBAL_ACCOUNT, PolicyType.ACCOUNT}));
+ type.setChoices(Arrays.asList(new PolicyType[] {PolicyType.GLOBAL_ACCOUNT, PolicyType.ACCOUNT}));
break;
case GLOBAL_PASSWORD:
case PASSWORD:
- type.setChoices(Arrays.asList(new PolicyType[]{PolicyType.GLOBAL_PASSWORD, PolicyType.PASSWORD}));
+ type.setChoices(Arrays.asList(new PolicyType[] {PolicyType.GLOBAL_PASSWORD, PolicyType.PASSWORD}));
break;
case GLOBAL_SYNC:
case SYNC:
- type.setChoices(Arrays.asList(new PolicyType[]{PolicyType.GLOBAL_SYNC, PolicyType.SYNC}));
+ type.setChoices(Arrays.asList(new PolicyType[] {PolicyType.GLOBAL_SYNC, PolicyType.SYNC}));
default:
}
@@ -103,12 +102,12 @@ public class PolicyModalPage<T extends P
form.add(new PolicyBeanPanel("panel", policy));
- final AjaxButton submit = new ClearIndicatingAjaxButton("apply", new ResourceModel("apply"), pageRef) {
+ final AjaxButton submit = new IndicatingAjaxButton("apply", new ResourceModel("apply")) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
setPolicySpecification(policyTO, policy);
try {
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html?rev=1463508&r1=1463507&r2=1463508&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html Tue Apr 2 12:43:21 2013
@@ -16,61 +16,63 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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="#description"><span><wicket:message key="policyDescription"/></span></a></li>
- <li><a href="#specification"><span><wicket:message key="policySpecification"/></span></a></li>
- </ul>
-
- <div id="description">
- <div id="formtable">
- <div class="tablerow alt">
- <div class="tablecolumn_label short_fixedsize">
- <label for="id"><wicket:message key="id"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_fixedsize">
- <label for="type"><wicket:message key="type"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="type">[type]</span>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <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="#description"><span><wicket:message key="policyDescription"/></span></a></li>
+ <li><a href="#specification"><span><wicket:message key="policySpecification"/></span></a></li>
+ </ul>
+
+ <div id="description">
+ <div id="formtable">
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_fixedsize">
+ <label for="id"><wicket:message key="id"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="id">[id]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_fixedsize">
+ <label for="type"><wicket:message key="type"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="type">[type]</span>
+ </div>
+ </div>
+
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_fixedsize">
+ <label for="description"><wicket:message key="description"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="description">[description]</span>
+ </div>
</div>
</div>
+ </div>
- <div class="tablerow alt">
- <div class="tablecolumn_label short_fixedsize">
- <label for="description"><wicket:message key="description"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="description">[description]</span>
- </div>
- </div>
+ <div id="specification">
+ <span wicket:id="panel">[password policy panel]</span>
</div>
</div>
- <div id="specification">
- <span wicket:id="panel">[password policy panel]</span>
+ <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>
- </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>
+ </form>
+ </div>
+ </wicket:extend>
+</html>