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/03/21 13:27:25 UTC

svn commit: r1459259 [2/2] - in /syncope/trunk: common/src/main/java/org/apache/syncope/common/types/ console/src/main/java/org/apache/syncope/console/commons/ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/java/org/apache/syn...

Added: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema%24SchemaTypePanel.html?rev=1459259&view=auto
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html (added)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html Thu Mar 21 12:27:24 2013
@@ -0,0 +1,41 @@
+<!--
+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" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+    <div id="users-contain" class="ui-widget">
+      <span wicket:id="schemaContainer">
+        <table class="ui-widget ui-widget-content table-hover" wicket:id="datatable"/>
+      </span>
+
+      <span style="float:right">
+        <form wicket:id="paginatorForm" 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="editSchemaWin">[Show modal window for editing schema]</div>
+
+    <a wicket:id="createSchemaLink"
+       class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+      <wicket:message key="create_attribute"/>
+    </a>
+  </wicket:panel>
+</html>

Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html?rev=1459259&r1=1459258&r2=1459259&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html Thu Mar 21 12:27:24 2013
@@ -16,255 +16,40 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<wicket:extend>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:head>
+    <style type="text/css">
+      .true {
+        background-image: url(../../img/ok.png);
+        background-position: center center;
+        background-repeat: no-repeat;
+        height: 18px;
+        width: 65px;
+      }
+      .false {
+        width: 65px;
+      }
+    </style>
+  </wicket:head>
+  <wicket:extend>
 
     <div id="tabs">
-        <ul>
-            <li class="tabs-selected"><a href="#user"><span><wicket:message key="user"/></span></a></li>
-            <li><a href="#role"><span><wicket:message key="role"/></span></a></li>
-            <li><a href="#membership"><span><wicket:message key="membership"/></span></a></li>
-        </ul>
-
-        <div id="user">
-            <ul>
-                <li class="tabs-selected"><a href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li>
-                <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
-                <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
-            </ul>
-            <div id="tabs-1">
-
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="userSchemasContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-
-                    <span style="float:right">
-                        <form wicket:id="UsersPaginatorForm" 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="createUserSchemaWin">
-                    [Show modal window for creating schema]
-                </div>
-                <div wicket:id="editUserSchemaWin">
-                    [Show modal window for editing schema]
-                </div>
-
-                <a wicket:id="createUserSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-
-            </div>
-            <div id="tabs-2">
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="userDerivedSchemasContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-                    <span style="float:right">
-                        <form wicket:id="UsersDerPaginatorForm" 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="createUserDerSchemaWin">[Show modal window for creating schema]</div>
-                <div wicket:id="editUserDerSchemaWin">[Show modal window for editing schema]</div>
-
-                <a wicket:id="createUserDerSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-            </div>
-            <div id="tabs-3">
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="userVirtualSchemasContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-                    <span style="float:right">
-                        <form wicket:id="UsersVirPaginatorForm" 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="createUserVirSchemaWin">[Show modal window for creating schema]</div>
-                <div wicket:id="editUserVirSchemaWin">[Show modal window for editing schema]</div>
-
-                <a wicket:id="createUserVirSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-            </div>
-        </div>
-        <div id="role">
-            <ul>
-                <li class="tabs-selected"><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>
-            </ul>
-            <div id="tabs-4">
-
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="roleSchemasContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-
-                    <span style="float:right">
-                        <form wicket:id="RolesPaginatorForm" 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="createRoleSchemaWin">[Show modal window for creating schema]</div>
-                <div wicket:id="editRoleSchemaWin">[Show modal window for editing schema]</div>
-
-                <a wicket:id="createRoleSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-            </div>
-            <div id="tabs-5">
-
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="roleDerivedSchemasContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-
-                    <span style="float:right">
-                        <form wicket:id="RolesDerPaginatorForm" 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="createRoleDerivedSchemaWin">[Show modal window for creating schema]</div>
-                <div wicket:id="editRoleDerivedSchemaWin">[Show modal window for editing schema]</div>
-
-                <a wicket:id="createRoleDerivedSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-
-            </div>
-            <div id="tabs-6">
-
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="roleVirtualSchemasContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-
-                    <span style="float:right">
-                        <form wicket:id="RolesVirPaginatorForm" 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="createRoleVirtualSchemaWin">[Show modal window for creating schema]</div>
-                <div wicket:id="editRoleVirtualSchemaWin">[Show modal window for editing schema]</div>
-
-                <a wicket:id="createRoleVirtualSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-
-            </div>
-        </div>
-        <div id="membership">
-            <ul>
-                <li class="tabs-selected"><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>
-                <li><a href="#tabs-9"><span><wicket:message key="tab9"/></span></a></li>
-            </ul>
-            <div id="tabs-7">
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="membershipSchemaContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-
-                    <span style="float:right">
-                        <form wicket:id="MembershipPaginatorForm"
-                              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="createMembershipSchemaWin">[Show modal window for creating schema]</div>
-                <div wicket:id="editMembershipSchemaWin">[Show modal window for editing schema]</div>
-
-                <a wicket:id="createMembershipSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-            </div>
-            <div id="tabs-8">
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="membershipDerivedSchemaContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-                    <span style="float:right">
-                        <form wicket:id="MembershipDerPaginatorForm" 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="createMembershipDerSchemaWin">[Show modal window for creating schema]</div>
-                <div wicket:id="editMembershipDerSchemaWin">[Show modal window for editing schema]</div>
-
-                <a wicket:id="createMembershipDerSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-            </div>
-            <div id="tabs-9">
-                <div id="users-contain" class="ui-widget">
-                    <span wicket:id="membershipVirtualSchemaContainer">
-                        <table class="ui-widget ui-widget-content table-hover"
-                               wicket:id="datatable"/>
-                    </span>
-                    <span style="float:right">
-                        <form wicket:id="MembershipVirPaginatorForm" 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="createMembershipVirSchemaWin">[Show modal window for creating schema]</div>
-                <div wicket:id="editMembershipVirSchemaWin">[Show modal window for editing schema]</div>
-
-                <a wicket:id="createMembershipVirSchemaWinLink"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-                    <wicket:message key="create_attribute"/>
-                </a>
-            </div>
-        </div>
+      <ul>
+        <li class="tabs-selected"><a href="#uschema"><wicket:message key="user"/></a></li>
+        <li><a href="#mschema"><wicket:message key="membership"/></a></li>
+        <li><a href="#rschema"><wicket:message key="role"/></a></li>
+      </ul>
+
+      <div id="uschema">
+        <div wicket:id="userTabs"/>
+      </div>
+      <div id="mschema">
+        <div wicket:id="membershipTabs"/>
+      </div>
+      <div id="rschema">
+        <div wicket:id="roleTabs"/>
+      </div>    
     </div>
 
