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 2015/02/05 17:01:20 UTC
[49/52] syncope git commit: [SYNCOPE-620] Console working,
Selenium IT in
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.html
index 130c89a..1bec3b7 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.html
@@ -17,220 +17,211 @@ 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>
- <script type="text/javascript">
- $(document).ready(function () {
- $("#policies").tabs();
- $("#logs").tabs();
- $("#layouts").tabs();
- });
- </script>
- </wicket:head>
+ <wicket:head>
+ <script type="text/javascript">
+ $(document).ready(function () {
+ $("#policies").tabs();
+ $("#logs").tabs();
+ $("#layouts").tabs();
+ });
+ </script>
+ </wicket:head>
- <wicket:extend>
+ <wicket:extend>
- <div id="tabs">
- <ul>
- <li class="tabs-selected">
- <a href="#layouts"><span><wicket:message key="layouts"/></span></a>
- </li>
- <li><a href="#policies"><span><wicket:message key="policies"/></span></a></li>
- <li><a href="#notifications"><span><wicket:message key="notifications"/></span></a></li>
- <li><a href="#securityQuestions"><span><wicket:message key="securityQuestions"/></span></a></li>
- <li><a href="#workflow"><span><wicket:message key="workflow"/></span></a></li>
- <li wicket:id="routeTab"><a href="#routes"><span><wicket:message key="routes"/></span></a></li>
- <li><a href="#logs"><span><wicket:message key="logs"/></span></a></li>
- </ul>
- <div id="layouts">
- <ul>
- <li class="tabs-selected">
- <a href="#adminUser"><span><wicket:message key="adminUser"/></span></a>
- </li>
- <li><a href="#selfUser"><span><wicket:message key="selfUser"/></span></a></li>
- <li><a href="#adminRole"><span><wicket:message key="adminRole"/></span></a></li>
- <li><a href="#selfRole"><span><wicket:message key="selfRole"/></span></a></li>
- <li><a href="#adminMembership"><span><wicket:message key="adminMembership"/></span></a></li>
- <li><a href="#selfMembership"><span><wicket:message key="selfMembership"/></span></a></li>
- </ul>
- <div id="adminUser" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="adminUserLayoutPanel">[admin user layout panel]</span>
- </div>
- <div id="selfUser" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="selfUserLayoutPanel">[self user layout panel]</span>
- </div>
- <div id="adminRole" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="adminRoleLayoutPanel">[admin role layout panel]</span>
- </div>
- <div id="selfRole" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="selfRoleLayoutPanel">[self role layout panel]</span>
- </div>
- <div id="adminMembership" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="adminMembershipLayoutPanel">[admin membership layout panel]</span>
- </div>
- <div id="selfMembership" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="selfMembershipLayoutPanel">[self membership layout panel]</span>
- </div>
- </div>
- <div id="policies">
- <ul>
- <li class="tabs-selected">
- <a href="#account"><span><wicket:message key="account"/></span></a>
- </li>
- <li><a href="#password"><span><wicket:message key="password"/></span></a></li>
- <li><a href="#sync"><span><wicket:message key="sync"/></span></a></li>
- </ul>
- <div id="account" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="accountPoliciesPanel">[account policies]</span>
- </div>
- <div id="password" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="passwordPoliciesPanel">[password policies]</span>
- </div>
- <div id="sync" style="border-width: 1px;border-top-width: 0px;">
- <span wicket:id="syncPoliciesPanel">[sync policies]</span>
- </div>
- </div>
- <div id="notifications">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="notificationContainer">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="notificationTable"/>
- </span>
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#layouts"><span><wicket:message key="layouts"/></span></a>
+ </li>
+ <li><a href="#policies"><span><wicket:message key="policies"/></span></a></li>
+ <li><a href="#notifications"><span><wicket:message key="notifications"/></span></a></li>
+ <li><a href="#securityQuestions"><span><wicket:message key="securityQuestions"/></span></a></li>
+ <li><a href="#workflow"><span><wicket:message key="workflow"/></span></a></li>
+ <li><a href="#logs"><span><wicket:message key="logs"/></span></a></li>
+ </ul>
+ <div id="layouts">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#adminUser"><span><wicket:message key="adminUser"/></span></a>
+ </li>
+ <li><a href="#selfUser"><span><wicket:message key="selfUser"/></span></a></li>
+ <li><a href="#adminRole"><span><wicket:message key="adminRole"/></span></a></li>
+ <li><a href="#selfRole"><span><wicket:message key="selfRole"/></span></a></li>
+ <li><a href="#adminMembership"><span><wicket:message key="adminMembership"/></span></a></li>
+ <li><a href="#selfMembership"><span><wicket:message key="selfMembership"/></span></a></li>
+ </ul>
+ <div id="adminUser" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="adminUserLayoutPanel">[admin user layout panel]</span>
+ </div>
+ <div id="selfUser" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="selfUserLayoutPanel">[self user layout panel]</span>
+ </div>
+ <div id="adminRole" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="adminRoleLayoutPanel">[admin role layout panel]</span>
+ </div>
+ <div id="selfRole" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="selfRoleLayoutPanel">[self role layout panel]</span>
+ </div>
+ <div id="adminMembership" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="adminMembershipLayoutPanel">[admin membership layout panel]</span>
+ </div>
+ <div id="selfMembership" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="selfMembershipLayoutPanel">[self membership layout panel]</span>
+ </div>
+ </div>
+ <div id="policies">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#account"><span><wicket:message key="account"/></span></a>
+ </li>
+ <li><a href="#password"><span><wicket:message key="password"/></span></a></li>
+ <li><a href="#sync"><span><wicket:message key="sync"/></span></a></li>
+ </ul>
+ <div id="account" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="accountPoliciesPanel">[account policies]</span>
+ </div>
+ <div id="password" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="passwordPoliciesPanel">[password policies]</span>
+ </div>
+ <div id="sync" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="syncPoliciesPanel">[sync policies]</span>
+ </div>
+ </div>
+ <div id="notifications">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="notificationContainer">
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="notificationTable"/>
+ </span>
- <span style="float:right">
- <form wicket:id="notificationPaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
+ <span style="float:right">
+ <form wicket:id="notificationPaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
- <div wicket:id="createNotificationWin">[Show modal window for creating notification]</div>
- <div wicket:id="editNotificationWin">[Show modal window for editing notification]</div>
+ <div wicket:id="createNotificationWin">[Show modal window for creating notification]</div>
+ <div wicket:id="editNotificationWin">[Show modal window for editing notification]</div>
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createNotificationLink">
- <wicket:message key="create"/>
- </a>
- </div>
- <div id="securityQuestions">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="securityQuestionContainer">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="securityQuestionTable"/>
- </span>
- </div>
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createNotificationLink">
+ <wicket:message key="create"/>
+ </a>
+ </div>
+ <div id="securityQuestions">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="securityQuestionContainer">
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="securityQuestionTable"/>
+ </span>
+ </div>
- <div wicket:id="createSecurityQuestionWin">[Show modal window for creating security questions]</div>
- <div wicket:id="editSecurityQuestionWin">[Show modal window for editing security questions]</div>
+ <div wicket:id="createSecurityQuestionWin">[Show modal window for creating security questions]</div>
+ <div wicket:id="editSecurityQuestionWin">[Show modal window for editing security questions]</div>
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createSecurityQuestionLink">
- <wicket:message key="create"/>
- </a>
- </div>
- <div id="workflow">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="noActivitiEnabledForUsers"><i><wicket:message key="noActivitiEnabledForUsers"/></i></span>
- <span wicket:id="workflowDefContainer">
- <div style="float: left;">
- <button wicket:id="activitiModeler" style="width: 122px">
- <div style="display: table-row;">
- <div style="display: table-cell">
- <img src="img/modeler.png" alt="Activiti Modeler" title="Activiti Modeler"/>
- </div>
- <div style="display: table-cell;vertical-align:middle;font-size:62.5%;">
- Activiti Modeler
- </div>
- </div>
- </button>
- </div>
- <div>
- <button wicket:id="xmlEditor" style="width: 122px">
- <div style="display: table-row;">
- <div style="display: table-cell">
- <img src="img/xml.png" alt="XML editor" title="XML editor"/>
- </div>
- <div style="display: table-cell;vertical-align:middle;font-size:62.5%;">
- XML editor
- </div>
- </div>
- </button>
- </div>
- <img wicket:id="workflowDefDiagram" style="width: 100%;"/>
- </span>
- </div>
- </div>
- <div id="routes">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="routesContainer">
- <table class="ui-widget ui-widget-content table-hover" wicket:id="routeTable"/>
- </span>
- </div>
- <div wicket:id="editRouteWin">[Show modal window for editing route]</div>
- </div>
- <div id="logs">
- <ul>
- <li class="tabs-selected">
- <a href="#core"><span>Core</span></a>
- </li>
- <li><a href="#console"><span>Console</span></a></li>
- </ul>
- <div id="core" style="border-width: 1px;border-top-width: 0px;">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="coreLoggerContainer">
- <table class="ui-widget ui-widget-content table-hover">
- <thead class="ui-widget-header">
- <tr class="heaaders">
- <th><wicket:message key="logger"/></th>
- <th><wicket:message key="level"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="corelogger">
- <td><span wicket:id="name"/></td>
- <td id="level"><select wicket:id="level"/></td>
- </tr>
- </tbody>
- </table>
- </span>
- </div>
- </div>
- <div id="console" style="border-width: 1px;border-top-width: 0px;">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="consoleLoggerContainer">
- <table class="ui-widget ui-widget-content table-hover">
- <thead class="ui-widget-header">
- <tr class="heaaders">
- <th><wicket:message key="logger"/></th>
- <th><wicket:message key="level"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="consolelogger">
- <td><span wicket:id="name"/></td>
- <td id="level"><select wicket:id="level"/></td>
- </tr>
- </tbody>
- </table>
- </span>
- </div>
- </div>
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createSecurityQuestionLink">
+ <wicket:message key="create"/>
+ </a>
+ </div>
+ <div id="workflow">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="noActivitiEnabledForUsers"><i><wicket:message key="noActivitiEnabledForUsers"/></i></span>
+ <span wicket:id="workflowDefContainer">
+ <div style="float: left;">
+ <button wicket:id="activitiModeler" style="width: 122px">
+ <div style="display: table-row;">
+ <div style="display: table-cell">
+ <img src="img/modeler.png" alt="Activiti Modeler" title="Activiti Modeler"/>
+ </div>
+ <div style="display: table-cell;vertical-align:middle;font-size:62.5%;">
+ Activiti Modeler
+ </div>
+ </div>
+ </button>
</div>
<div>
- <div wicket:id="parameters">
- <a style="position: absolute; top: 2px; right:50px;" wicket:id="confLink">
- <img src="img/actions/settings-icon.png" width="30" height="30"
- alt="Parameters" title="title" wicket:message="title:parameters"/>
- </a>
- </div>
- <div wicket:id="syncopeConfWin">[Show modal window for conf parameters]</div>
-
- <a style="position: absolute; top: 2px; right:20px;" wicket:id="dbExportLink">
- <img src="img/db_export.png" width="30" height="30"
- alt="DB export" title="title" wicket:message="title:db_export"/>
- </a>
- </div>
+ <button wicket:id="xmlEditor" style="width: 122px">
+ <div style="display: table-row;">
+ <div style="display: table-cell">
+ <img src="img/xml.png" alt="XML editor" title="XML editor"/>
+ </div>
+ <div style="display: table-cell;vertical-align:middle;font-size:62.5%;">
+ XML editor
+ </div>
+ </div>
+ </button>
+ </div>
+ <img wicket:id="workflowDefDiagram" style="width: 100%;"/>
+ </span>
</div>
- </wicket:extend>
+ </div>
+ <div id="logs">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#core"><span>Core</span></a>
+ </li>
+ <li><a href="#console"><span>Console</span></a></li>
+ </ul>
+ <div id="core" style="border-width: 1px;border-top-width: 0px;">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="coreLoggerContainer">
+ <table class="ui-widget ui-widget-content table-hover">
+ <thead class="ui-widget-header">
+ <tr class="heaaders">
+ <th><wicket:message key="logger"/></th>
+ <th><wicket:message key="level"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="corelogger">
+ <td><span wicket:id="key"/></td>
+ <td id="level"><select wicket:id="level"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </span>
+ </div>
+ </div>
+ <div id="console" style="border-width: 1px;border-top-width: 0px;">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="consoleLoggerContainer">
+ <table class="ui-widget ui-widget-content table-hover">
+ <thead class="ui-widget-header">
+ <tr class="heaaders">
+ <th><wicket:message key="logger"/></th>
+ <th><wicket:message key="level"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="consolelogger">
+ <td><span wicket:id="key"/></td>
+ <td id="level"><select wicket:id="level"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </span>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div wicket:id="parameters">
+ <a style="position: absolute; top: 2px; right:50px;" wicket:id="confLink">
+ <img src="img/actions/settings-icon.png" width="30" height="30"
+ alt="Parameters" title="title" wicket:message="title:parameters"/>
+ </a>
+ </div>
+ <div wicket:id="syncopeConfWin">[Show modal window for conf parameters]</div>
+
+ <a style="position: absolute; top: 2px; right:20px;" wicket:id="dbExportLink">
+ <img src="img/db_export.png" width="30" height="30"
+ alt="DB export" title="title" wicket:message="title:db_export"/>
+ </a>
+ </div>
+ </div>
+ </wicket:extend>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.properties
index f59b50f..1b6bcc7 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Configuration.properties
@@ -45,4 +45,3 @@ adminRole=Administrator Role Form
selfRole=Self Role Form
adminMembership=Administrator Membership Form
selfMembership=Self Membership Form
-routes=Routes
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.html
index 2507acf..b85acb6 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.html
@@ -18,7 +18,9 @@ under the License.
-->
<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>
+ <p class="ui-widget ui-corner-all ui-widget-header">
+ <span wicket:id="new"/> <wicket:message key="title"/> <span wicket:id="key"/>
+ </p>
<div style="margin: 5px;">
<form wicket:id="form">
<div id="tabs">
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.properties
index 5ded4ac..8500f1a 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage.properties
@@ -26,7 +26,7 @@ edit=Edit
edit_attribute=Edit attribute
serviceName=Service name
endpoint=Endpoint
-title=Connectors
+title=Connector
overridable=Overridable
property=Property
value=Value
@@ -40,3 +40,4 @@ poolMinIdle=Min idle objects
poolMaxIdle=Max idle objects
poolMaxWait=Max waiting time (msec)
poolMinEvictableIdleTime=Min eviction time (msec)
+new=New
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_it.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_it.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_it.properties
index 4c329af..96080c3 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_it.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_it.properties
@@ -25,7 +25,7 @@ edit=Edit
edit_attribute=Edit attribute
serviceName=Nome servizio
endpoint=Endpoint
-title=Connettori
+title=Connettore
displayName=Nome visualizzato
overridable=Sovrascrivibile
property=Propriet\u00e0
@@ -40,3 +40,4 @@ poolMinIdle=Max oggetti attivi
poolMaxIdle=Max oggetti inattivi
poolMaxWait=Tempo max attesa
poolMinEvictableIdleTime=Tempo min espulsione
+new=Nuovo
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_pt_BR.properties
index 30a7e4a..b688216 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ConnectorModalPage_pt_BR.properties
@@ -26,7 +26,7 @@ edit=Alterar
edit_attribute=Alterar Atributo
serviceName=Nome de Servi\u00e7o
endpoint=Endpoint
-title=Conectores
+title=Conector
overridable=Alter\u00e1vel
property=Propriedade
value=Valor
@@ -40,3 +40,4 @@ poolMinIdle=Min idle objects
poolMaxIdle=Max idle objects
poolMaxWait=Max waiting time (msec)
poolMinEvictableIdleTime=Min eviction time (msec)
+new=Novo
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DerSchemaModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DerSchemaModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DerSchemaModalPage.html
index 49595e1..5665e0e 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DerSchemaModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DerSchemaModalPage.html
@@ -24,10 +24,10 @@ under the License.
<div id="formtable">
<div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
- <label for="name"><wicket:message key="name"/></label>
+ <label for="key"><wicket:message key="key"/></label>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="name">[name]</span>
+ <span wicket:id="key">[name]</span>
</div>
</div>
<div class="tablerow">
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.html
index 9d9d233..998483d 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.html
@@ -67,7 +67,7 @@ under the License.
<wicket:message key="title"/>
</p>
- <span class="grouplabel"><wicket:message key="schemas"/></span>
+ <span class="grouplabel"><wicket:message key="plainSchemas"/></span>
<span wicket:id="dCheckGroup">
<div class="group">
<div wicket:id="details">
@@ -77,7 +77,7 @@ under the License.
</div>
</span>
- <span wicket:id="schemas">[schemas]</span>
+ <span wicket:id="plainSchemas">[schemas]</span>
<span wicket:id="dschemas">[derived schemas]</span>
@@ -86,9 +86,9 @@ under the License.
</div>
<wicket:fragment wicket:id="sfragment">
- <span wicket:id="sCheckGroup">
+ <span wicket:id="psCheckGroup">
<div class="group">
- <div wicket:id="schemas">
+ <div wicket:id="plainSchemas">
<input type="checkbox" wicket:id="scheck"/>
<span wicket:id="sname">[schema name]</span>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.properties
index 4f64bcf..e7080ed 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.properties
@@ -16,7 +16,7 @@
# under the License.
title=Change display attributes
tooManySelections=Too many columns to be shown
-schemas=User attributes
+plainSchemas=User plain attributes
derSchemas=User derived attributes
virSchemas=User virtual attributes
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_it.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_it.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_it.properties
index 60f818f..6ee5963 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_it.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_it.properties
@@ -16,7 +16,7 @@
# under the License.
title=Scegli attributi da visualizzare
tooManySelections=Troppe colonne da visualizzare
-schemas=Attributi utente
+plainSchemas=Attributi normali utente
derSchemas=Attributi derivati utente
virSchemas=Attributi virtuali utente
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_pt_BR.properties
index 7c7fa7b..7f2b8cb 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/DisplayAttributesModalPage_pt_BR.properties
@@ -16,18 +16,18 @@
# under the License.
title=Alterar atributos mostrados
tooManySelections=Muitas colunas para exibir
-schemas=Atributo de Usu\u00E1rios
-derSchemas=Atributos Derivados de Usu\u00E1rios
-virSchemas=Atributos virtuais de Usu\u00E1rios
+plainSchemas=Atributo Normal de Usu\u00e1rios
+derSchemas=Atributos Derivados de Usu\u00e1rios
+virSchemas=Atributos virtuais de Usu\u00e1rios
firstname=Nome
surname=Sobrenome
-userId=Identificador de Usu\u00E1rio
+userId=Identificador de Usu\u00e1rio
edit=Alterar
delete=Excluir
status=Estatus
token=Token
-username=Nome do Usu\u00E1rio
-creationDate=Data de Cria\u00E7\u00E3o
+username=Nome do Usu\u00e1rio
+creationDate=Data de Cria\u00e7\u00e3o
tokenValued=Valorado
-tokenNotValued=N\u00E3o Valorado
+tokenNotValued=N\u00e3o Valorado
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html
index 097f2e6..78436de 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html
@@ -25,7 +25,7 @@ under the License.
<title>Apache Syncope - Login</title>
- <link rel="shortcut icon" href="img/favicon.ico"/>
+ <link rel="shortcut icon" href="img/favicon.png" type="image/png"/>
<link rel="stylesheet" href="css/style.css" type="text/css" media="all"/>
<script type="text/javascript">
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.html
index 9af223b..9bc8cb7 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.html
@@ -28,7 +28,7 @@ under the License.
</ul>
<div id="tabs-1">
<div id="formtable">
- <span wicket:id="attrs">[membership attributes]</span>
+ <span wicket:id="plainAttrs">[membership plain attributes]</span>
<span wicket:id="systeminformation">[System Information]</span>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.properties
index d767290..28db548 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-tab1=Attributes
+tab1=Plain attributes
tab2=Derived attributes
tab3=Virtual attributes
title=Roles
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_it.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_it.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_it.properties
index f442cf4..0776461 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_it.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_it.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-tab1=Attributi
+tab1=Attributi normali
tab2=Attributi derivati
tab3=Attributi virtuali
title=Ruoli
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_pt_BR.properties
index 66d9cc5..481bc0c 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/MembershipModalPage_pt_BR.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-tab1=Atributos
+tab1=Atributos Normal
tab2=Atributos Derivados
tab3=Atributos Virtuais
title=Fun\u00e7\u00f5es
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/NotificationTaskModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/NotificationTaskModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/NotificationTaskModalPage.html
index 116ccca..c406ce9 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/NotificationTaskModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/NotificationTaskModalPage.html
@@ -16,94 +16,96 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<wicket:extend>
- <div id="dialog-form">
- <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="#profile"><span><wicket:message key="profile"/></span></a></li>
- <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
- </ul>
- <div id="profile">
- <div id="users-contain" class="ui-widget">
- <span wicket:id="profile">
- <div id="formtable">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:extend>
+ <div id="dialog-form">
+ <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="#profile"><span><wicket:message key="profile"/></span></a></li>
+ <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
+ </ul>
+ <div id="profile">
+ <div id="users-contain" class="ui-widget">
+ <span wicket:id="profile">
+ <div id="formtable">
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <span wicket:id="idLabel">[Id]</span>
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="idLabel">[Id]</span>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="key">[key]</span>
+ </div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
- </div>
- </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="sender"><wicket:message key="sender"/></label>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="sender"><wicket:message key="sender"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="sender">[sender]</span>
+ </div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="sender">[sender]</span>
- </div>
- </div>
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="recipients"><wicket:message key="recipients"/></label>
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="recipients"><wicket:message key="recipients"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="recipients">[recipients]</span>
+ </div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="recipients">[recipients]</span>
- </div>
- </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="subject"><wicket:message key="subject"/></label>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="subject"><wicket:message key="subject"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="subject">[subject]</span>
+ </div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="subject">[subject]</span>
- </div>
- </div>
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="textBody"><wicket:message key="textBody"/></label>
+ <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="40" rows="10">[textBody]</textarea>
+ </div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <textarea wicket:id="textBody" cols="40" rows="10">[textBody]</textarea>
- </div>
- </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="htmlBody"><wicket:message key="htmlBody"/></label>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="htmlBody"><wicket:message key="htmlBody"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <textarea wicket:id="htmlBody" cols="40" rows="10">[textBody]</textarea>
+ </div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <textarea wicket:id="htmlBody" cols="40" rows="10">[textBody]</textarea>
- </div>
- </div>
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="traceLevel"><wicket:message key="traceLevel"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="traceLevel">[traceLevel]</span>
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="traceLevel"><wicket:message key="traceLevel"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="traceLevel">[traceLevel]</span>
+ </div>
</div>
</div>
- </div>
+ </span>
+ </div>
+ </div>
+ <div id="executions" class="ui-widget">
+ <span wicket:id="executionContainer" id="executionContainer">
+ <table class="ui-widget ui-widget-content"
+ wicket:id="executionsTable" style="width: 100%"/>
</span>
</div>
</div>
- <div id="executions" class="ui-widget">
- <span wicket:id="executionContainer" id="executionContainer">
- <table class="ui-widget ui-widget-content"
- wicket:id="executionsTable" style="width: 100%"/>
- </span>
- </div>
- </div>
- </form>
- </div>
- <div wicket:id="taskExecMessageWin"/>
-</wicket:extend>
+ </form>
+ </div>
+ <div wicket:id="taskExecMessageWin"/>
+ </wicket:extend>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PlainSchemaModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PlainSchemaModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PlainSchemaModalPage.html
index 43b95cb..154419f 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PlainSchemaModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PlainSchemaModalPage.html
@@ -24,10 +24,10 @@ under the License.
<div id="formtable">
<div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
- <label for="name"><wicket:message key="name"/></label>
+ <label for="key"><wicket:message key="key"/></label>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="name">[name]</span>
+ <span wicket:id="key">[name]</span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PolicyModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PolicyModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PolicyModalPage.html
index a05658f..504d72c 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PolicyModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PolicyModalPage.html
@@ -34,10 +34,10 @@ under the License.
<div id="formtable">
<div class="tablerow alt">
<div class="tablecolumn_label short_fixedsize">
- <label for="id"><wicket:message key="id"/></label>
+ <label for="key"><wicket:message key="key"/></label>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
+ <span wicket:id="key">[key]</span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PropagationTaskModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PropagationTaskModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PropagationTaskModalPage.html
index b620b89..67ac588 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PropagationTaskModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PropagationTaskModalPage.html
@@ -16,58 +16,60 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<wicket:extend>
- <div id="dialog-form">
- <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="#profile"><span><wicket:message key="profile"/></span></a></li>
- <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
- </ul>
- <div id="profile">
- <div id="users-contain" class="ui-widget">
- <span wicket:id="profile">
- <div id="formtable">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:extend>
+ <div id="dialog-form">
+ <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="#profile"><span><wicket:message key="profile"/></span></a></li>
+ <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
+ </ul>
+ <div id="profile">
+ <div id="users-contain" class="ui-widget">
+ <span wicket:id="profile">
+ <div id="formtable">
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <span wicket:id="idLabel">[Id]</span>
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="idLabel">[Id]</span>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="key">[key]</span>
+ </div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
- </div>
- </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="accountId"><wicket:message key="accountId"/></label>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="accountId"><wicket:message key="accountId"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="accountId">[accountId]</span>
+ </div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="accountId">[accountId]</span>
- </div>
- </div>
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="resource"><wicket:message key="resource"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="resource">[resource]</span>
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="resource"><wicket:message key="resource"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="resource">[resource]</span>
+ </div>
</div>
</div>
- </div>
+ </span>
+ </div>
+ </div>
+ <div id="executions" class="ui-widget">
+ <span wicket:id="executionContainer" id="executionContainer">
+ <table class="ui-widget ui-widget-content"
+ wicket:id="executionsTable" style="width: 100%"/>
</span>
</div>
</div>
- <div id="executions" class="ui-widget">
- <span wicket:id="executionContainer" id="executionContainer">
- <table class="ui-widget ui-widget-content"
- wicket:id="executionsTable" style="width: 100%"/>
- </span>
- </div>
- </div>
- </form>
- </div>
- <div wicket:id="taskExecMessageWin"/>
-</wicket:extend>
+ </form>
+ </div>
+ <div wicket:id="taskExecMessageWin"/>
+ </wicket:extend>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage.html
index 8814e69..37047cc 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage.html
@@ -39,7 +39,7 @@ under the License.
<span wicket:id="idLabel">[Id]</span>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
+ <span wicket:id="key">[key]</span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ReportModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ReportModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ReportModalPage.html
index 8886b3f..b813b12 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ReportModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ReportModalPage.html
@@ -37,7 +37,7 @@ under the License.
<span wicket:id="idLabel">[Id]</span>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
+ <span wicket:id="key">[key]</span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties
index 4804deb..a681eb0 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties
@@ -56,5 +56,5 @@ error_connection=Conex\u00e3o sem sucesso
check=Verificar a conex\u00e3o
actionsClasses=Classes de a\u00e7\u00f5es
rmapping=Regra de Mapeamento
-new=novo
+new=Novo
randomPwdIfNotProvided=Gerar senhas aleat\u00f3rias quando n\u00e3o houver
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html
index 3f54815..6406807 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html
@@ -28,7 +28,7 @@ under the License.
<ul>
<li><a href="#details"><span><wicket:message key="details"/></span></a></li>
<li><a href="#templates"><span><wicket:message key="templates"/></span></a></li>
- <li><a href="#attrs"><span><wicket:message key="attrs"/></span></a></li>
+ <li><a href="#plainAttrs"><span><wicket:message key="plainAttrs"/></span></a></li>
<li><a href="#derAttrs"><span><wicket:message key="derAttrs"/></span></a></li>
<li><a href="#virAttrs"><span><wicket:message key="virAttrs"/></span></a></li>
<li><a href="#resources"><span><wicket:message key="resources"/></span></a></li>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties
index 37091a0..a24551c 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties
@@ -17,7 +17,7 @@
required_alert=All form fields are required.
title=Role
details=Details
-attrs=Attributes
+plainAttrs=Plain attributes
tab3=Derived attributes
tab4=Virtual attributes
resources=Resources
@@ -42,7 +42,7 @@ virAttrValue=Virtual value
addAttributeBtn=Add
-inheritAttrs=Inherit attributes
+inheritPlainAttrs=Inherit plain attributes
inheritDerAttrs=Inherit derived attributes
inheritVirAttrs=Inherit virtual attributes
templates=Templates
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties
index cf2017e..c97fe6f 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties
@@ -17,7 +17,7 @@
required_alert=All form fields are required.
title=Ruolo
details=Dettagli
-attrs=Attributi
+plainAttrs=Attributi normali
tab3=Attributi derivati
tab4=Attributi virtuali
resources=Risorse
@@ -28,8 +28,8 @@ drop=-
error=Errore generico durante l'operazione
firstResourcesList=Risorse ruolo
secondResourcesList=Risorse disponibili
-firstResourcesList=Entitlement ruolo
-secondResourcesList=Entitlement disponibili
+firstResourcesList=Risorse ruolo
+secondResourcesList=Risorse disponibili
derAttrs=Attributi derivati
derAttrToRemove=Elimina
derAttrName=Nome
@@ -42,7 +42,9 @@ virAttrValue=Valore virtuale
addAttributeBtn=Aggiungi
-inheritAttrs=Eredita attributi
+inheritPlainAttrs=Eredita attributi normali
inheritDerAttrs=Eredita attributi derivati
inheritVirAttrs=Eredita attributi virtuali
templates=Modelo
+secondEntitlementsList=Entitlement disponibili
+firstEntitlementsList=Entitlement ruolo
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties
index f588e75..5bff4ed 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties
@@ -17,7 +17,7 @@
required_alert=Todos os campos s\u00e3o obrigat\u00f3rios
title=Fun\u00e7\u00e3o
details=Detalhes
-attrs=Atributos
+plainAttrs=Atributos Normal
tab3=Atributos Derivados
tab4=Atributos Virtuais
resources=Recursos
@@ -42,7 +42,7 @@ virAttrValue=Valor Virtual
addAttributeBtn=Adicionar
-inheritAttrs=Atributos Herdados
+inheritPlainAttrs=Atributos Herdados Normal
inheritDerAttrs=Atributos Derivados Herdados
inheritVirAttrs=Atributos Virtuais Herdados
templates=Modelli
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SchedTaskModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SchedTaskModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SchedTaskModalPage.html
index 42be774..2d25618 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SchedTaskModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SchedTaskModalPage.html
@@ -37,7 +37,7 @@ under the License.
<span wicket:id="idLabel">[Id]</span>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
+ <span wicket:id="key">[key]</span>
</div>
</div>
@@ -88,7 +88,7 @@ under the License.
</div>
<script type="text/javascript">
- $(function() {
+ $(function () {
$('#formtable div.tablerow:even').addClass("alt");
});
</script>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties
index b5d81f9..e103028 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties
@@ -27,7 +27,7 @@ edit=Edit
delete=Delete
attributes=Attributes
expression=Expression
-normal=Normal
+plain=Plain
derived=Derived
virtual=Virtual
mandatoryCondition=Mandatory
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties
index 611ed9c..b95da78 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties
@@ -27,7 +27,7 @@ edit=Modifica
delete=Rimuovi
attributes=Attributi
expression=Expression
-normal=Normali
+plain=Normali
derived=Derivati
virtual=Virtuali
mandatoryCondition=Obbligatorio
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties
index 8d76c3b..994d485 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties
@@ -27,7 +27,7 @@ edit=Editar
delete=Remover
attributes=Atributos
expression=Express\u00e3o
-normal=Normal
+plain=Normal
derived=Derivado
virtual=Virtual
mandatoryCondition=Mandat\u00f3rio
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SyncTaskModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SyncTaskModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SyncTaskModalPage.html
index 47a73c5..fc9b0a5 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SyncTaskModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/SyncTaskModalPage.html
@@ -39,7 +39,7 @@ under the License.
<span wicket:id="idLabel">[Id]</span>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="id">[id]</span>
+ <span wicket:id="key">[key]</span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.html
index ff39c9c..991f726 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.html
@@ -60,7 +60,7 @@ under the License.
</div>
<div id="tabs-2">
<div id="formtable">
- <span wicket:id="attrs">[user attributes]</span>
+ <span wicket:id="plainAttrs">[user plain attributes]</span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties
index c0614c4..7667bc5 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties
@@ -19,7 +19,7 @@ title=User
firstname=Firstname
surname=Surname
tab1=Details
-tab2=Attributes
+tab2=Plain attributes
tab3=Derived attributes
tab4=Virtual attributes
tab5=Resources
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties
index 8a79601..ec550c3 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties
@@ -19,7 +19,7 @@ title=Utente
firstname=Nome
surname=Cognome
tab1=Details
-tab2=Attributi
+tab2=Attributi normali
tab3=Attributi derivati
tab4=Attributi virtuali
tab5=Risorse
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties
index 7000c47..d5d26a9 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties
@@ -19,7 +19,7 @@ title=Usu\u00e1rio
firstname=Nome
surname=Sobrenome
tab1=Detalhes
-tab2=Atributos
+tab2=Atributos Normal
tab3=Atriutos Derivados
tab4=Atributos Virtuais
tab5=Recursos
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/VirSchemaModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/VirSchemaModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/VirSchemaModalPage.html
index 695ed51..3adea45 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/VirSchemaModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/VirSchemaModalPage.html
@@ -24,10 +24,10 @@ under the License.
<div id="formtable">
<div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
- <label for="name"><wicket:message key="name"/></label>
+ <label for="key"><wicket:message key="key"/></label>
</div>
<div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="name">[name]</span>
+ <span wicket:id="key">[name]</span>
</div>
</div>
<div class="tablerow">
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/active.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/active.png b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/active.png
deleted file mode 100644
index 79332c0..0000000
Binary files a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/active.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/inactive.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/inactive.png b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/inactive.png
deleted file mode 100644
index 68975bd..0000000
Binary files a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/inactive.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/objectnotfound.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/objectnotfound.png b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/objectnotfound.png
deleted file mode 100644
index a0a2933..0000000
Binary files a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/objectnotfound.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/undefined.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/undefined.png b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/undefined.png
deleted file mode 100644
index 97188ba..0000000
Binary files a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/statuses/undefined.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractProvisioningTasksPanel.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractProvisioningTasksPanel.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractProvisioningTasksPanel.html
new file mode 100644
index 0000000..cbe6296
--- /dev/null
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractProvisioningTasksPanel.html
@@ -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" style="width:auto">
+ <span wicket:id="container">
+ <span wicket:id="datatable">[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>
+ </span>
+ </div>
+ <div wicket:id="taskWin">
+ [Show modal window for viewing task]
+ </div>
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createLink">
+ <wicket:message key="create"/>
+ </a>
+ </wicket:panel>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSyncTasksPanel.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSyncTasksPanel.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSyncTasksPanel.html
deleted file mode 100644
index cbe6296..0000000
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSyncTasksPanel.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-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" style="width:auto">
- <span wicket:id="container">
- <span wicket:id="datatable">[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>
- </span>
- </div>
- <div wicket:id="taskWin">
- [Show modal window for viewing task]
- </div>
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createLink">
- <wicket:message key="create"/>
- </a>
- </wicket:panel>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html
index 000b8f5..9049435 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html
@@ -27,16 +27,16 @@ under the License.
<wicket:panel>
<div id="attrTemplateTabs" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
<ul>
- <li class="tabs-selected"><a href="#rattr"><wicket:message key="rattr"/></a></li>
+ <li class="tabs-selected"><a href="#rplainattr"><wicket:message key="rplainattr"/></a></li>
<li><a href="#rderattr"><wicket:message key="rderattr"/></a></li>
<li><a href="#rvirattr"><wicket:message key="rvirattr"/></a></li>
- <li><a href="#mattr"><wicket:message key="mattr"/></a></li>
+ <li><a href="#mplainattr"><wicket:message key="mplainattr"/></a></li>
<li><a href="#mderattr"><wicket:message key="mderattr"/></a></li>
<li><a href="#mvirattr"><wicket:message key="mvirattr"/></a></li>
</ul>
- <div id="rattr">
- <div wicket:id="rAttrTemplates"/>
+ <div id="rplainattr">
+ <div wicket:id="rPlainAttrTemplates"/>
</div>
<div id="rderattr">
<div wicket:id="rDerAttrTemplates"/>
@@ -44,8 +44,8 @@ under the License.
<div id="rvirattr">
<div wicket:id="rVirAttrTemplates"/>
</div>
- <div id="mattr">
- <div wicket:id="mAttrTemplates"/>
+ <div id="mplainattr">
+ <div wicket:id="mPlainAttrTemplates"/>
</div>
<div id="mderattr">
<div wicket:id="mDerAttrTemplates"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.properties
index 4d8133c..94da979 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.properties
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-rattr=Normal
+rplainattr=Plain
rderattr=Derived
rvirattr=Virtual
-mattr=Normal (Membership)
+mplainattr=Plain (Membership)
mderattr=Derived (Membership)
mvirattr=Virtual (Membership)
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_it.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_it.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_it.properties
index 69e4ee0..d30ff59 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_it.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_it.properties
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-rattr=Normali
+rplainattr=Normali
rderattr=Derivati
rvirattr=Virtuali
-mattr=Normali (Membership)
+mplainattr=Normali (Membership)
mderattr=Derivati (Membership)
mvirattr=Virtuali (Membership)
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_pt_BR.properties
index 838a459..5fd7c3a 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel_pt_BR.properties
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-rattr=Normal
+rplainattr=Normal
rderattr=Derivado
rvirattr=Virtual
-mattr=Normal (Membro)
+mplainattr=Normal (Membro)
mderattr=Derivado (Membro)
mvirattr=Virtual (Membro)