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/01 18:36:10 UTC
svn commit: r1441549 - in /syncope/trunk/console/src/main:
java/org/apache/syncope/console/pages/panels/
resources/org/apache/syncope/console/pages/
resources/org/apache/syncope/console/pages/panels/
Author: ilgrosso
Date: Fri Feb 1 17:36:09 2013
New Revision: 1441549
URL: http://svn.apache.org/viewvc?rev=1441549&view=rev
Log:
Various small improvements + dealing with null collection values in PolicySpec
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/StatusPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java Fri Feb 1 17:36:09 2013
@@ -33,6 +33,7 @@ import org.apache.syncope.common.to.User
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.AttributeSchemaType;
import org.apache.syncope.console.commons.JexlHelpUtil;
+import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.pages.Schema;
import org.apache.syncope.console.rest.SchemaRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
@@ -98,7 +99,7 @@ public class AttributesPanel extends Pan
initEntityData(entityTO, schemas.getObject().values());
- final ListView<AttributeTO> attributeView = new ListView<AttributeTO>("schemas",
+ final ListView<AttributeTO> attributeView = new AltListView<AttributeTO>("schemas",
new PropertyModel<List<? extends AttributeTO>>(entityTO, "attributes")) {
private static final long serialVersionUID = 9101744072914090143L;
@@ -210,6 +211,7 @@ public class AttributesPanel extends Pan
if (StringUtils.isNotBlank(schemaTO.getEnumerationKeys())) {
((AjaxDropDownChoicePanel) panel).setChoiceRenderer(new IChoiceRenderer<String>() {
+
private static final long serialVersionUID = -3724971416312135885L;
final Map<String, String> valueMap = getEnumeratedKeyValues(schemaTO);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java Fri Feb 1 17:36:09 2013
@@ -29,6 +29,7 @@ import org.apache.syncope.common.annotat
import org.apache.syncope.common.types.AbstractPolicySpec;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.ConflictResolutionAction;
+import org.apache.syncope.console.markup.html.list.AltListView;
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;
@@ -66,7 +67,7 @@ public class PolicyBeanPanel extends Pan
@SpringBean
private SchemaRestClient schemaRestClient;
- final IModel<List<String>> schemas = new LoadableDetachableModel<List<String>>() {
+ final IModel<List<String>> userSchemas = new LoadableDetachableModel<List<String>>() {
private static final long serialVersionUID = -2012833443695917883L;
@@ -76,6 +77,16 @@ public class PolicyBeanPanel extends Pan
}
};
+ final IModel<List<String>> roleSchemas = new LoadableDetachableModel<List<String>>() {
+
+ private static final long serialVersionUID = 5275935387613157437L;
+
+ @Override
+ protected List<String> load() {
+ return schemaRestClient.getSchemaNames(AttributableType.ROLE);
+ }
+ };
+
public PolicyBeanPanel(final String id, final AbstractPolicySpec policy) {
super(id);
@@ -95,12 +106,12 @@ public class PolicyBeanPanel extends Pan
}
}
- final ListView<FieldWrapper> policies = new ListView<FieldWrapper>("policies", items) {
+ final ListView<FieldWrapper> policies = new AltListView<FieldWrapper>("policies", items) {
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();
@@ -128,24 +139,37 @@ public class PolicyBeanPanel extends Pan
field.getName())));
item.add(new Label("field", new Model(null)));
-
} else if (Collection.class.isAssignableFrom(field.getType())) {
if (field.getSchemaList() != null) {
- final List<String> values = schemas.getObject();
+ final List<String> values = new ArrayList<String>();
+ if (field.getName().charAt(0) == 'r') {
+ values.addAll(roleSchemas.getObject());
+
+ if (field.getSchemaList().extended()) {
+ values.add("name");
+ }
+ } else {
+ values.addAll(userSchemas.getObject());
+
+ if (field.getSchemaList().extended()) {
+ values.add("id");
+ values.add("username");
+ }
+ }
- if (field.getSchemaList().extended()) {
- values.add("id");
- values.add("username");
+ Collection collection =
+ (Collection) propDesc.getReadMethod().invoke(policy, new Object[]{});
+ if (collection == null) {
+ collection = new ArrayList();
+ propDesc.getWriteMethod().invoke(policy, collection);
}
component = new AjaxPalettePanel("field", new PropertyModel(policy, field.getName()),
new ListModel<String>(values));
-
item.add(component);
item.add(getActivationControl(component,
- !((Collection) propDesc.getReadMethod().invoke(policy, new Object[]{})).isEmpty(),
- new ArrayList<String>(), new ArrayList<String>()));
+ !collection.isEmpty(), new ArrayList<String>(), new ArrayList<String>()));
} else {
final FieldPanel panel = new AjaxTextFieldPanel("panel", field.getName(),
new Model<String>(null));
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java Fri Feb 1 17:36:09 2013
@@ -31,6 +31,7 @@ import org.apache.syncope.common.to.User
import org.apache.syncope.console.commons.StatusBean;
import org.apache.syncope.console.commons.StatusUtils;
import org.apache.syncope.console.commons.StatusUtils.Status;
+import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.rest.ResourceRestClient;
import org.apache.syncope.console.rest.RoleRestClient;
import org.apache.syncope.console.rest.UserRestClient;
@@ -129,7 +130,7 @@ public class StatusPanel extends Panel {
add(new CheckGroupSelector("groupselector", checkGroup));
- statusBeansListView = new ListView<StatusBean>("resources", statusBeans) {
+ statusBeansListView = new AltListView<StatusBean>("resources", statusBeans) {
private static final long serialVersionUID = 4949588177564901031L;
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html Fri Feb 1 17:36:09 2013
@@ -30,7 +30,7 @@ under the License.
<div id="notification">
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="sender"><wicket:message key="sender"/></label>
</div>
@@ -48,7 +48,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="recipientAttrType"><wicket:message key="recipientAttrType"/></label>
</div>
@@ -66,7 +66,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="template"><wicket:message key="template"/></label>
</div>
@@ -84,12 +84,6 @@ under the License.
</div>
</div>
</div>
-
- <script type="text/javascript">
- $(function() {
- $('div#notification div#formtable div.tablerow:even').addClass("alt");
- });
- </script>
</div>
<div id="about">
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage.html Fri Feb 1 17:36:09 2013
@@ -49,7 +49,7 @@ under the License.
<span wicket:id="profile">
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<span wicket:id="idLabel">[Id]</span>
</div>
@@ -67,7 +67,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="recipients"><wicket:message key="recipients"/></label>
</div>
@@ -85,12 +85,12 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="textBody"><wicket:message key="textBody"/></label>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <textarea wicket:id="textBody" cols="50" rows="10">[textBody]</textarea>
+ <textarea wicket:id="textBody" cols="40" rows="10">[textBody]</textarea>
</div>
</div>
@@ -99,11 +99,11 @@ under the License.
<label for="htmlBody"><wicket:message key="htmlBody"/></label>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <textarea wicket:id="htmlBody" cols="50" rows="10">[textBody]</textarea>
+ <textarea wicket:id="htmlBody" cols="40" rows="10">[textBody]</textarea>
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="traceLevel"><wicket:message key="traceLevel"/></label>
</div>
@@ -112,11 +112,6 @@ under the License.
</div>
</div>
</div>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
</span>
</div>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html Fri Feb 1 17:36:09 2013
@@ -18,7 +18,7 @@ under the License.
-->
<wicket:extend>
<div style="margin:10px">
- <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="windowTitle"/></p>
<form wicket:id="form">
<div id="tabs">
@@ -29,7 +29,7 @@ under the License.
<div id="description">
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_fixedsize">
<label for="id"><wicket:message key="id"/></label>
</div>
@@ -47,7 +47,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_fixedsize">
<label for="description"><wicket:message key="description"/></label>
</div>
@@ -56,12 +56,6 @@ under the License.
</div>
</div>
</div>
-
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
</div>
<div id="specification">
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties Fri Feb 1 17:36:09 2013
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-title=Account policy management
+windowTitle=Policy management
description=Description
type=Type
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties Fri Feb 1 17:36:09 2013
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-title=Gestiona Account Policy
+windowTitle=Gestione Policy
description=Descrizione
type=Tipo
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage.html Fri Feb 1 17:36:09 2013
@@ -49,7 +49,7 @@ under the License.
<span wicket:id="profile">
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<span wicket:id="idLabel">[Id]</span>
</div>
@@ -67,7 +67,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="resource"><wicket:message key="resource"/></label>
</div>
@@ -76,11 +76,6 @@ under the License.
</div>
</div>
</div>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
</span>
</div>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage.html Fri Feb 1 17:36:09 2013
@@ -42,7 +42,7 @@ under the License.
<span wicket:id="profile">
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<span wicket:id="idLabel">[Id]</span>
</div>
@@ -60,7 +60,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="lastExec"><wicket:message key="lastExec"/></label>
</div>
@@ -78,7 +78,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="reportlets"><wicket:message key="reportlets"/></label>
</div>
@@ -110,11 +110,6 @@ under the License.
</div>
</div>
</div>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
</span>
</div>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html Fri Feb 1 17:36:09 2013
@@ -16,26 +16,6 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:head>
- <style type="text/css">
- #tabs-2 table{
- font-size: 1.1em;
- }
- #tabs-3 table{
- font-size: 1.1em;
- }
- #tabs-4 table{
- font-size: 1.1em;
- }
- #tabs-5 table{
- font-size: 1.1em;
- }
- #tabs-6 table{
- font-size: 1.1em;
- }
- </style>
-</wicket:head>
-
<wicket:extend>
<div style="margin:10px">
<p class="ui-widget ui-corner-all ui-widget-header">
@@ -53,11 +33,6 @@ under the License.
<li><a href="#tabs-7"><span><wicket:message key="tab7"/></span></a></li>
</ul>
<div wicket:id="rolePanel"/>
- <script type="text/javascript">
- $(function() {
- $('div #formtable div.tablerow:even').addClass("alt");
- });
- </script>
</div>
<div style="bottom:0;margin:10px">
<input type="submit"
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html Fri Feb 1 17:36:09 2013
@@ -57,7 +57,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="validatorClass"><wicket:message key="validatorClass"/></label>
</div>
@@ -75,7 +75,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="mandatoryCondition"><wicket:message key="mandatoryCondition"/></label>
</div>
@@ -94,7 +94,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="enumerationKeys"><wicket:message key="enumerationKeys"/></label>
</div>
@@ -112,7 +112,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="readonly" class="onerowlabel"><wicket:message key="readonly"/></label>
</div>
@@ -131,12 +131,6 @@ under the License.
</div>
</div>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
-
<div style="margin: 10px 0px 0">
<input type="submit"
class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.html Fri Feb 1 17:36:09 2013
@@ -52,7 +52,7 @@ under the License.
<span wicket:id="profile">
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<span wicket:id="idLabel">[Id]</span>
</div>
@@ -70,7 +70,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="description"><wicket:message key="description"/></label>
</div>
@@ -88,7 +88,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="lastExec"><wicket:message key="lastExec"/></label>
</div>
@@ -106,7 +106,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="actionsClassName"><wicket:message key="actionsClass"/></label>
</div>
@@ -123,7 +123,7 @@ under the License.
<span wicket:id="performCreate">[performCreate]</span>
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="performUpdate"><wicket:message key="updates"/></label>
</div>
@@ -139,7 +139,7 @@ under the License.
<span wicket:id="performDelete">[performDelete]</span>
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="syncStatus"><wicket:message key="status"/></label>
</div>
@@ -156,12 +156,6 @@ under the License.
</div>
</div>
</div>
-
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
</span>
</div>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html Fri Feb 1 17:36:09 2013
@@ -16,46 +16,6 @@ KIND, either express or implied. See th
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;
- }
- .membershipTable{
- -moz-border-radius: 3px; /* Firefox */
- -webkit-border-radius: 3px; /* Safari e Chrome*/
- border: 1px solid gray;
- border-radius: 3px; /* Standard CSS */
- }
-
- #tabs-2 table{
- font-size: 1.1em;
- }
-
- #tabs-3 table{
- font-size: 1.1em;
- }
-
- #tabs-4 table{
- font-size: 1.1em;
- }
-
- #tabs-5 table{
- font-size: 1.1em;
- }
-
- #tabs-6 table{
- font-size: 1.1em;
- }
- </style>
-</wicket:head>
-
<wicket:extend>
<span wicket:id="userModalFrag"/>
@@ -106,12 +66,6 @@ under the License.
</div>
</div>
- <script type="text/javascript">
- $(function() {
- $('div #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"
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html Fri Feb 1 17:36:09 2013
@@ -16,28 +16,27 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html>
- <wicket:panel>
- <div class="tablerow" wicket:id="schemas">
- <div class="tablecolumn_label short_dynamicsize">
- <span wicket:id="name"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="panel">
- [panel for dynamic input type markup]
- </span>
- <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
- <div class="help">
- <div wicket:id="jexlHelp" class="tooltip">
- <wicket:message key="jexl_info"/>
- <ul>
- <li><wicket:message key="jexl_ex1"/></li>
- <li><wicket:message key="jexl_ex2"/></li>
- </ul>
- <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
- </div>
+<wicket:panel>
+ <div class="tablerow" wicket:id="schemas">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="name"/>
+ </div>
+
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="panel">
+ [panel for dynamic input type markup]
+ </span>
+ <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
+ <div class="help">
+ <div wicket:id="jexlHelp" class="tooltip">
+ <wicket:message key="jexl_info"/>
+ <ul>
+ <li><wicket:message key="jexl_ex1"/></li>
+ <li><wicket:message key="jexl_ex2"/></li>
+ </ul>
+ <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
</div>
</div>
</div>
- </wicket:panel>
-</html>
+ </div>
+</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html Fri Feb 1 17:36:09 2013
@@ -32,11 +32,6 @@ under the License.
<span wicket:id="field">[field]</span>
</div>
</div>
-
- <script type="text/javascript">
- $(function() {
- $('#policyBeanTable div.tablerow:even').addClass("alt");
- });
- </script>
</div>
+
</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html Fri Feb 1 17:36:09 2013
@@ -19,7 +19,7 @@ under the License.
<html>
<wicket:panel>
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="name"><wicket:message key="name"/></label>
</div>
@@ -37,7 +37,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="enforceMandatoryCondition"><wicket:message key="enforceMandatoryCondition"/></label>
</div>
@@ -55,7 +55,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="propagationPriority"><wicket:message key="propagationPriority"/></label>
</div>
@@ -73,7 +73,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="randomPwdIfNotProvided"><wicket:message key="randomPwdIfNotProvided"/></label>
</div>
@@ -91,7 +91,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="createTraceLevel"><wicket:message key="createTraceLevel"/></label>
</div>
@@ -109,7 +109,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="deleteTraceLevel"><wicket:message key="deleteTraceLevel"/></label>
</div>
@@ -127,7 +127,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="resetToken"><wicket:message key="resetToken"/></label>
</div>
@@ -136,10 +136,5 @@ under the License.
</div>
</div>
</div>
- <script type="text/javascript">
- $(function() {
- $('div#resource div#formtable div.tablerow:even').addClass("alt");
- });
- </script>
</wicket:panel>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html Fri Feb 1 17:36:09 2013
@@ -40,6 +40,15 @@ under the License.
</div>
</div>
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="inheritOwner"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="inheritOwner" />
+ </div>
+ </div>
+
<div wicket:id="ownerContainer">
<div class="tablerow">
<div class="tablecolumn_label short_dynamicsize">
@@ -52,7 +61,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<wicket:message key="roleOwner"/>
</div>
@@ -63,15 +72,6 @@ under the License.
</div>
</div>
</div>
-
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <wicket:message key="inheritOwner"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="inheritOwner" />
- </div>
- </div>
</div>
<span wicket:id="parentSelectWin"/>
@@ -79,7 +79,7 @@ under the License.
<span wicket:id="roleOwnerSelectWin"/>
<wicket:fragment wicket:id="parentFragment">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<wicket:message key="parent"/>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html Fri Feb 1 17:36:09 2013
@@ -24,7 +24,7 @@ under the License.
<div id="tabs-2">
<div id="formtable">
- <div class="tablerow alt">
+ <div class="tablerow">
<div class="tablecolumn_label short_dynamicsize">
<wicket:message key="inheritAttributes"/>
</div>
@@ -76,9 +76,5 @@ under the License.
<div id="tabs-7">
<span wicket:id="security">[security]</span>
</div>
- <script type="text/javascript">
- $(function() {
- $('div #formtable div.tablerow:even').addClass("alt");
- });
- </script>
+
</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html Fri Feb 1 17:36:09 2013
@@ -45,21 +45,9 @@ under the License.
<div id="users-contain" class="ui-widget" style="width:auto">
<span wicket:id="userList"> [userList] </span>
</div>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- $("#tabs").tabs();
- });
- </script>
</div>
</div>
</div>
</form>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- $("#tabs").tabs();
- });
- </script>
</div>
</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/StatusPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/StatusPanel.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/StatusPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/StatusPanel.html Fri Feb 1 17:36:09 2013
@@ -112,9 +112,4 @@ under the License.
</div>
- <script type="text/javascript">
- $(function() {
- $('div.assignments div.assignment:even').addClass("alt");
- });
- </script>
</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html?rev=1441549&r1=1441548&r2=1441549&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html Fri Feb 1 17:36:09 2013
@@ -19,7 +19,7 @@ under the License.
<html>
<wicket:panel>
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<wicket:message key="username"/>
</div>