-</wicket:extend>
+  </wicket:extend>
+</html>

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties?rev=1459259&r1=1459258&r2=1459259&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties Thu Mar 21 12:27:24 2013
@@ -17,20 +17,10 @@
 user=User
 role=Role
 membership=Membership
-tab1=Attributes
-tab2=Derived attributes
-tab3=Virtual attributes
-tab4=Attributes
-tab5=Derived attributes
-tab6=Virtual attributes
-tab7=Attributes
-tab8=Derived attributes
-tab9=Virtual attributes
 create_attribute=Create new attribute
 required_alert=All fields are required
 mandatory=Mandatory
 multivalue=Multivalue
-virtual=Virtual
 type=Type
 validatorClass=Validator class
 conversionPattern=Conversion pattern
@@ -38,3 +28,9 @@ edit=Edit
 delete=Delete
 attributes=Attributes
 expression=Expression
+normal=Normal
+derived=Derived
+virtual=Virtual
+mandatoryCondition=Mandatory
+uniqueConstraint=Unique
+readonly=Read-only

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=1459259&r1=1459258&r2=1459259&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 Thu Mar 21 12:27:24 2013
@@ -16,122 +16,124 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<wicket:extend>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:extend>
     <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
-<div style="margin:10px">
-    <form wicket:id="form">
+    <div style="margin:10px">
+      <form wicket:id="form">
         <div id="formtable">
-            <div class="tablerow alt">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="name"><wicket:message key="name"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="name">[name]</span>
-                </div>
+          <div class="tablerow alt">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="name"><wicket:message key="name"/></label>
             </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="name">[name]</span>
+            </div>
+          </div>
 
-            <div class="tablerow">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="conversionPattern"><wicket:message key="conversionPattern"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="conversionPattern">[conversionPattern]</span>
-                </div>
+          <div class="tablerow">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="type"><wicket:message key="type"/></label>
+            </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="type">[type]</span>
             </div>
+          </div>
 
-            <div class="tablerow alt">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="validatorClass"><wicket:message key="validatorClass"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="validatorClass">[validatorClass]</span>
-                </div>
+          <div class="tablerow alt">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="conversionPattern"><wicket:message key="conversionPattern"/></label>
             </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="conversionPattern">[conversionPattern]</span>
