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/08 12:37:35 UTC
svn commit: r1443945 - in /syncope/branches/1_0_X/console/src:
main/java/org/apache/syncope/console/pages/panels/
main/java/org/apache/syncope/console/wicket/markup/html/form/
main/resources/org/apache/syncope/console/
main/resources/org/apache/syncope...
Author: ilgrosso
Date: Fri Feb 8 11:37:35 2013
New Revision: 1443945
URL: http://svn.apache.org/r1443945
Log:
[SYNCOPE-310] Workaround waiting for WICKET-5029 availability
Added:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java (with props)
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html (with props)
syncope/branches/1_0_X/console/src/main/webapp/img/left-icon.png (with props)
syncope/branches/1_0_X/console/src/main/webapp/img/right-icon.png (with props)
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.java
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.html
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java Fri Feb 8 11:37:35 2013
@@ -26,6 +26,15 @@ import java.util.Arrays;
import java.util.List;
import java.util.Set;
import org.apache.syncope.annotation.SchemaList;
+import org.apache.syncope.console.commons.XMLRolesReader;
+import org.apache.syncope.console.rest.SchemaRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.AbstractFieldPanel;
+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.console.wicket.markup.html.form.FieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
import org.apache.syncope.types.AbstractPolicySpec;
import org.apache.syncope.types.AttributableType;
import org.apache.syncope.types.ConflictResolutionAction;
@@ -45,15 +54,6 @@ import org.apache.wicket.spring.injectio
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
-import org.apache.syncope.console.commons.XMLRolesReader;
-import org.apache.syncope.console.rest.SchemaRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AbstractFieldPanel;
-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.console.wicket.markup.html.form.FieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
public class PolicyBeanPanel extends Panel {
@@ -104,8 +104,7 @@ public class PolicyBeanPanel extends Pan
private static final long serialVersionUID = 9101744072914090143L;
@Override
- protected void populateItem(ListItem<FieldWrapper> item) {
-
+ protected void populateItem(final ListItem<FieldWrapper> item) {
final FieldWrapper field = item.getModelObject();
item.add(new Label("label", new ResourceModel(field.getName())));
@@ -135,7 +134,6 @@ public class PolicyBeanPanel extends Pan
field.getName())));
item.add(new Label("field", new Model(null)));
-
} else if (field.getType().equals(List.class) || field.getType().equals(Set.class)) {
classMethod = policy.getClass().getMethod("get" + StringUtils.capitalize(field.getName()),
new Class[]{});
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java Fri Feb 8 11:37:35 2013
@@ -20,11 +20,11 @@ package org.apache.syncope.console.wicke
import java.io.Serializable;
import java.util.List;
+import org.apache.syncope.console.commons.SelectChoiceRenderer;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.ListModel;
-import org.apache.syncope.console.commons.SelectChoiceRenderer;
public class AjaxPalettePanel<T> extends AbstractFieldPanel {
@@ -33,7 +33,6 @@ public class AjaxPalettePanel<T> extends
final Palette<T> palette;
public AjaxPalettePanel(final String id, final IModel<List<T>> model, final ListModel<T> choices) {
-
this(id, model, choices, false);
}
@@ -48,19 +47,13 @@ public class AjaxPalettePanel<T> extends
super(id, model);
- this.palette = createPalette(model, choices, renderer, allowOrder);
+ this.palette = new NonI18nPalette<T>("paletteField", model, choices, renderer, 8, allowOrder);
add(palette.setOutputMarkupId(true));
setOutputMarkupId(true);
}
- private Palette<T> createPalette(final IModel<List<T>> model, final ListModel<T> choices,
- final IChoiceRenderer<T> renderer, final boolean allowOrder) {
-
- return new Palette("paletteField", model, choices, renderer, 8, allowOrder);
- }
-
@Override
- public AbstractFieldPanel setModelObject(Serializable object) {
+ public AbstractFieldPanel setModelObject(final Serializable object) {
palette.setDefaultModelObject(object);
return this;
}
Added: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java?rev=1443945&view=auto
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java (added)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java Fri Feb 8 11:37:35 2013
@@ -0,0 +1,138 @@
+/*
+ * 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.markup.html.form;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.wicket.Component;
+import org.apache.wicket.extensions.markup.html.form.palette.Palette;
+import org.apache.wicket.extensions.markup.html.form.palette.component.Choices;
+import org.apache.wicket.extensions.markup.html.form.palette.component.Selection;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.string.Strings;
+
+/**
+ * Workaround for WICKET-5029 to be removed when upgrading Wicket to 1.5.10 / 6.6.0.
+ */
+public class NonI18nPalette<T> extends Palette<T> {
+
+ private static final long serialVersionUID = 2659070187837941889L;
+
+ public NonI18nPalette(final String id,
+ final IModel<? extends Collection<? extends T>> choicesModel,
+ final IChoiceRenderer<T> choiceRenderer, final int rows, final boolean allowOrder) {
+
+ super(id, choicesModel, choiceRenderer, rows, allowOrder);
+ }
+
+ public NonI18nPalette(final String id,
+ final IModel<? extends List<? extends T>> model,
+ final IModel<? extends Collection<? extends T>> choicesModel,
+ final IChoiceRenderer<T> choiceRenderer, final int rows, final boolean allowOrder) {
+
+ super(id, model, choicesModel, choiceRenderer, rows, allowOrder);
+ }
+
+ @Override
+ protected Component newChoicesComponent() {
+ return new Choices<T>("choices", this) {
+
+ private static final long serialVersionUID = 5631133033579060143L;
+
+ @Override
+ protected Map<String, String> getAdditionalAttributes(final Object choice) {
+ return NonI18nPalette.this.getAdditionalAttributesForChoices(choice);
+ }
+
+ @Override
+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) {
+ NonI18nPalette.this.nonI18nOnComponentTagBody(markupStream, openTag, getOptionsIterator());
+ }
+ };
+ }
+
+ @Override
+ protected Component newSelectionComponent() {
+ return new Selection<T>("selection", this) {
+
+ private static final long serialVersionUID = 409955426639123592L;
+
+ @Override
+ protected Map<String, String> getAdditionalAttributes(final Object choice) {
+ return NonI18nPalette.this.getAdditionalAttributesForSelection(choice);
+ }
+
+ @Override
+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) {
+ NonI18nPalette.this.nonI18nOnComponentTagBody(markupStream, openTag, getOptionsIterator());
+ }
+ };
+ }
+
+ protected void nonI18nOnComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag,
+ final Iterator<T> options) {
+
+ StringBuilder buffer = new StringBuilder(128);
+ IChoiceRenderer<T> renderer = getChoiceRenderer();
+
+ while (options.hasNext()) {
+ final T choice = options.next();
+
+ final CharSequence id;
+ {
+ String value = renderer.getIdValue(choice, 0);
+
+ if (getEscapeModelStrings()) {
+ id = Strings.escapeMarkup(value);
+ } else {
+ id = value;
+ }
+ }
+
+ final CharSequence value;
+ {
+ Object displayValue = renderer.getDisplayValue(choice);
+ Class<?> displayClass = displayValue == null ? null : displayValue.getClass();
+
+ @SuppressWarnings("unchecked")
+ IConverter<Object> converter = (IConverter<Object>) getConverter(displayClass);
+ String displayString = converter.convertToString(displayValue, getLocale());
+
+ if (getEscapeModelStrings()) {
+ value = Strings.escapeMarkup(displayString);
+ } else {
+ value = displayString;
+ }
+ }
+
+ buffer.append("\n<option value=\"").append(id).append("\"");
+ buffer.append(">").append(value).append("</option>");
+ }
+
+ buffer.append("\n");
+
+ replaceComponentTagBody(markupStream, openTag, buffer);
+ }
+}
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.java?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.java Fri Feb 8 11:37:35 2013
@@ -24,10 +24,10 @@ import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.extensions.markup.html.form.palette.component.Recorder;
import org.apache.wicket.extensions.markup.html.form.palette.component.Selection;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.ListModel;
@@ -39,7 +39,7 @@ import org.apache.wicket.util.value.IVal
*
* @see org.apache.wicket.extensions.markup.html.form.palette.Palette
*/
-public class SingleColumnPalette<T> extends Palette<T> {
+public class SingleColumnPalette<T> extends NonI18nPalette<T> {
private static final long serialVersionUID = -1126599052871074501L;
@@ -177,6 +177,11 @@ public class SingleColumnPalette<T> exte
attrs.put("ondblclick", "");
attrs.remove("multiple");
}
+
+ @Override
+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) {
+ SingleColumnPalette.this.nonI18nOnComponentTagBody(markupStream, openTag, getOptionsIterator());
+ }
};
}
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties Fri Feb 8 11:37:35 2013
@@ -40,3 +40,5 @@ error=Error
generic_error=An error occurred during the operation
id=Id
name=Name
+palette.available=Available
+palette.selected=Selected
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties Fri Feb 8 11:37:35 2013
@@ -40,3 +40,5 @@ error=Errore
generic_error=Si \u00e8 verificato un errore durante l'operazione
id=Id
name=Nome
+palette.available=Opzioni
+palette.selected=Selezione
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html Fri Feb 8 11:37:35 2013
@@ -1,102 +1,79 @@
<!--
- 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>
- <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;
- }
-
- div.role-tree table.wicket-tree-content table.icon-panel a{
- font-size: 10px;
- color:black;
- }
-
- .roleTable{
- -moz-border-radius: 3px; /* Firefox */
- -webkit-border-radius: 3px; /* Safari e Chrome*/
- border: 1px solid gray;
- border-radius: 3px; /* Standard CSS */
- }
-
- #description{
- font-size: 1.1em;
- }
- #specification{
- font-size: 1.1em;
- }
- </style>
-</wicket:head>
<wicket:extend>
- <div style="margin:10px">
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
+ <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">
- <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">
- <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 id="specification">
- <span wicket:id="panel">[password policy panel]</span>
- </div>
+ <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">
+ <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>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
-
- <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="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>
- </form>
- </div>
+
+ <div class="tablerow">
+ <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 id="specification">
+ <span wicket:id="panel">[password policy panel]</span>
+ </div>
+ </div>
+
+ <script type="text/javascript">
+ $(function() {
+ $('#formtable div.tablerow:even').addClass("alt");
+ });
+ </script>
+
+ <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>
+ </form>
+ </div>
</wicket:extend>
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html Fri Feb 8 11:37:35 2013
@@ -1,43 +1,35 @@
<!--
- 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.
-->
-<html>
- <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;
- }
- </style>
- </wicket:head>
- <wicket:panel>
+<wicket:panel>
- <div id="formtable">
- <div class="tablerow" wicket:id="policies">
- <div class="tablecolumn_check">
- <span wicket:id="check">[check]</span>
- </div>
- <div class="tablecolumn_label short_dynamicsize">
- <label for="label">
- <span wicket:id="label">[label]</span>
- </label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="field">[field]</span>
- </div>
- </div>
- </div>
+ <div id="formtable">
+ <div class="tablerow" wicket:id="policies">
+ <div class="tablecolumn_check">
+ <span wicket:id="check">[check]</span>
+ </div>
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="label">
+ <span wicket:id="label">[label]</span>
+ </label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="field">[field]</span>
+ </div>
+ </div>
+ </div>
- </wicket:panel>
-</html>
+</wicket:panel>
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html Fri Feb 8 11:37:35 2013
@@ -1,21 +1,19 @@
<!--
- 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.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
- <wicket:panel>
- <span wicket:id="paletteField">[Palette]</span>
- </wicket:panel>
-</html>
\ No newline at end of file
+<wicket:panel>
+ <span wicket:id="paletteField">[Palette]</span>
+</wicket:panel>
Added: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html?rev=1443945&view=auto
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html (added)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html Fri Feb 8 11:37:35 2013
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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:panel>
+
+ <div style="display: inline-table;">
+ <input type="hidden" wicket:id="recorder"/>
+
+ <div style="display: table-row">
+ <div id="choices" style="display: table-cell; text-align: center; font-weight: bold;">
+ <span wicket:id="availableHeader">[available header]</span>
+ </div>
+
+ <div id="buttons" style="display: table-cell;">
+ </div>
+
+ <div id="selections" style="display: table-cell; text-align: center; font-weight: bold;">
+ <span wicket:id="selectedHeader">[selected header]</span>
+ </div>
+ </div>
+
+ <div style="display: table-row">
+ <div id="choices" style="display: table-cell;">
+ <select class="choicesSelect" wicket:id="choices">[choices]</select>
+ </div>
+
+ <div id="buttons" style="display: table-cell; width: 30px; vertical-align: middle; padding-left: 5px;">
+ <div style="padding-bottom: 5px;">
+ <a wicket:id="addButton"><img src="img/right-icon.png" alt="add icon"/></a>
+ </div>
+ <div>
+ <a wicket:id="removeButton"><img src="img/left-icon.png" alt="remove icon"/></a>
+ </div>
+ <div>
+ <a wicket:id="moveUpButton"><img src="img/up-icon.png" alt="move up icon"/></a>
+ </div>
+ <div style="padding-top: 5px;">
+ <a wicket:id="moveDownButton"><img src="img/down-icon.png" alt="move down icon"/></a>
+ </div>
+ </div>
+
+ <div id="selections" style="display: table-cell; min-width: 100px;">
+ <select class="selectionSelect" style="min-width: 100px;" wicket:id="selection">[selection]</select>
+ </div>
+ </div>
+ </div>
+</wicket:panel>
Propchange: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.html?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.html Fri Feb 8 11:37:35 2013
@@ -14,43 +14,39 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
+<wicket:panel>
- <div style="display: inline-table;">
- <input type="hidden" wicket:id="recorder"/>
- <span wicket:id="availableHeader"/>
- <span wicket:id="availableHeader"/>
+ <div style="display: inline-table;">
+ <input type="hidden" wicket:id="recorder"/>
+ <span wicket:id="availableHeader"/>
+ <span wicket:id="availableHeader"/>
- <div id="choices">
- <select wicket:id="choices" class="choicesSelect" style="visibility: hidden;width: 0px;">[choices]</select>
- </div>
- <div id="selections" style="display: table-cell;">
- <select class="selectionSelect" wicket:id="selection">[selection]</select>
- </div>
+ <div id="choices">
+ <select wicket:id="choices" class="choicesSelect" style="visibility: hidden;width: 0px;">[choices]</select>
+ </div>
+ <div id="selections" style="display: table-cell;">
+ <select class="selectionSelect" wicket:id="selection">[selection]</select>
+ </div>
- <div id="orderingButtons" style="display: table-cell; width: 30px; vertical-align: middle; padding-left: 5px;">
- <div style="padding-bottom: 5px;">
- <a wicket:id="moveUpButton"><img src="img/up-icon.png" alt="move up icon"/></a>
- </div>
- <div style="padding-top: 5px;">
- <a wicket:id="moveDownButton"><img src="img/down-icon.png" alt="move down icon"/></a>
- </div>
- </div>
- </div>
+ <div id="buttons" style="display: table-cell; width: 30px; vertical-align: middle; padding-left: 5px;">
+ <div style="padding-bottom: 5px;">
+ <a wicket:id="moveUpButton"><img src="img/up-icon.png" alt="move up icon"/></a>
+ </div>
+ <div style="padding-top: 5px;">
+ <a wicket:id="moveDownButton"><img src="img/down-icon.png" alt="move down icon"/></a>
+ </div>
+ </div>
+ </div>
- <div id="actionButtons" style="padding-top: 5px;">
- <div style="padding-left: 35px;float: left;">
- <a wicket:id="addButton"><img src="img/plus-icon.png" alt="plus icon"/></a>
- </div>
- <div style="padding-left: 15px;float: left;">
- <a wicket:id="editButton"><img src="img/actions/edit.png" alt="edit icon"/></a>
- </div>
- <div style="padding-left: 15px;float: left;">
- <a wicket:id="removeButton"><img src="img/minus-icon.png" alt="minus icon"/></a>
- </div>
- </div>
- </wicket:panel>
-</body>
-</html>
\ No newline at end of file
+ <div id="actionButtons" style="padding-top: 5px;">
+ <div style="padding-left: 35px;float: left;">
+ <a wicket:id="addButton"><img src="img/plus-icon.png" alt="plus icon"/></a>
+ </div>
+ <div style="padding-left: 15px;float: left;">
+ <a wicket:id="editButton"><img src="img/actions/edit.png" alt="edit icon"/></a>
+ </div>
+ <div style="padding-left: 15px;float: left;">
+ <a wicket:id="removeButton"><img src="img/minus-icon.png" alt="minus icon"/></a>
+ </div>
+ </div>
+</wicket:panel>
Added: syncope/branches/1_0_X/console/src/main/webapp/img/left-icon.png
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/webapp/img/left-icon.png?rev=1443945&view=auto
==============================================================================
Binary file - no diff available.
Propchange: syncope/branches/1_0_X/console/src/main/webapp/img/left-icon.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: syncope/branches/1_0_X/console/src/main/webapp/img/right-icon.png
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/webapp/img/right-icon.png?rev=1443945&view=auto
==============================================================================
Binary file - no diff available.
Propchange: syncope/branches/1_0_X/console/src/main/webapp/img/right-icon.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java (original)
+++ syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java Fri Feb 8 11:37:35 2013
@@ -45,14 +45,13 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//tr/td[3]/span/span[7]/a");
+ selenium.click("//tr[2]/td[3]/span/span[7]/a");
selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='key:textField']\");", "30000");
assertEquals("connid.bundles.directory", selenium.getAttribute("//input[@name='key:textField']@value"));
selenium.click("css=a.w_close");
-
}
@Test
@@ -156,22 +155,21 @@ public class ConfigurationTestITCase ext
selenium.select("//td[3]/select", "label=MEMBERSHIP");
- selenium.waitForCondition("selenium.isElementPresent("
- + "\"//td[4]/select[option='8 otherchild']\");", "30000");
+ selenium.waitForCondition("selenium.isElementPresent(\"//td[4]/select[option='8 otherchild']\");", "30000");
selenium.select("//td[4]/select", "label=8 otherchild");
selenium.click("//div[2]/form/div[2]/ul/li[3]/a/span");
- selenium.click("//tr[2]/td/select/option");
+ selenium.click("//div[2]/form/div[2]/div[3]/span/span/div/div[2]/div/select/option");
- selenium.click("//div[2]/form/div[2]/div[3]/span/span/table/tbody/tr[2]/td[2]/button");
+ selenium.click("//div[2]/form/div[2]/div[3]/span/span/div/div[2]/div[2]/div/a");
selenium.click("//div[2]/form/div[2]/ul/li[4]/a/span");
selenium.waitForCondition("selenium.isElementPresent("
+ "\"//div[2]/form/div[2]/div[4]/div/div[2]/label\");", "30000");
-
+
selenium.click("//div[2]/form/div[3]/input");
}
}
Modified: syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java?rev=1443945&r1=1443944&r2=1443945&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java (original)
+++ syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java Fri Feb 8 11:37:35 2013
@@ -67,8 +67,7 @@ public class EditProfileTestITCase exten
selenium.click("//span[@id='editProfile']/a");
selenium.waitForCondition("selenium.isElementPresent(\"//span[contains(text(),'Attributes')]\");", "30000");
-
- assertTrue(selenium.isElementPresent("//input[@value='user1']"));
+ selenium.waitForCondition("selenium.isElementPresent(\"//input[@value='user1']\");", "30000");
selenium.click("css=a.w_close");
}