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/02/15 15:00:05 UTC
svn commit: r1446584 [3/6] - in /syncope/branches/1_0_X/console/src/main:
java/org/apache/syncope/console/pages/
java/org/apache/syncope/console/pages/panels/
java/org/apache/syncope/console/wicket/ajax/markup/html/
java/org/apache/syncope/console/wick...
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java Fri Feb 15 14:00:02 2013
@@ -31,6 +31,7 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.Tasks.TasksProvider;
import org.apache.syncope.console.pages.UserTemplateModalPage;
import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
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;
@@ -40,7 +41,6 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -85,7 +85,7 @@ public class SyncTasks extends Panel {
private AjaxFallbackDefaultDataTable<TaskTO> table;
- public SyncTasks(String id, final PageReference callerPageRef) {
+ public SyncTasks(final String id, final PageReference pageRef) {
super(id);
container = new WebMarkupContainer("container");
@@ -99,7 +99,7 @@ public class SyncTasks extends Panel {
window.setCookieName("view-task-win");
add(window);
- ((Tasks) callerPageRef.getPage()).setWindowClosedCallback(window, container);
+ ((Tasks) pageRef.getPage()).setWindowClosedCallback(window, container);
paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_SYNC_TASKS_PAGINATOR_ROWS);
@@ -130,7 +130,7 @@ public class SyncTasks extends Panel {
final SyncTaskTO taskTO = (SyncTaskTO) model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
panel.add(new ActionLink() {
@@ -145,7 +145,7 @@ public class SyncTasks extends Panel {
@Override
public Page createPage() {
- return new SyncTaskModalPage(window, taskTO, callerPageRef);
+ return new SyncTaskModalPage(window, taskTO, pageRef);
}
});
@@ -166,7 +166,7 @@ public class SyncTasks extends Panel {
@Override
public Page createPage() {
- return new UserTemplateModalPage(callerPageRef, window, taskTO);
+ return new UserTemplateModalPage(pageRef, window, taskTO);
}
});
@@ -267,19 +267,19 @@ public class SyncTasks extends Panel {
add(paginatorForm);
// create new user
- AjaxLink createLink = new IndicatingAjaxLink("createLink") {
+ AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
window.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@Override
public Page createPage() {
- return new SyncTaskModalPage(window, new SyncTaskTO(), callerPageRef);
+ return new SyncTaskModalPage(window, new SyncTaskTO(), pageRef);
}
});
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java Fri Feb 15 14:00:02 2013
@@ -25,6 +25,13 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.syncope.client.to.AttributeTO;
+import org.apache.syncope.client.to.ConnObjectTO;
+import org.apache.syncope.client.to.PropagationTO;
+import org.apache.syncope.client.to.UserTO;
+import org.apache.syncope.console.commons.StatusUtils;
+import org.apache.syncope.console.pages.UserModalPage;
+import org.apache.syncope.types.PropagationTaskExecStatus;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -43,13 +50,6 @@ import org.apache.wicket.model.ResourceM
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.syncope.client.to.AttributeTO;
-import org.apache.syncope.client.to.ConnObjectTO;
-import org.apache.syncope.client.to.PropagationTO;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.console.commons.StatusUtils;
-import org.apache.syncope.console.pages.UserModalPage;
-import org.apache.syncope.types.PropagationTaskExecStatus;
/**
* User management result panel.
@@ -198,7 +198,7 @@ public class UserManagementResultPanel e
final ConnObjectTO after = propTO.getAfter();
// sorted in reversed presentation order
- final List<String> head = Arrays.asList(new String[] { "__PASSWORD__", "__ENABLE__", "__UID__", "__NAME__" });
+ final List<String> head = Arrays.asList(new String[]{"__PASSWORD__", "__ENABLE__", "__UID__", "__NAME__"});
final Map<String, AttributeTO> beforeAttrMap;
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchPanel.java?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchPanel.java Fri Feb 15 14:00:02 2013
@@ -37,11 +37,12 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.rest.ResourceRestClient;
import org.apache.syncope.console.rest.RoleRestClient;
import org.apache.syncope.console.rest.SchemaRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.types.AttributableType;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.feedback.IFeedbackMessageFilter;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -72,9 +73,9 @@ public class UserSearchPanel extends Pan
*/
private static final Logger LOG = LoggerFactory.getLogger(UserSearchPanel.class);
- private List<String> ATTRIBUTES_NOTINCLUDED = Arrays.
- asList(new String[]{"attributes", "derivedAttributes",
- "virtualAttributes", "serialVersionUID", "memberships", "resources", "password", "propagationStatusMap"});
+ private List<String> ATTRIBUTES_NOTINCLUDED = Arrays.asList(new String[]{
+ "attributes", "derivedAttributes", "virtualAttributes",
+ "serialVersionUID", "memberships", "resources", "password", "propagationStatusMap"});
@SpringBean
private SchemaRestClient schemaRestClient;
@@ -182,17 +183,22 @@ public class UserSearchPanel extends Pan
final List<SearchCondWrapper> searchConditionList;
- public UserSearchPanel(final String id) {
- this(id, null, true);
+ final PageReference pageRef;
+
+ public UserSearchPanel(final String id, final PageReference pageRef) {
+ this(id, null, true, pageRef);
}
- public UserSearchPanel(final String id, final NodeCond initCond) {
- this(id, initCond, true);
+ public UserSearchPanel(final String id, final NodeCond initCond, final PageReference pageRef) {
+ this(id, initCond, true, pageRef);
}
- public UserSearchPanel(final String id, final NodeCond initNodeCond, final boolean required) {
+ public UserSearchPanel(final String id, final NodeCond initNodeCond, final boolean required,
+ final PageReference pageRef) {
+
super(id);
this.required = required;
+ this.pageRef = pageRef;
setOutputMarkupId(true);
@@ -230,13 +236,13 @@ public class UserSearchPanel extends Pan
}
searchFormContainer.add(new SearchView("searchView", searchConditionList, searchFormContainer));
- AjaxButton addAndButton = new IndicatingAjaxButton("addAndButton", new ResourceModel("addAndButton")) {
+ AjaxButton addAndButton = new ClearIndicatingAjaxButton("addAndButton", new ResourceModel("addAndButton"),
+ pageRef) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
SearchCondWrapper conditionWrapper = new SearchCondWrapper();
conditionWrapper.setOperationType(OperationType.AND);
searchConditionList.add(conditionWrapper);
@@ -251,12 +257,13 @@ public class UserSearchPanel extends Pan
addAndButton.setDefaultFormProcessing(false);
searchFormContainer.add(addAndButton);
- AjaxButton addOrButton = new IndicatingAjaxButton("addOrButton", new ResourceModel("addOrButton")) {
+ AjaxButton addOrButton = new ClearIndicatingAjaxButton("addOrButton", new ResourceModel("addOrButton"),
+ pageRef) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
SearchCondWrapper conditionWrapper = new SearchCondWrapper();
conditionWrapper.setOperationType(OperationType.OR);
searchConditionList.add(conditionWrapper);
@@ -522,12 +529,13 @@ public class UserSearchPanel extends Pan
filterTypeChooser.setRequired(required);
item.add(filterTypeChooser);
- AjaxButton dropButton = new IndicatingAjaxButton("dropButton", new ResourceModel("dropButton")) {
+ AjaxButton dropButton = new ClearIndicatingAjaxButton("dropButton", new ResourceModel("dropButton"),
+ pageRef) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
getList().remove(Integer.valueOf(getParent().getId()).intValue());
target.add(searchFormContainer);
}
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java Fri Feb 15 14:00:02 2013
@@ -19,12 +19,22 @@
package org.apache.syncope.console.pages.panels;
import java.util.List;
+import org.apache.syncope.client.to.AbstractAttributableTO;
+import org.apache.syncope.client.to.AttributeTO;
+import org.apache.syncope.client.to.RoleTO;
+import org.apache.syncope.client.to.UserTO;
+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.AjaxDecoratedCheckbox;
+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.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
import org.apache.wicket.ajax.calldecorator.AjaxPreprocessingCallDecorator;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -38,15 +48,6 @@ 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.AbstractAttributableTO;
-import org.apache.syncope.client.to.AttributeTO;
-import org.apache.syncope.client.to.RoleTO;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.console.rest.SchemaRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox;
-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;
public class VirtualAttributesPanel extends Panel {
@@ -56,7 +57,7 @@ public class VirtualAttributesPanel exte
private SchemaRestClient schemaRestClient;
public <T extends AbstractAttributableTO> VirtualAttributesPanel(final String id, final T entityTO,
- final boolean templateMode) {
+ final boolean templateMode, final PageReference pageRef) {
super(id);
@@ -83,20 +84,19 @@ public class VirtualAttributesPanel exte
attributesContainer.setOutputMarkupId(true);
add(attributesContainer);
- AjaxButton addAttributeBtn = new IndicatingAjaxButton("addAttributeBtn", new ResourceModel("addAttributeBtn")) {
+ AjaxButton addAttributeBtn = new ClearIndicatingAjaxButton("addAttributeBtn",
+ new ResourceModel("addAttributeBtn"), pageRef) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
entityTO.addVirtualAttribute(new AttributeTO());
target.add(attributesContainer);
}
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
-
target.add(attributesContainer);
}
};
Added: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxButton.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxButton.java?rev=1446584&view=auto
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxButton.java (added)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxButton.java Fri Feb 15 14:00:02 2013
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.console.wicket.ajax.markup.html;
+
+import org.apache.syncope.console.pages.BasePage;
+import org.apache.wicket.Page;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
+
+public abstract class ClearIndicatingAjaxButton extends IndicatingAjaxButton {
+
+ private static final long serialVersionUID = 7206379812788748287L;
+
+ private final PageReference pageRef;
+
+ public ClearIndicatingAjaxButton(final String id, final PageReference pageRef) {
+ super(id);
+ this.pageRef = pageRef;
+ }
+
+ public ClearIndicatingAjaxButton(final String id, Form<?> form, final PageReference pageRef) {
+ super(id, form);
+ this.pageRef = pageRef;
+ }
+
+ public ClearIndicatingAjaxButton(final String id, IModel<String> model, final PageReference pageRef) {
+ super(id, model);
+ this.pageRef = pageRef;
+ }
+
+ public ClearIndicatingAjaxButton(final String id, final IModel<String> model, final Form<?> form,
+ final PageReference pageRef) {
+
+ super(id, model, form);
+ this.pageRef = pageRef;
+ }
+
+ protected abstract void onSubmitInternal(AjaxRequestTarget target, Form<?> form);
+
+ @Override
+ protected final void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ super.onSubmit(target, form);
+
+ Page page = pageRef.getPage();
+ if (page instanceof BasePage) {
+ target.add(((BasePage) page).getFeedbackPanel());
+ }
+ onSubmitInternal(target, form);
+ }
+}
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxButton.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxButton.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxButton.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxLink.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxLink.java?rev=1446584&view=auto
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxLink.java (added)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxLink.java Fri Feb 15 14:00:02 2013
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.console.wicket.ajax.markup.html;
+
+import org.apache.syncope.console.pages.BasePage;
+import org.apache.wicket.Page;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
+import org.apache.wicket.model.IModel;
+
+public abstract class ClearIndicatingAjaxLink<T> extends IndicatingAjaxLink<T> {
+
+ private static final long serialVersionUID = 7913625094362339643L;
+
+ private final PageReference pageRef;
+
+ public ClearIndicatingAjaxLink(final String id, final PageReference pageRef) {
+ super(id);
+ this.pageRef = pageRef;
+ }
+
+ public ClearIndicatingAjaxLink(final String id, final IModel<T> model, final PageReference pageRef) {
+ super(id, model);
+ this.pageRef = pageRef;
+ }
+
+ protected abstract void onClickInternal(AjaxRequestTarget target);
+
+ @Override
+ public final void onClick(final AjaxRequestTarget target) {
+ Page page = pageRef.getPage();
+ if (page instanceof BasePage) {
+ target.add(((BasePage) page).getFeedbackPanel());
+ }
+ onClickInternal(target);
+ }
+}
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxLink.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxLink.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/ClearIndicatingAjaxLink.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java Fri Feb 15 14:00:02 2013
@@ -18,21 +18,21 @@
*/
package org.apache.syncope.console.wicket.ajax.markup.html;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.IAjaxCallDecorator;
import org.apache.wicket.ajax.calldecorator.AjaxPreprocessingCallDecorator;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.model.IModel;
-public abstract class IndicatingDeleteOnConfirmAjaxLink<T> extends IndicatingAjaxLink<T> {
+public abstract class IndicatingDeleteOnConfirmAjaxLink<T> extends ClearIndicatingAjaxLink<T> {
private static final long serialVersionUID = 2228670850922265663L;
- public IndicatingDeleteOnConfirmAjaxLink(final String id, final IModel<T> model) {
- super(id, model);
+ public IndicatingDeleteOnConfirmAjaxLink(final String id, final PageReference pageRef) {
+ super(id, pageRef);
}
- public IndicatingDeleteOnConfirmAjaxLink(final String id) {
- super(id);
+ public IndicatingDeleteOnConfirmAjaxLink(final String id, final IModel<T> model, final PageReference pageRef) {
+ super(id, model, pageRef);
}
@Override
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java Fri Feb 15 14:00:02 2013
@@ -18,19 +18,19 @@
*/
package org.apache.syncope.console.wicket.markup.html.form;
+import org.apache.syncope.console.commons.XMLRolesReader;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
+import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.console.commons.XMLRolesReader;
-import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
/**
- * This empty class must exist because there not seems to be alternative to
- * provide specialized HTML for edit links.
+ * This empty class must exist because there not seems to be alternative to provide specialized HTML for edit links.
*/
public class ActionLinksPanel extends Panel {
@@ -42,8 +42,11 @@ public class ActionLinksPanel extends Pa
@SpringBean
protected XMLRolesReader xmlRolesReader;
- public ActionLinksPanel(final String componentId, final IModel<?> model) {
+ private final PageReference pageRef;
+
+ public ActionLinksPanel(final String componentId, final IModel<?> model, final PageReference pageRef) {
super(componentId, model);
+ this.pageRef = pageRef;
super.add(new Fragment("panelClaim", "emptyFragment", this));
super.add(new Fragment("panelCreate", "emptyFragment", this));
@@ -56,7 +59,8 @@ public class ActionLinksPanel extends Pa
super.add(new Fragment("panelExport", "emptyFragment", this));
}
- public void add(final ActionLink link, final ActionLink.ActionType type, final String pageId, final String actionId) {
+ public void add(final ActionLink link, final ActionLink.ActionType type, final String pageId,
+ final String actionId) {
add(link, type, xmlRolesReader.getAllAllowedRoles(pageId, actionId), true);
}
@@ -72,7 +76,8 @@ public class ActionLinksPanel extends Pa
add(link, type, roles, true);
}
- public void add(final ActionLink link, final ActionLink.ActionType type, final String roles, final boolean enabled) {
+ public void add(final ActionLink link, final ActionLink.ActionType type, final String roles,
+ final boolean enabled) {
Fragment fragment = null;
@@ -80,13 +85,12 @@ public class ActionLinksPanel extends Pa
case CLAIM:
fragment = new Fragment("panelClaim", "fragmentClaim", this);
- fragment.addOrReplace(new IndicatingAjaxLink("claimLink") {
+ fragment.addOrReplace(new ClearIndicatingAjaxLink("claimLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
@@ -94,13 +98,12 @@ public class ActionLinksPanel extends Pa
case CREATE:
fragment = new Fragment("panelCreate", "fragmentCreate", this);
- fragment.addOrReplace(new IndicatingAjaxLink("createLink") {
+ fragment.addOrReplace(new ClearIndicatingAjaxLink("createLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
@@ -109,13 +112,12 @@ public class ActionLinksPanel extends Pa
case EDIT:
fragment = new Fragment("panelEdit", "fragmentEdit", this);
- fragment.addOrReplace(new IndicatingAjaxLink("editLink") {
+ fragment.addOrReplace(new ClearIndicatingAjaxLink("editLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
@@ -123,13 +125,12 @@ public class ActionLinksPanel extends Pa
case TEMPLATE:
fragment = new Fragment("panelTemplate", "fragmentTemplate", this);
- fragment.addOrReplace(new IndicatingAjaxLink("templateLink") {
+ fragment.addOrReplace(new ClearIndicatingAjaxLink("templateLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
@@ -137,13 +138,12 @@ public class ActionLinksPanel extends Pa
case SEARCH:
fragment = new Fragment("panelSearch", "fragmentSearch", this);
- fragment.addOrReplace(new IndicatingAjaxLink("searchLink") {
+ fragment.addOrReplace(new ClearIndicatingAjaxLink("searchLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
@@ -151,13 +151,12 @@ public class ActionLinksPanel extends Pa
case EXECUTE:
fragment = new Fragment("panelExecute", "fragmentExecute", this);
- fragment.addOrReplace(new IndicatingAjaxLink("executeLink") {
+ fragment.addOrReplace(new ClearIndicatingAjaxLink("executeLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
@@ -165,13 +164,12 @@ public class ActionLinksPanel extends Pa
case DRYRUN:
fragment = new Fragment("panelDryRun", "fragmentDryRun", this);
- fragment.addOrReplace(new IndicatingAjaxLink("dryRunLink") {
+ fragment.addOrReplace(new ClearIndicatingAjaxLink("dryRunLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
@@ -179,13 +177,12 @@ public class ActionLinksPanel extends Pa
case DELETE:
fragment = new Fragment("panelDelete", "fragmentDelete", this);
- fragment.addOrReplace(new IndicatingDeleteOnConfirmAjaxLink("deleteLink") {
+ fragment.addOrReplace(new IndicatingDeleteOnConfirmAjaxLink("deleteLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
@@ -194,19 +191,18 @@ public class ActionLinksPanel extends Pa
case EXPORT:
fragment = new Fragment("panelExport", "fragmentExport", this);
- fragment.addOrReplace(new IndicatingAjaxLink("exportLink") {
+ fragment.addOrReplace(new ClearIndicatingAjaxLink("exportLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
link.onClick(target);
}
});
break;
default:
- // do nothink
+ // do nothink
}
if (fragment != null) {
@@ -248,7 +244,7 @@ public class ActionLinksPanel extends Pa
super.addOrReplace(new Fragment("panelExport", "emptyFragment", this));
break;
default:
- // do nothink
+ // do nothink
}
}
}
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java Fri Feb 15 14:00:02 2013
@@ -18,12 +18,19 @@
*/
package org.apache.syncope.console.wicket.markup.html.tree;
+import org.apache.syncope.client.to.RoleTO;
+import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.XMLRolesReader;
+import org.apache.syncope.console.pages.RoleModalPage;
+import org.apache.syncope.console.pages.Roles;
+import org.apache.syncope.console.rest.RoleRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
+import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -31,13 +38,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.syncope.client.to.RoleTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.commons.XMLRolesReader;
-import org.apache.syncope.console.pages.RoleModalPage;
-import org.apache.syncope.console.pages.Roles;
-import org.apache.syncope.console.rest.RoleRestClient;
-import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
/**
* Panel for a node element form.
@@ -60,7 +60,7 @@ public class TreeActionLinkPanel extends
private Fragment fragment;
public TreeActionLinkPanel(final String id, final long idRole, final IModel inputModel, final ModalWindow window,
- final PageReference callerPageRef) {
+ final PageReference pageRef) {
super(id);
@@ -68,12 +68,12 @@ public class TreeActionLinkPanel extends
? "fakerootFrag"
: "roleFrag", this);
- AjaxLink createRoleLink = new IndicatingAjaxLink("createRoleLink") {
+ AjaxLink createRoleLink = new ClearIndicatingAjaxLink("createRoleLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
window.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@@ -82,7 +82,7 @@ public class TreeActionLinkPanel extends
public Page createPage() {
RoleTO roleTO = new RoleTO();
roleTO.setParent(idRole);
- RoleModalPage form = new RoleModalPage(callerPageRef, window, roleTO);
+ RoleModalPage form = new RoleModalPage(pageRef, window, roleTO);
return form;
}
});
@@ -97,10 +97,10 @@ public class TreeActionLinkPanel extends
fragment.add(createRoleLink);
if (idRole != 0) {
- AjaxLink updateRoleLink = new IndicatingAjaxLink("updateRoleLink") {
+ AjaxLink updateRoleLink = new ClearIndicatingAjaxLink("updateRoleLink", pageRef) {
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
window.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@@ -108,7 +108,7 @@ public class TreeActionLinkPanel extends
@Override
public Page createPage() {
RoleTO roleTO = restClient.readRole(idRole);
- RoleModalPage form = new RoleModalPage(callerPageRef, window, roleTO);
+ RoleModalPage form = new RoleModalPage(pageRef, window, roleTO);
return form;
}
});
@@ -122,10 +122,10 @@ public class TreeActionLinkPanel extends
fragment.add(updateRoleLink);
- AjaxLink dropRoleLink = new IndicatingDeleteOnConfirmAjaxLink("dropRoleLink") {
+ AjaxLink dropRoleLink = new IndicatingDeleteOnConfirmAjaxLink("dropRoleLink", pageRef) {
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
try {
restClient.deleteRole(idRole);
getSession().info(getString("operation_succeded"));
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html Fri Feb 15 14:00:02 2013
@@ -1,62 +1,66 @@
<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- under the License.
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+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: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html Fri Feb 15 14:00:02 2013
@@ -1,157 +1,161 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- under the License.
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Style-Type" content="text/css"/>
- <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-
- <title>Apache Syncope</title>
-
- <link rel="shortcut icon" href="img/favicon.ico" />
-
- <style type="text/css">
- div.wicket-modal div.w_caption {
- height: 16px !important;
- }
- </style>
- <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/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">
- $(document).ready(function() {
- $("#tabs").tabs();
- $("#user").tabs();
- $("#role").tabs();
- $("#membership").tabs();
- });
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Style-Type" content="text/css"/>
+ <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+
+ <title>Apache Syncope</title>
+
+ <link rel="shortcut icon" href="img/favicon.ico" />
+
+ <style type="text/css">
+ div.wicket-modal div.w_caption {
+ height: 16px !important;
+ }
+ </style>
+ <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/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">
+ $(document).ready(function() {
+ $("#tabs").tabs();
+ $("#user").tabs();
+ $("#role").tabs();
+ $("#membership").tabs();
+ });
- /** Add rollover effect to tables supporting Ajax events (live)*/
- $('table.ui-widget.ui-widget-content.table-hover tbody tr')
- .live('mouseover mouseout', function(event) {
- if (event.type == 'mouseover') {
- $(this).addClass('selectedRow');
- } else if (event.type == 'mouseout') {
- $(this).removeClass('selectedRow');
- }
- });
+ /** Add rollover effect to tables supporting Ajax events (live)*/
+ $('table.ui-widget.ui-widget-content.table-hover tbody tr')
+ .live('mouseover mouseout', function(event) {
+ if (event.type == 'mouseover') {
+ $(this).addClass('selectedRow');
+ } else if (event.type == 'mouseout') {
+ $(this).removeClass('selectedRow');
+ }
+ });
- $(document).ready(function() {
- $("#editProfile").hide();
- $("#username").click(function() {
- $("#editProfile").toggle();
- });
- });
- </script>
- </head>
- <body>
- <div id="navigationPane">
- <ul>
- <li style="position: absolute; left: 0px; top: 0px;width:240px;">
- <img src="img/logo.png" alt="logo"/><br />
- <span style="position: absolute; left: 20px;color:#aaaaaa;">
- <span style="font-size:8px;" wicket:id="consoleVersion"/>
- <br/>
- <span style="font-size:8px;" wicket:id="coreVersion"/>
-
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="todo"><img wicket:id="todoIcon" alt="TODO" width="80" height="80" /><br />
- <wicket:message key="todo"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="schema"><img wicket:id="schemaIcon" alt="Schema" width="80" height="80" /><br />
- <wicket:message key="schema"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="users"><img wicket:id="usersIcon" alt="Users" width="80" height="80" /><br />
- <wicket:message key="users"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="roles"><img wicket:id="rolesIcon" alt="Roles" width="80" height="80" /><br />
- <wicket:message key="roles"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="resources"><img wicket:id="resourcesIcon" alt="Resources" width="80" height="80" /><br />
- <wicket:message key="resources"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="tasks"><img wicket:id="tasksIcon" alt="Tasks" width="80" height="80" /><br />
- <wicket:message key="tasks"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="reports"><img wicket:id="reportsIcon" alt="Reports" width="80" height="80" /><br />
- <wicket:message key="reports"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="configuration"><img wicket:id="configurationIcon" alt="Configuration" width="80" height="80" /><br />
- <wicket:message key="configuration"/>
- </a></span>
- </li>
- <li style="float:right;width:auto;text-align:right;">
- <a href="#" wicket:id="logout"><img src="img/menu/logout.png" alt="Logout" width="80" height="80" /><br /></a>
- <div>
- <span id="username" wicket:id="username" style="padding-right: 9px;cursor: pointer;"/>
- <span wicket:id="editProfile"/>
-
- <wicket:fragment wicket:id="adminEmptyFrag"/>
- <wicket:fragment wicket:id="editProfileFrag">
- <br/>
- <span id="editProfile" wicket:id="editProfile"
- style="cursor: pointer;background-color: #446633;padding-left: 9px;padding-right: 9px;"/>
- </wicket:fragment>
- </div>
- </li>
- </ul>
- <div wicket:id="editProfileModal" ></div>
- </div>
-
- <div wicket:id="feedback"/>
-
- <wicket:child />
-
- <div id="veil" style="display:none;position:absolute;top:0;left:0;z-index:99999;background-color:black;width:100%;height:20000px;color:white;opacity:0.3;filter:alpha(opacity=30);">
- <img src="img/busy.gif" style="position:absolute;top:300px;left:50%;margin-left:-75px;width:150px;"/>
- </div>
- </body>
+ $(document).ready(function() {
+ $("#editProfile").hide();
+ $("#username").click(function() {
+ $("#editProfile").toggle();
+ });
+ });
+ </script>
+ </head>
+ <body>
+ <div id="navigationPane">
+ <ul>
+ <li style="position: absolute; left: 0px; top: 0px;width:240px;">
+ <img src="img/logo.png" alt="logo"/><br />
+ <span style="position: absolute; left: 20px;color:#aaaaaa;">
+ <span style="font-size:8px;" wicket:id="consoleVersion"/>
+ <br/>
+ <span style="font-size:8px;" wicket:id="coreVersion"/>
+
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="todo"><img wicket:id="todoIcon" alt="TODO" width="80" height="80" /><br />
+ <wicket:message key="todo"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="schema"><img wicket:id="schemaIcon" alt="Schema" width="80" height="80" /><br />
+ <wicket:message key="schema"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="users"><img wicket:id="usersIcon" alt="Users" width="80" height="80" /><br />
+ <wicket:message key="users"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="roles"><img wicket:id="rolesIcon" alt="Roles" width="80" height="80" /><br />
+ <wicket:message key="roles"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="resources"><img wicket:id="resourcesIcon" alt="Resources" width="80" height="80" /><br />
+ <wicket:message key="resources"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="tasks"><img wicket:id="tasksIcon" alt="Tasks" width="80" height="80" /><br />
+ <wicket:message key="tasks"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="reports"><img wicket:id="reportsIcon" alt="Reports" width="80" height="80" /><br />
+ <wicket:message key="reports"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="configuration"><img wicket:id="configurationIcon" alt="Configuration" width="80" height="80" /><br />
+ <wicket:message key="configuration"/>
+ </a></span>
+ </li>
+ <li style="float:right;width:auto;text-align:right;">
+ <a href="#" wicket:id="logout"><img src="img/menu/logout.png" alt="Logout" width="80" height="80" /><br /></a>
+ <div>
+ <span id="username" wicket:id="username" style="padding-right: 9px;cursor: pointer;"/>
+ <span wicket:id="editProfile"/>
+
+ <wicket:fragment wicket:id="adminEmptyFrag"/>
+ <wicket:fragment wicket:id="editProfileFrag">
+ <br/>
+ <span id="editProfile" wicket:id="editProfile"
+ style="cursor: pointer;background-color: #446633;padding-left: 9px;padding-right: 9px;"/>
+ </wicket:fragment>
+ </div>
+ </li>
+ </ul>
+ <div wicket:id="editProfileModal" ></div>
+ </div>
+
+ <div wicket:id="feedback"/>
+
+ <wicket:child />
+
+ <div id="veil" style="display:none;position:absolute;top:0;left:0;z-index:99999;background-color:black;width:100%;height:20000px;color:white;opacity:0.3;filter:alpha(opacity=30);">
+ <img src="img/busy.gif" style="position:absolute;top:300px;left:50%;margin-left:-75px;width:150px;"/>
+ </div>
+ </body>
</html>
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html Fri Feb 15 14:00:02 2013
@@ -1,167 +1,171 @@
<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- under the License.
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<wicket:head>
- <link rel="stylesheet" type="text/css" href="css/codemirror.css" />
- <link rel="stylesheet" type="text/css" href="css/codemirror_default_theme.css" />
+ <link rel="stylesheet" type="text/css" href="css/codemirror.css" />
+ <link rel="stylesheet" type="text/css" href="css/codemirror_default_theme.css" />
- <script type="text/javascript" src="scripts/codemirror.js"></script>
- <script type="text/javascript" src="scripts/xmlpure.js"></script>
- <script type="text/javascript">
- function updateTextArea(editor) {
- document.getElementById("workflowDefArea").value = editor.getValue();
- }
- </script>
+ <script type="text/javascript" src="scripts/codemirror.js"></script>
+ <script type="text/javascript" src="scripts/xmlpure.js"></script>
+ <script type="text/javascript">
+ function updateTextArea(editor) {
+ document.getElementById("workflowDefArea").value = editor.getValue();
+ }
+ </script>
</wicket:head>
<wicket:extend>
- <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>
- <li><a href="#tabs-4"><span><wicket:message key="tab4"/></span></a></li>
- <li><a href="#tabs-5"><span><wicket:message key="tab5"/></span></a></li>
- <li><a href="#tabs-6"><span><wicket:message key="tab6"/></span></a></li>
- <li><a href="#tabs-7"><span><wicket:message key="tab7"/></span></a></li>
- <li><a href="#tabs-8"><span><wicket:message key="tab8"/></span></a></li>
- </ul>
- <div id="tabs-1">
-
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="confContainer">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="syncopeconf"/>
- </span>
-
- <span style="float:right">
- <form wicket:id="confPaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
-
- <div wicket:id="createConfigurationWin">[Show modal window for creating configuration]</div>
- <div wicket:id="editConfigurationWin">[Show modal window for editing configuration]</div>
-
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createConfigurationLink">
- <wicket:message key="create_configuration"/>
- </a>
- </div>
- <div id="tabs-2">
- <span wicket:id="passwordPoliciesPanel">[password policies]</span>
- </div>
- <div id="tabs-3">
- <span wicket:id="accountPoliciesPanel">[account policies]</span>
- </div>
- <div id="tabs-4">
- <span wicket:id="syncPoliciesPanel">[sync policies]</span>
- </div>
- <div id="tabs-5">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="notificationContainer">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="notificationTable"/>
- </span>
-
- <span style="float:right">
- <form wicket:id="notificationPaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
-
- <div wicket:id="createNotificationWin">[Show modal window for creating notification]</div>
- <div wicket:id="editNotificationWin">[Show modal window for editing notification]</div>
-
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createNotificationLink">
- <wicket:message key="create_notification"/>
- </a>
- </div>
- <div id="tabs-6">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="workflowDefContainer">
- <form wicket:id="workflowDefForm">
- <textarea wicket:id="workflowDefArea" id="workflowDefArea" style="width:100%;height:350px;">
- </textarea>
- <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>
- </form>
- <script>
- var editor = CodeMirror.fromTextArea(document.getElementById("workflowDefArea"),
- {mode: {name: "xmlpure"}, lineNumbers: true, onChange: updateTextArea});
- </script>
- </span>
- </div>
- </div>
- <div id="tabs-7">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="coreLoggerContainer">
- <table class="ui-widget ui-widget-content table-hover">
- <thead class="ui-widget-header">
- <tr class="heaaders">
- <th><wicket:message key="logger"/></th>
- <th><wicket:message key="level"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="corelogger">
- <td><span wicket:id="name"/></td>
- <td><select wicket:id="level"/></td>
- </tr>
- </tbody>
- </table>
- </span>
- </div>
- </div>
- <div id="tabs-8">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="consoleLoggerContainer">
- <table class="ui-widget ui-widget-content table-hover">
- <thead class="ui-widget-header">
- <tr class="heaaders">
- <th><wicket:message key="logger"/></th>
- <th><wicket:message key="level"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="consolelogger">
- <td><span wicket:id="name"/></td>
- <td><select wicket:id="level"/></td>
- </tr>
- </tbody>
- </table>
- </span>
+ <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>
+ <li><a href="#tabs-4"><span><wicket:message key="tab4"/></span></a></li>
+ <li><a href="#tabs-5"><span><wicket:message key="tab5"/></span></a></li>
+ <li><a href="#tabs-6"><span><wicket:message key="tab6"/></span></a></li>
+ <li><a href="#tabs-7"><span><wicket:message key="tab7"/></span></a></li>
+ <li><a href="#tabs-8"><span><wicket:message key="tab8"/></span></a></li>
+ </ul>
+ <div id="tabs-1">
+
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="confContainer">
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="syncopeconf"/>
+ </span>
+
+ <span style="float:right">
+ <form wicket:id="confPaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
+
+ <div wicket:id="createConfigurationWin">[Show modal window for creating configuration]</div>
+ <div wicket:id="editConfigurationWin">[Show modal window for editing configuration]</div>
+
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createConfigurationLink">
+ <wicket:message key="create_configuration"/>
+ </a>
+ </div>
+ <div id="tabs-2">
+ <span wicket:id="passwordPoliciesPanel">[password policies]</span>
+ </div>
+ <div id="tabs-3">
+ <span wicket:id="accountPoliciesPanel">[account policies]</span>
+ </div>
+ <div id="tabs-4">
+ <span wicket:id="syncPoliciesPanel">[sync policies]</span>
+ </div>
+ <div id="tabs-5">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="notificationContainer">
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="notificationTable"/>
+ </span>
+
+ <span style="float:right">
+ <form wicket:id="notificationPaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
+
+ <div wicket:id="createNotificationWin">[Show modal window for creating notification]</div>
+ <div wicket:id="editNotificationWin">[Show modal window for editing notification]</div>
+
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createNotificationLink">
+ <wicket:message key="create_notification"/>
+ </a>
+ </div>
+ <div id="tabs-6">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="workflowDefContainer">
+ <form wicket:id="workflowDefForm">
+ <textarea wicket:id="workflowDefArea" id="workflowDefArea" style="width:100%;height:350px;">
+ </textarea>
+ <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>
- </div>
- <div>
- <label style="position: absolute; top: 10px; right:55px;"><wicket:message key="db_export"/></label>
- <a style="position: absolute; top: 2px; right:20px;" wicket:id="dbExportLink">
- <img src="img/db_export.png" alt="DB export" width="30" height="30" /></a>
- </div>
-
+ </form>
+ <script>
+ var editor = CodeMirror.fromTextArea(document.getElementById("workflowDefArea"),
+ {mode: {name: "xmlpure"}, lineNumbers: true, onChange: updateTextArea});
+ </script>
+ </span>
+ </div>
+ </div>
+ <div id="tabs-7">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="coreLoggerContainer">
+ <table class="ui-widget ui-widget-content table-hover">
+ <thead class="ui-widget-header">
+ <tr class="heaaders">
+ <th><wicket:message key="logger"/></th>
+ <th><wicket:message key="level"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="corelogger">
+ <td><span wicket:id="name"/></td>
+ <td><select wicket:id="level"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </span>
+ </div>
</div>
+ <div id="tabs-8">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="consoleLoggerContainer">
+ <table class="ui-widget ui-widget-content table-hover">
+ <thead class="ui-widget-header">
+ <tr class="heaaders">
+ <th><wicket:message key="logger"/></th>
+ <th><wicket:message key="level"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="consolelogger">
+ <td><span wicket:id="name"/></td>
+ <td><select wicket:id="level"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </span>
+ </div>
+ </div>
+ <div>
+ <label style="position: absolute; top: 10px; right:55px;"><wicket:message key="db_export"/></label>
+ <a style="position: absolute; top: 2px; right:20px;" wicket:id="dbExportLink">
+ <img src="img/db_export.png" alt="DB export" width="30" height="30" /></a>
+ </div>
+
+ </div>
</wicket:extend>
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html?rev=1446584&r1=1446583&r2=1446584&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html Fri Feb 15 14:00:02 2013
@@ -1,44 +1,48 @@
<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+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"/>
+ </div>
+ </form>
</div>
</wicket:extend>
\ No newline at end of file