+            </div>
+          </div>
 
-            <div class="tablerow">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="type"><wicket:message key="type"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="type">[type]</span>
-                </div>
+          <div class="tablerow">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="enumerationValues"><wicket:message key="enumerationValues"/></label>
+            </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="enumerationValues">[enumerationValues]</span>
             </div>
+          </div>
 
-            <div class="tablerow alt">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="mandatoryCondition"><wicket:message key="mandatoryCondition"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <input type="text" class="ui-widget-content ui-corner-all"
-                           id="mandatoryCondition" wicket:id="mandatoryCondition"/>
-                    <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" style="margin-left: -140px;">
-                            <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>
+          <div class="tablerow alt">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="enumerationKeys"><wicket:message key="enumerationKeys"/></label>
+            </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="enumerationKeys">[enumerationValues]</span>
             </div>
+          </div>
 
-            <div class="tablerow">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="enumerationValues"><wicket:message key="enumerationValues"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="enumerationValues">[enumerationValues]</span>
-                </div>
+          <div class="tablerow">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="validatorClass"><wicket:message key="validatorClass"/></label>
             </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="validatorClass">[validatorClass]</span>
+            </div>
+          </div>
 
-            <div class="tablerow alt">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="enumerationKeys"><wicket:message key="enumerationKeys"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="enumerationKeys">[enumerationValues]</span>
+          <div class="tablerow alt">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="mandatoryCondition"><wicket:message key="mandatoryCondition"/></label>
+            </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <input type="text" class="ui-widget-content ui-corner-all"
+                     id="mandatoryCondition" wicket:id="mandatoryCondition"/>
+              <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" style="margin-left: -140px;">
+                  <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>
+          </div>
 
-            <div class="tablerow">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="multivalue" class="onerowlabel"><wicket:message key="multivalue"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="multivalue">[multivalue]</span>
-                </div>
+          <div class="tablerow">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="uniqueConstraint" class="onerowlabel"><wicket:message key="uniqueConstraint"/></label>
             </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="uniqueConstraint">[uniqueConstraint]</span>
+            </div>
+          </div>
 
-            <div class="tablerow alt">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="readonly" class="onerowlabel"><wicket:message key="readonly"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="readonly">[readonly]</span>
-                </div>
+          <div class="tablerow alt">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="multivalue" class="onerowlabel"><wicket:message key="multivalue"/></label>
+            </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="multivalue">[multivalue]</span>
             </div>
+          </div>
 
-            <div class="tablerow">
-                <div class="tablecolumn_label short_dynamicsize">
-                    <label for="uniqueConstraint" class="onerowlabel"><wicket:message key="uniqueConstraint"/></label>
-                </div>
-                <div class="tablecolumn_field medium_dynamicsize">
-                    <span wicket:id="uniqueConstraint">[uniqueConstraint]</span>
-                </div>
+          <div class="tablerow">
+            <div class="tablecolumn_label short_dynamicsize">
+              <label for="readonly" class="onerowlabel"><wicket:message key="readonly"/></label>
+            </div>
+            <div class="tablecolumn_field medium_dynamicsize">
+              <span wicket:id="readonly">[readonly]</span>
             </div>
+          </div>
         </div>
 
         <div style="margin: 10px 0px 0">
-            <input type="submit"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
-                   wicket:id="apply"/>
-            <input type="button"
-                   class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
-                   wicket:id="cancel"/>      
+          <input type="submit"
+                 class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+                 wicket:id="apply"/>
+          <input type="button"
+                 class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+                 wicket:id="cancel"/>      
         </div>
-    </form>
-</div>
-</wicket:extend>
+      </form>
+    </div>
+  </wicket:extend>
+</html>

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties?rev=1459259&r1=1459258&r2=1459259&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties Thu Mar 21 12:27:24 2013
@@ -20,10 +20,10 @@ tab3=User attributes
 tab4=User derived attributes
 create_attribute=Create new attribute
 required_alert=All form fields are required.
-mandatoryCondition=Mandatory condition
+mandatoryCondition=Mandatory
 enumerationValues= Enumeration values
 enumerationKeys= Enumeration labels
-uniqueConstraint=Unique constraint
+uniqueConstraint=Unique
 multivalue=Multivalue
 multivalueAndUniqueConstr.validation='Multivalue' and 'Unique constraint' options can't be both checked
 type=Type

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties?rev=1459259&r1=1459258&r2=1459259&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties Thu Mar 21 12:27:24 2013
@@ -20,7 +20,7 @@ tab3=Attributi utenti
 tab4=Attributi utenti derivati
 create_attribute=Crea nuovo attributo
 required_alert=Tutti i campi sono richiesti
-mandatoryCondition=Vincolo d'obbligatoriet\u00e0
+mandatoryCondition=Obbligatorio
 enumerationValues= Valori enumeration
 enumerationKeys= Label enumeration
 multivalue=Multivalore
@@ -32,5 +32,5 @@ action=Azione
 edit_attribute=Modifica attributo
 title=Schema
 readonly=Read-only
-uniqueConstraint=Vincolo unique
+uniqueConstraint=Univoco
 multivalueAndUniqueConstr.validation=Le opzioni 'Multivalore' e 'Vincolo unique' non possono essere entrambe impostate

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties?rev=1459259&r1=1459258&r2=1459259&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties Thu Mar 21 12:27:24 2013
@@ -17,20 +17,10 @@
 user=Utente
 role=Ruolo
 membership=Membership
-tab1=Attributi
-tab2=Attributi derivati
-tab3=Attributi virtuali
-tab4=Attributi
-tab5=Attributi derivati
-tab6=Attributi virtuali
-tab7=Attributi
-tab8=Attributi derivati
-tab9=Attributi virtuali
 create_attribute=Crea nuovo attributo
 required_alert=Tutti i campi sono richiesti.
 mandatory=Obbligatorio
 multivalue=Multivalore
-virtual=Virtuale
 type=Tipo
 validatorClass=Validator class
 conversionPattern=Pattern di conversione
@@ -38,3 +28,9 @@ edit=Modifica
 delete=Rimuovi
 attributes=Attributi
 expression=Expression
+normal=Normali
+derived=Derivati
+virtual=Virtuali
+mandatoryCondition=Obbligatorio
+uniqueConstraint=Univoco
+readonly=Sola lettura

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.html?rev=1459259&r1=1459258&r2=1459259&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.html Thu Mar 21 12:27:24 2013
@@ -16,30 +16,32 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<wicket:head>
-  <link rel="stylesheet" type="text/css" href="css/bulk.css" media="all"/>
-</wicket:head>
-<wicket:panel>
-  <span wicket:id="tablePanel">[Table panel]</span>
-  <div wicket:id="bulkModal" />
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:head>
+    <link rel="stylesheet" type="text/css" href="css/bulk.css" media="all"/>
+  </wicket:head>
+  <wicket:panel>
+    <span wicket:id="tablePanel">[Table panel]</span>
+    <div wicket:id="bulkModal" />
 
-  <wicket:fragment wicket:id="bulkAvailable">
-    <form wicket:id="groupForm">
-      <span wicket:id="checkgroup">
-        <table class="ui-widget ui-widget-content table-hover" wicket:id="dataTable">[DataTable]</table>
-      </span>
-    </form>
-    <div class="bulkAction">
-      <div class="bulkActionCell" style="width: 40px">
-        <a href="#" wicket:id="bulkActionLink">
-          <img src="img/actions/bulk.png" alt="bulk action icon"  title="Bulk action"/>
-        </a>
+    <wicket:fragment wicket:id="bulkAvailable">
+      <form wicket:id="groupForm">
+        <span wicket:id="checkgroup">
+          <table class="ui-widget ui-widget-content table-hover" wicket:id="dataTable">[DataTable]</table>
+        </span>
+      </form>
+      <div class="bulkAction">
+        <div class="bulkActionCell" style="width: 40px">
+          <a href="#" wicket:id="bulkActionLink">
+            <img src="img/actions/bulk.png" alt="bulk action icon"  title="Bulk action"/>
+          </a>
+        </div>
       </div>
-    </div>
-  </wicket:fragment>
+    </wicket:fragment>
 
-  <wicket:fragment wicket:id="bulkNotAvailable">
-    <table class="ui-widget ui-widget-content table-hover" wicket:id="dataTable">[DataTable]</table>
-  </wicket:fragment>
+    <wicket:fragment wicket:id="bulkNotAvailable">
+      <table class="ui-widget ui-widget-content table-hover" wicket:id="dataTable">[DataTable]</table>
+    </wicket:fragment>
 
-</wicket:panel>
+  </wicket:panel>
+</html>

Added: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html?rev=1459259&view=auto
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html (added)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html Thu Mar 21 12:27:24 2013
@@ -0,0 +1,40 @@
+<!--
+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" xmlns:wicket="http://wicket.apache.org">
+  <wicket:head>
+    <style>
+      li.selected {
+        margin-bottom: -1px !important;
+        padding-bottom: 1px !important;
+      }
+    </style>
+  </wicket:head>
+  <wicket:panel xmlns:wicket="http://wicket.apache.org">
+    <div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
+      <span wicket:id="tabs-container"> 
+        <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+          <li wicket:id="tabs" class="ui-state-default ui-corner-top">
+            <a href="#" wicket:id="link"><span wicket:id="title">[[tab title]]</span></a>
+          </li>
+        </ul>
+      </span>
+      <div wicket:id="panel" class="ui-tabs-panel ui-widget-content ui-corner-bottom">[panel]</div>
+    </div>
+  </wicket:panel>
+</html>

Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckBoxPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckBoxPanel.html?rev=1459259&r1=1459258&r2=1459259&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckBoxPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckBoxPanel.html Thu Mar 21 12:27:24 2013
@@ -16,6 +16,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<wicket:panel>
-   <input wicket:id="check" type="checkbox"/>
-</wicket:panel>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+    <input wicket:id="check" type="checkbox"/>
+  </wicket:panel>
+</html>

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html?rev=1459259&r1=1459258&r2=1459259&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html Thu Mar 21 12:27:24 2013
@@ -16,96 +16,98 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<wicket:head>
-  <style>
-    span#action{
-      margin-left: 1px;
-      margin-right: 1px;
-    }
-  </style>
-</wicket:head>
-<wicket:panel>
-  <span wicket:id="panelClaim">[plus]</span>
-  <span wicket:id="panelDryRun">[plus]</span>
-  <span wicket:id="panelExecute">[plus]</span>
-  <span wicket:id="panelEnable">[plus]</span>
-  <span wicket:id="panelSearch">[plus]</span>
-  <span wicket:id="panelCreate">[plus]</span>
-  <span wicket:id="panelUserTemplate">[plus]</span>
-  <span wicket:id="panelRoleTemplate">[plus]</span>
-  <span wicket:id="panelEdit">[plus]</span>
-  <span wicket:id="panelExport">[plus]</span>
-  <span wicket:id="panelDelete">[plus]</span>
-  <span wicket:id="panelSelect">[plus]</span>
-  <span wicket:id="panelSuspend">[plus]</span>
-  <span wicket:id="panelReactivate">[plus]</span>
-  <span wicket:id="panelReload">[plus]</span>
-  <span wicket:id="panelChangeView">[plus]</span>
-
-  <wicket:fragment wicket:id="fragmentClaim">
-    <a href="#" wicket:id="claimLink"><img id="action" src="img/actions/claim.png" alt="claim icon" title="Claim"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentCreate">
-    <a href="#" wicket:id="createLink"><img id="action" src="img/actions/create.png" alt="create icon"  title="Create"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentSearch">
-    <a href="#" wicket:id="searchLink"><img id="action" src="img/actions/search.png" alt="search icon"  title="Search and modify"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentEnable">
-    <a href="#" wicket:id="enableLink"><img id="action" src="img/actions/enable.png" alt="enable icon"  title="Enable / Disable"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentEdit">
-    <a href="#" wicket:id="editLink"><img id="action" src="img/actions/edit.png" alt="edit icon"  title="Edit"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentUserTemplate">
-    <a href="#" wicket:id="userTemplateLink"><img id="action" src="img/actions/user_template.png" alt="user template icon"  title="Specify user template"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentRoleTemplate">
-    <a href="#" wicket:id="roleTemplateLink"><img id="action" src="img/actions/role_template.png" alt="role template icon"  title="Specify role template"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentDelete">
-    <a href="#" wicket:id="deleteLink"><img id="action" src="img/actions/delete.png" alt="delete icon"  title="Delete"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentDryRun">
-    <a href="#" wicket:id="dryRunLink"><img id="action" src="img/actions/dryrun.png" alt="dryrun icon"  title="DryRun"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentExecute">
-    <a href="#" wicket:id="executeLink"><img id="action" src="img/actions/execute.png" alt="execute icon"  title="Execute"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentSelect">
-    <a href="#" wicket:id="selectLink"><img id="action" src="img/actions/select.png" alt="select icon"  title="Select"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentExport">
-    <a href="#" wicket:id="exportLink"><img id="action" src="img/actions/export.png" alt="export icon"  title="Export"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentSuspend">
-    <a href="#" wicket:id="suspendLink"><img id="action" src="img/actions/suspend.png" alt="suspend icon"  title="Suspend"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentReactivate">
-    <a href="#" wicket:id="reactivateLink"><img id="action" src="img/actions/reactivate.png" alt="reactivate icon"  title="Reactivate"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentReload">
-    <a href="#" wicket:id="reloadLink"><img id="action" src="img/actions/reload.png" alt="reload icon"  title="Reload"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="fragmentChangeView">
-    <a href="#" wicket:id="changeViewLink"><img id="action" src="img/actions/settings-icon.png" alt="Change view icon"  title="Change view"/></a>
-  </wicket:fragment>
-
-  <wicket:fragment wicket:id="emptyFragment">
-  </wicket:fragment>
-</wicket:panel>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:head>
+    <style>
+      span#action{
+        margin-left: 1px;
+        margin-right: 1px;
+      }
+    </style>
+  </wicket:head>
+  <wicket:panel>
+    <span wicket:id="panelClaim">[plus]</span>
+    <span wicket:id="panelDryRun">[plus]</span>
+    <span wicket:id="panelExecute">[plus]</span>
+    <span wicket:id="panelEnable">[plus]</span>
+    <span wicket:id="panelSearch">[plus]</span>
+    <span wicket:id="panelCreate">[plus]</span>
+    <span wicket:id="panelUserTemplate">[plus]</span>
+    <span wicket:id="panelRoleTemplate">[plus]</span>
+    <span wicket:id="panelEdit">[plus]</span>
+    <span wicket:id="panelExport">[plus]</span>
+    <span wicket:id="panelDelete">[plus]</span>
+    <span wicket:id="panelSelect">[plus]</span>
+    <span wicket:id="panelSuspend">[plus]</span>
+    <span wicket:id="panelReactivate">[plus]</span>
+    <span wicket:id="panelReload">[plus]</span>
+    <span wicket:id="panelChangeView">[plus]</span>
+
+    <wicket:fragment wicket:id="fragmentClaim">
+      <a href="#" wicket:id="claimLink"><img id="action" src="img/actions/claim.png" alt="claim icon" title="Claim"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentCreate">
+      <a href="#" wicket:id="createLink"><img id="action" src="img/actions/create.png" alt="create icon"  title="Create"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentSearch">
+      <a href="#" wicket:id="searchLink"><img id="action" src="img/actions/search.png" alt="search icon"  title="Search and modify"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentEnable">
+      <a href="#" wicket:id="enableLink"><img id="action" src="img/actions/enable.png" alt="enable icon"  title="Enable / Disable"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentEdit">
+      <a href="#" wicket:id="editLink"><img id="action" src="img/actions/edit.png" alt="edit icon"  title="Edit"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentUserTemplate">
+      <a href="#" wicket:id="userTemplateLink"><img id="action" src="img/actions/user_template.png" alt="user template icon"  title="Specify user template"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentRoleTemplate">
+      <a href="#" wicket:id="roleTemplateLink"><img id="action" src="img/actions/role_template.png" alt="role template icon"  title="Specify role template"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentDelete">
+      <a href="#" wicket:id="deleteLink"><img id="action" src="img/actions/delete.png" alt="delete icon"  title="Delete"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentDryRun">
+      <a href="#" wicket:id="dryRunLink"><img id="action" src="img/actions/dryrun.png" alt="dryrun icon"  title="DryRun"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentExecute">
+      <a href="#" wicket:id="executeLink"><img id="action" src="img/actions/execute.png" alt="execute icon"  title="Execute"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentSelect">
+      <a href="#" wicket:id="selectLink"><img id="action" src="img/actions/select.png" alt="select icon"  title="Select"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentExport">
+      <a href="#" wicket:id="exportLink"><img id="action" src="img/actions/export.png" alt="export icon"  title="Export"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentSuspend">
+      <a href="#" wicket:id="suspendLink"><img id="action" src="img/actions/suspend.png" alt="suspend icon"  title="Suspend"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentReactivate">
+      <a href="#" wicket:id="reactivateLink"><img id="action" src="img/actions/reactivate.png" alt="reactivate icon"  title="Reactivate"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentReload">
+      <a href="#" wicket:id="reloadLink"><img id="action" src="img/actions/reload.png" alt="reload icon"  title="Reload"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fragmentChangeView">
+      <a href="#" wicket:id="changeViewLink"><img id="action" src="img/actions/settings-icon.png" alt="Change view icon"  title="Change view"/></a>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="emptyFragment">
+    </wicket:fragment>
+  </wicket:panel>
+</html>