http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RemoteObjectPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RemoteObjectPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RemoteObjectPanel.html index d0e5167..46fb7fd 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RemoteObjectPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RemoteObjectPanel.html @@ -17,8 +17,7 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> <wicket:panel> - <span wicket:id="remoteObject">[REMOTE OBJCET]</span> + <span wicket:id="remoteObject">[REMOTE OBJECT]</span> </wicket:panel> </html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/panels/search/SearchClausePanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/search/SearchClausePanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/search/SearchClausePanel.html index 683fef7..0929615 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/search/SearchClausePanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/search/SearchClausePanel.html @@ -17,28 +17,25 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:extend> - <wicket:enclosure child="field-label"> - <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/> - <span wicket:id="externalAction"/> - </wicket:enclosure> - <span wicket:id="container" class="clause"> - <div wicket:id="operatorContainer" class="field operator"><span wicket:id="operator"/></div> - <span wicket:id="type" class="field type"/> - <span wicket:id="property" class="field property"/> - <span wicket:id="comparator" class="field comparator"/> - <span wicket:id="value" class="field value"/> - </span> + <wicket:extend> + <wicket:enclosure child="field-label"> + <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/> + <span wicket:id="externalAction"/> + </wicket:enclosure> + <span wicket:id="container" class="clause"> + <div wicket:id="operatorContainer" class="field operator"><span wicket:id="operator"/></div> + <span wicket:id="type" class="field type"/> + <span wicket:id="property" class="field property"/> + <span wicket:id="comparator" class="field comparator"/> + <span wicket:id="value" class="field value"/> + </span> - <wicket:fragment wicket:id="searchButtonFragment"> - <a href="#" wicket:id="search"><li class="glyphicon glyphicon-search"></li></a> - </wicket:fragment> + <wicket:fragment wicket:id="searchButtonFragment"> + <a href="#" wicket:id="search"><li class="glyphicon glyphicon-search"></li></a> + </wicket:fragment> - <wicket:fragment wicket:id="operatorFragment"> - <span wicket:id="operator"/> - </wicket:fragment> - </wicket:extend> - </body> + <wicket:fragment wicket:id="operatorFragment"> + <span wicket:id="operator"/> + </wicket:fragment> + </wicket:extend> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportWizardBuilder$Schedule.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportWizardBuilder$Schedule.html b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportWizardBuilder$Schedule.html index 99e853e..dad9871 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportWizardBuilder$Schedule.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportWizardBuilder$Schedule.html @@ -17,10 +17,7 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <span wicket:id="schedule"/> - </wicket:panel> - </body> + <wicket:panel> + <span wicket:id="schedule"/> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/status/AnyStatusModal.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/AnyStatusModal.html b/client/console/src/main/resources/org/apache/syncope/client/console/status/AnyStatusModal.html index 7f18503..303ef4a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/status/AnyStatusModal.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/AnyStatusModal.html @@ -16,8 +16,7 @@ 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";> - <head><title></title></head> +<html xmlns="http://www.w3.org/1999/xhtml"; > <wicket:extend> </wicket:extend> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.html new file mode 100644 index 0000000..91b0038 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.html @@ -0,0 +1,37 @@ +<!-- +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> + <form wicket:id="form"> + <div class="form-group form-palette"> + <span wicket:id="actionsClassNames">[actionsClassNames]</span> + </div> + <div class="form-group"><span wicket:id="matchingRule">[matchingRule]</span></div> + <div class="form-group"><span wicket:id="unmatchingRule">[unmatchingRule]</span></div> + <div class="form-group"><span wicket:id="performCreate">[performCreate]</span></div> + <div class="form-group"><span wicket:id="performUpdate">[performUpdate]</span></div> + <div class="form-group"><span wicket:id="performDelete">[performDelete]</span></div> + <div class="form-group"><span wicket:id="syncStatus">[syncStatus]</span></div> + + <div style="float: right;"> + <a href="#" wicket:id="reconcile" class="btn btn-primary btn-circle btn-lg"><i class="fa fa-recycle" alt="reconcile" title="Reconcile"></i></a> + </div> + </form> + </wicket:panel> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html index 892ec31..839fce0 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html @@ -66,8 +66,8 @@ under the License. <wicket:enclosure child="push"> <li><a href="#" wicket:id="push"><i class="fa fa-chevron-circle-right"></i><wicket:message key="resource.menu.push.list"/></a></li> </wicket:enclosure> - <wicket:enclosure child="status"> - <li><a href="#" wicket:id="status"><i class="fa fa-list-ul"></i><wicket:message key="resource.menu.provisioning.status"/></a></li> + <wicket:enclosure child="reconciliation"> + <li><a href="#" wicket:id="reconciliation"><i class="fa fa-recycle"></i><wicket:message key="resource.menu.reconciliation"/></a></li> </wicket:enclosure> <wicket:enclosure child="history"> <li><a href="#" wicket:id="history"><i class="fa fa-history"></i><wicket:message key="resource.menu.history"/></a></li> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties index 60e4c18..a20f7cb 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties @@ -37,8 +37,8 @@ task.pull.list=Pull tasks {0} task.push.list=Push tasks {0} resource.explore.list=Explore ${key} connectors.reload=Reload all connectors -resource.provisioning.status=Provisioning Status {0} -resource.menu.provisioning.status=Provisioning status +resource.reconciliation=Reconciliation {0} +resource.menu.reconciliation=Reconciliation resource.menu.push.list=Push tasks resource.menu.pull.list=Pull tasks resource.menu.propagation.list=Propagation tasks http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties index dd16d75..7a67919 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties @@ -37,8 +37,8 @@ task.pull.list=Pull task {0} task.push.list=Push task {0} resource.explore.list=Esplora ${key} connectors.reload=Ricarica tutti i connettori -resource.provisioning.status=Stato provisioning {0} -resource.menu.provisioning.status=Stato provisioning +resource.reconciliation=Riconciliazione {0} +resource.menu.reconciliation=Riconciliazione resource.menu.push.list=Push tasks resource.menu.pull.list=Pull tasks resource.menu.propagation.list=Task di propagazione http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ja.properties index aef451c..9bff0a5 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ja.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ja.properties @@ -37,8 +37,8 @@ task.pull.list=\u30d7\u30eb\u30bf\u30b9\u30af {0} task.push.list=\u30d7\u30c3\u30b7\u30e5\u30bf\u30b9\u30af {0} resource.explore.list=${key} \u3092\u63a2\u7d22 connectors.reload=\u3059\u3079\u3066\u306e\u30b3\u30cd\u30af\u30bf\u30fc\u3092\u518d\u8aad\u307f\u8fbc\u307f -resource.provisioning.status=\u30d7\u30ed\u30d3\u30b8\u30e7\u30cb\u30f3\u30b0\u30b9\u30c6\u30fc\u30bf\u30b9 {0} -resource.menu.provisioning.status=\u30d7\u30ed\u30d3\u30b8\u30e7\u30cb\u30f3\u30b0\u30b9\u30c6\u30fc\u30bf\u30b9 +resource.reconciliation=Reconciliation {0} +resource.menu.reconciliation=Reconciliation resource.menu.push.list=\u30d7\u30c3\u30b7\u30e5\u30bf\u30b9\u30af resource.menu.pull.list=\u30d7\u30eb\u30bf\u30b9\u30af resource.menu.propagation.list=\u4f1d\u64ad\u30bf\u30b9\u30af http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties index ce3fa05..47d851f 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties @@ -37,8 +37,8 @@ task.pull.list=Pull tasks {0} task.push.list=Push tasks {0} resource.explore.list=Explorar ${key} connectors.reload=Reload all connectors -resource.provisioning.status=Provisioning status {0} -resource.menu.provisioning.status=Provisioning status +resource.reconciliation=Reconciliation {0} +resource.menu.reconciliation=Reconciliation resource.menu.push.list=Push tasks resource.menu.pull.list=Pull tasks resource.menu.propagation.list=Propagation tasks http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties index 07b3b09..5879fe2 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties @@ -38,8 +38,8 @@ task.pull.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u043e\u043b\u0443\u04 task.push.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0434\u0430\u043d\u043d\u044b\u0445 {0} resource.explore.list=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 ${key} connectors.reload=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0432\u0441\u0435 \u043a\u043e\u043d\u043d\u0435\u043a\u0442\u043e\u0440\u044b -resource.provisioning.status=\u0421\u0442\u0430\u0442\u0443\u0441 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f {0} -resource.menu.provisioning.status=\u0421\u0442\u0430\u0442\u0443\u0441 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f +resource.reconciliation=Reconciliation {0} +resource.menu.reconciliation=Reconciliation resource.menu.push.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0434\u0430\u043d\u043d\u044b\u0445 resource.menu.pull.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445 resource.menu.propagation.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439 http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties index a0fe773..1086b88 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties @@ -91,7 +91,7 @@ reset.title=reset reset.alt=reset icon enable.class=fa fa-toggle-on -enable.title=enable +enable.title=manage status enable.alt=enable icon not_found.class=fa fa-eye-slash @@ -226,6 +226,14 @@ provision_members.class=glyphicon glyphicon-fast-forward provision_members.title=provision members provision_members.alt=provision members icon +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon + +reconciliation_pull.class=fa fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon + manage_resources.class=fa fa-sitemap manage_resources.title=manage resources manage_resources.alt=manage resources icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_it.properties index 7e8d0c2..e326a95 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_it.properties @@ -91,7 +91,7 @@ reset.title=reset reset.alt=reset icon enable.class=fa fa-toggle-on -enable.title=enable +enable.title=manage status enable.alt=enable icon not_found.class=fa fa-eye-slash @@ -256,3 +256,9 @@ zoom_out.alt=zoom-out icon workflow_modeler.class=fa fa-picture-o workflow_modeler.title=workflow modeler workflow_modeler.alt=workflow modeler icon +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon +reconciliation_pull.class=fa fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ja.properties index 2ef2c19..6789a9b 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ja.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ja.properties @@ -91,7 +91,7 @@ reset.title=\u30ea\u30bb\u30c3\u30c8 reset.alt=\u30ea\u30bb\u30c3\u30c8 enable.class=fa fa-toggle-on -enable.title=\u6709\u52b9 +enable.title=manage status enable.alt=\u6709\u52b9 not_found.class=fa fa-eye-slash @@ -257,3 +257,9 @@ zoom_out.alt=\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8 workflow_modeler.class=fa fa-picture-o workflow_modeler.title=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30e2\u30c7\u30e9\u2015 workflow_modeler.alt=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30e2\u30c7\u30e9\u2015 +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon +reconciliation_pull.class=fa fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_pt_BR.properties index 07acbc3..c996263 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_pt_BR.properties @@ -91,7 +91,7 @@ reset.title=reset reset.alt=reset icon enable.class=fa fa-toggle-on -enable.title=enable +enable.title=manage status enable.alt=enable icon not_found.class=fa fa-eye-slash @@ -256,3 +256,9 @@ zoom_out.alt=zoom-out icon workflow_modeler.class=fa fa-picture-o workflow_modeler.title=workflow modeler workflow_modeler.alt=workflow modeler icon +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon +reconciliation_pull.class=fa fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ru.properties index d363d25..9cad806 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel_ru.properties @@ -91,7 +91,7 @@ reset.title=reset reset.alt=reset icon enable.class=fa fa-toggle-on -enable.title=abilita +enable.title=gestisci stato enable.alt=enable icon not_found.class=fa fa-eye-slash @@ -256,3 +256,9 @@ zoom_out.alt=zoom-out icon workflow_modeler.class=fa fa-picture-o workflow_modeler.title=workflow modeler workflow_modeler.alt=workflow modeler icon +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon +reconciliation_pull.class=fa fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties index ad327c2..e5affd7 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties @@ -75,7 +75,7 @@ reset.title=reset reset.alt=reset icon enable.class=fa fa-toggle-on -enable.title=enable +enable.title=manage status enable.alt=enable icon not_found.class=fa fa-eye-slash @@ -198,6 +198,14 @@ provision_members.class=glyphicon glyphicon-fast-forward provision_members.title=provision members provision_members.alt=provision members icon +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon + +reconciliation_pull.class=fa fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon + manage_resources.class=fa fa-sitemap manage_resources.title=manage resources manage_resources.alt=manage resources icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties index 5cf18df..d0dbb16 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties @@ -75,7 +75,7 @@ reset.title=reset reset.alt=reset icon enable.class=fa fa-toggle-on -enable.title=abilita +enable.title=gestisci stato enable.alt=enable icon not_found.class=fa fa-eye-slash @@ -225,3 +225,9 @@ zoom_in.alt=zoom-in icon zoom_out.class=fa fa-search-minus zoom_out.title=rimpicciolisci zoom_out.alt=zoom-out icon +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon +reconciliation_pull.class=fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties index db63cdb..599edfa 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties @@ -75,7 +75,7 @@ reset.title=\u30ea\u30bb\u30c3\u30c8 reset.alt=\u30ea\u30bb\u30c3\u30c8 enable.class=fa fa-toggle-on -enable.title=\u6709\u52b9 +enable.title=manage status enable.alt=\u6709\u52b9 not_found.class=fa fa-eye-slash @@ -225,3 +225,9 @@ zoom_in.alt=\u30ba\u30fc\u30e0\u30a4\u30f3 zoom_out.class=fa fa-search-minus zoom_out.title=\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8 zoom_out.alt=\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8 +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon +reconciliation_pull.class=fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties index b8afd75..4aedf76 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties @@ -75,7 +75,7 @@ reset.title=reset reset.alt=reset icon enable.class=fa fa-toggle-on -enable.title=enable +enable.title=manage status enable.alt=enable icon not_found.class=fa fa-eye-slash @@ -225,3 +225,9 @@ zoom_in.alt=zoom-in icon zoom_out.class=fa fa-search-minus zoom_out.title=zoom-out zoom_out.alt=zoom-out icon +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon +reconciliation_pull.class=fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties index ad327c2..e7fc2d3 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties @@ -75,7 +75,7 @@ reset.title=reset reset.alt=reset icon enable.class=fa fa-toggle-on -enable.title=enable +enable.title=manage status enable.alt=enable icon not_found.class=fa fa-eye-slash @@ -225,3 +225,9 @@ zoom_in.alt=zoom-in icon zoom_out.class=fa fa-search-minus zoom_out.title=zoom-out zoom_out.alt=zoom-out icon +reconciliation_push.class=fa fa-chevron-circle-right +reconciliation_push.title=push +reconciliation_push.alt=reconciliation push icon +reconciliation_pull.class=fa-chevron-circle-left +reconciliation_pull.title=pull +reconciliation_pull.alt=reconciliation pull icon http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.html index 0767e59..249ac51 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.html @@ -16,11 +16,8 @@ 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";> - <head><title></title></head> - <body> - <wicket:panel> - <wicket:child /> - </wicket:panel> - </body> +<html xmlns="http://www.w3.org/1999/xhtml"; > + <wicket:panel> + <wicket:child/> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryImagePreviewer.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryImagePreviewer.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryImagePreviewer.html index 51f5a3e..3b891b0 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryImagePreviewer.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryImagePreviewer.html @@ -17,10 +17,7 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:extend> - <div><img wicket:id = "previewImage"/></div> - </wicket:extend> - </body> + <wicket:extend> + <div><img wicket:id = "previewImage"/></div> + </wicket:extend> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html index 6b4cee1..b9a1f19 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html @@ -17,21 +17,17 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:extend> - <div wicket:id="previewContainer"> - <span wicket:id="preview"/> - </div> + <wicket:extend> + <div wicket:id="previewContainer"> + <span wicket:id="preview"/> + </div> - <wicket:fragment wicket:id="previewFragment"> - <div><img wicket:id = "previewImage"/></div> - </wicket:fragment> - <wicket:fragment wicket:id="noPreviewFragment"> - <div style="padding: 8px 0px 1px 10px"> - <i class=" glyphicon glyphicon-paperclip fa-2x" title="Preview not available" alt="Default preview icon"></i> - </div> - </wicket:fragment> - </wicket:extend> - </body> + <wicket:fragment wicket:id="previewFragment"> + <div><img wicket:id = "previewImage"/></div> + </wicket:fragment> + <wicket:fragment wicket:id="noPreviewFragment"> + <div style="padding: 8px 0px 1px 10px"> + <i class=" glyphicon glyphicon-paperclip fa-2x" title="Preview not available" alt="Default preview icon"></i> + </div> + </wicket:fragment> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/DefaultPreviewer.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/DefaultPreviewer.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/DefaultPreviewer.html index c96fd4b..7471fed 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/DefaultPreviewer.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/DefaultPreviewer.html @@ -16,13 +16,10 @@ 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";> - <head><title></title></head> - <body> - <wicket:extend> - <div style="padding: 8px 0px 1px 10px"> - <i class=" glyphicon glyphicon-paperclip fa-2x" title="Preview not available" alt="Default preview icon"></i> - </div> - </wicket:extend> - </body> +<html xmlns="http://www.w3.org/1999/xhtml"; > + <wicket:extend> + <div style="padding: 8px 0px 1px 10px"> + <i class=" glyphicon glyphicon-paperclip fa-2x" title="Preview not available" alt="Default preview icon"></i> + </div> + </wicket:extend> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/ReconDetailsModalPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/ReconDetailsModalPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/ReconDetailsModalPanel.html new file mode 100644 index 0000000..645039d --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/ReconDetailsModalPanel.html @@ -0,0 +1,23 @@ +<!-- +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:extend> + <div wicket:id="diff"/> + </wicket:extend> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/ReconciliationDetailsModalPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/ReconciliationDetailsModalPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/ReconciliationDetailsModalPanel.html deleted file mode 100644 index 645039d..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/ReconciliationDetailsModalPanel.html +++ /dev/null @@ -1,23 +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:extend> - <div wicket:id="diff"/> - </wicket:extend> -</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AbstractMappingPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AbstractMappingPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AbstractMappingPanel.html index 57339dd..6df2828 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AbstractMappingPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AbstractMappingPanel.html @@ -17,80 +17,77 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="table-responsive no-padding"> - <table id="mappings" - class="table table-hover" - style="font-size: 1em;margin-top:2px;" - wicket:id="mappingContainer"> - <tbody> - <tr> - <th> - <wicket:message key="intAttrName"/> - <span id="intAttrNameInfo" wicket:id="intAttrNameInfo" class="glyphicon glyphicon-info-sign"></span> - </th> - <th><wicket:message key="extAttrName"/></th> - <th><i class="fa fa-repeat"></i></th> - <th><i class="fa fa-magic"></i></th> - <th> - <wicket:message key="mandatoryCondition"/> - <span id="jexlInfo" wicket:id="jexlInfo" class="glyphicon glyphicon-info-sign"></span> - </th> - <th><wicket:message key="connObjectKey"/></th> - <th><label wicket:id="passwordLabel"/></th> - <th><label wicket:id="purposeLabel"/></th> - <th></th> - </tr> - <tr wicket:id="mappings"> - <td> - <span wicket:id="intAttrName">[intAttrNames]</span> - </td> - <td> - <span wicket:id="extAttrName">[extAttrName]</span> - </td> - <td> - <div class="alert-widget dropdown tasks-menu"> - <span wicket:id="jexlTransformers">[JEXL Transformers]</span> - </div> - </td> - <td> - <div class="alert-widget dropdown tasks-menu"> - <span wicket:id="itemTransformers">[Mapping Item Transformers]</span> - </div> - </td> - <td> - <span wicket:id="mandatoryCondition">[mandatoryCondition]</span> - </td> - <td> - <span wicket:id="connObjectKey">[connObjectKey]</span> - </td> - <td> - <span wicket:id="password">[password]</span> - </td> - <td> - <div wicket:id="purpose" style="margin: 10px 0px 10px 0px"> - <span wicket:id="purposeActions">[purpose]</span> - </div> - </td> - <td> - <div id="inline-actions"> - <span wicket:id="toRemove"/> - </div> - </td> - </tr> - </tbody> + <wicket:panel> + <div class="table-responsive no-padding"> + <table id="mappings" + class="table table-hover" + style="font-size: 1em;margin-top:2px;" + wicket:id="mappingContainer"> + <tbody> + <tr> + <th> + <wicket:message key="intAttrName"/> + <span id="intAttrNameInfo" wicket:id="intAttrNameInfo" class="glyphicon glyphicon-info-sign"></span> + </th> + <th><wicket:message key="extAttrName"/></th> + <th><i class="fa fa-repeat"></i></th> + <th><i class="fa fa-magic"></i></th> + <th> + <wicket:message key="mandatoryCondition"/> + <span id="jexlInfo" wicket:id="jexlInfo" class="glyphicon glyphicon-info-sign"></span> + </th> + <th><wicket:message key="connObjectKey"/></th> + <th><label wicket:id="passwordLabel"/></th> + <th><label wicket:id="purposeLabel"/></th> + <th></th> + </tr> + <tr wicket:id="mappings"> + <td> + <span wicket:id="intAttrName">[intAttrNames]</span> + </td> + <td> + <span wicket:id="extAttrName">[extAttrName]</span> + </td> + <td> + <div class="alert-widget dropdown tasks-menu"> + <span wicket:id="jexlTransformers">[JEXL Transformers]</span> + </div> + </td> + <td> + <div class="alert-widget dropdown tasks-menu"> + <span wicket:id="itemTransformers">[Mapping Item Transformers]</span> + </div> + </td> + <td> + <span wicket:id="mandatoryCondition">[mandatoryCondition]</span> + </td> + <td> + <span wicket:id="connObjectKey">[connObjectKey]</span> + </td> + <td> + <span wicket:id="password">[password]</span> + </td> + <td> + <div wicket:id="purpose" style="margin: 10px 0px 10px 0px"> + <span wicket:id="purposeActions">[purpose]</span> + </div> + </td> + <td> + <div id="inline-actions"> + <span wicket:id="toRemove"/> + </div> + </td> + </tr> + </tbody> - <tfoot> - <tr> - <td colspan="10" style="padding: 5px; text-align: right"> - <input type="submit" class="btn btn-primary" wicket:id="addMappingBtn" /> - </td> - </tr> - </tfoot> - </table> - </div> - </wicket:panel> - </body> + <tfoot> + <tr> + <td colspan="10" style="padding: 5px; text-align: right"> + <input type="submit" class="btn btn-primary" wicket:id="addMappingBtn" /> + </td> + </tr> + </tfoot> + </table> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/AnnotatedBeanPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/AnnotatedBeanPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/AnnotatedBeanPanel.html index 02bbeb7..c2ae2b8 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/AnnotatedBeanPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/AnnotatedBeanPanel.html @@ -17,48 +17,45 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="information"> - <div class="infoleft"> - <div class="infolabel"> - <wicket:message key="creationDate"/>: - </div> - <div> - <span wicket:id="creationDate" /> - </div> + <wicket:panel> + <div class="information"> + <div class="infoleft"> + <div class="infolabel"> + <wicket:message key="creationDate"/>: </div> - - <div class="inforight"> - <div class="infolabel"> - <wicket:message key="lastChangeDate"/>: - </div> - <div> - <span wicket:id="lastChangeDate" /> - </div> + <div> + <span wicket:id="creationDate" /> </div> + </div> - <div class="infoleft"> - <div class="infolabel"> - <wicket:message key="creator"/>: - </div> - <div> - <span wicket:id="creator" /> - </div> + <div class="inforight"> + <div class="infolabel"> + <wicket:message key="lastChangeDate"/>: + </div> + <div> + <span wicket:id="lastChangeDate" /> </div> + </div> - <div class="inforight"> - <div class="infolabel"> - <wicket:message key="lastModifier"/>: - </div> - <div> - <span wicket:id="lastModifier" /> - </div> + <div class="infoleft"> + <div class="infolabel"> + <wicket:message key="creator"/>: + </div> + <div> + <span wicket:id="creator" /> </div> + </div> - <wicket:child /> + <div class="inforight"> + <div class="infolabel"> + <wicket:message key="lastModifier"/>: + </div> + <div> + <span wicket:id="lastModifier" /> + </div> </div> - </wicket:panel> - </body> + + <wicket:child /> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html index 18a4448..3b15ad7 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html @@ -18,15 +18,17 @@ under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <wicket:panel> - <div class="form-group" wicket:id="propView"> - <span wicket:id="value">[ATTIRIBUTE]</span> + <h4 class="left page-header" wicket:id="leftTitle">[TITLE]</h4> + <h4 class="right page-header" wicket:id="rightTitle">[TITLE]</h4> + <div class="form-group" wicket:id="propView" style="clear: both;"> + <span wicket:id="value">[ATTRIBUTE]</span> </div> <wicket:fragment wicket:id="doubleValue"> <div class="left attribute"> - <span wicket:id="oldAttribute">[ATTIRIBUTE]</span> + <span wicket:id="leftAttribute">[ATTRIBUTE]</span> </div> <div class="right attribute"> - <span wicket:id="newAttribute">[ATTIRIBUTE]</span> + <span wicket:id="rightAttribute">[ATTRIBUTE]</span> </div> </wicket:fragment> </wicket:panel> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Details.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Details.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Details.html index f9b03c8..a6773aa 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Details.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Details.html @@ -17,18 +17,15 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="details"> - <div class="form-group"> - <span wicket:id="destinationRealm">[DESTINATION REALM]</span> - </div> - <wicket:child/> + <wicket:panel> + <div class="details"> + <div class="form-group"> + <span wicket:id="destinationRealm">[DESTINATION REALM]</span> </div> - <div class="details-footer"> - <span wicket:id="generalStatusInformation">[GENERAL STATUS INFORMATION]</span> - </div> - </wicket:panel> - </body> + <wicket:child/> + </div> + <div class="details-footer"> + <span wicket:id="generalStatusInformation">[GENERAL STATUS INFORMATION]</span> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DynamicMemberships.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DynamicMemberships.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DynamicMemberships.html index 12540fa..9e6f5f9 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DynamicMemberships.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DynamicMemberships.html @@ -17,13 +17,10 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div wicket:id="uDynMembershipCond" /> - <span wicket:id="aDynMembershipCond"> - <div wicket:id="aDynMembershipCond"/> - </span> - </wicket:panel> - </body> + <wicket:panel> + <div wicket:id="uDynMembershipCond" /> + <span wicket:id="aDynMembershipCond"> + <div wicket:id="aDynMembershipCond"/> + </span> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Ownership.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Ownership.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Ownership.html index 1e1629b..11509f6 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Ownership.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Ownership.html @@ -17,38 +17,35 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div id="ownership"> - <span wicket:id="ownership">[OWNERSHIP]</span> - </div> + <wicket:panel> + <div id="ownership"> + <span wicket:id="ownership">[OWNERSHIP]</span> + </div> - <div wicket:id="ownerContainer"> - <span wicket:id="search">[SEARCH]</span> - </div> + <div wicket:id="ownerContainer"> + <span wicket:id="search">[SEARCH]</span> + </div> - <wicket:fragment wicket:id="userSearchFragment"> - <div class="form-group input-group"> - <span wicket:id="userOwner"/> - <a href="#" wicket:id="userOwnerReset" class="input-group-addon"><i class="glyphicon glyphicon-remove-circle" alt="reset user owner" title="Reset"></i></a> - </div> - <span wicket:id="usersearch">[USER SEARCH]</span> - <div class="searchResult"> - <span wicket:id="searchResult">[USER SEARCH RESULT]</span> - </div> - </wicket:fragment> + <wicket:fragment wicket:id="userSearchFragment"> + <div class="form-group input-group"> + <span wicket:id="userOwner"/> + <a href="#" wicket:id="userOwnerReset" class="input-group-addon"><i class="glyphicon glyphicon-remove-circle" alt="reset user owner" title="Reset"></i></a> + </div> + <span wicket:id="usersearch">[USER SEARCH]</span> + <div class="searchResult"> + <span wicket:id="searchResult">[USER SEARCH RESULT]</span> + </div> + </wicket:fragment> - <wicket:fragment wicket:id="groupSearchFragment"> - <div class="form-group input-group"> - <span wicket:id="groupOwner"/> - <a href="#" wicket:id="groupOwnerReset" class="input-group-addon"><i class="glyphicon glyphicon-remove-circle" alt="reset group owner" title="Reset"></i></a> - </div> - <span wicket:id="groupsearch">[GROUP SEARCH]</span> - <div class="searchResult"> - <span wicket:id="searchResult">[GROUP SEARCH RESULT]</span> - </div> - </wicket:fragment> - </wicket:panel> - </body> + <wicket:fragment wicket:id="groupSearchFragment"> + <div class="form-group input-group"> + <span wicket:id="groupOwner"/> + <a href="#" wicket:id="groupOwnerReset" class="input-group-addon"><i class="glyphicon glyphicon-remove-circle" alt="reset group owner" title="Reset"></i></a> + </div> + <span wicket:id="groupsearch">[GROUP SEARCH]</span> + <div class="searchResult"> + <span wicket:id="searchResult">[GROUP SEARCH RESULT]</span> + </div> + </wicket:fragment> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships$Specification.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships$Specification.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships$Specification.html index 83ab31d..c58eb6f 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships$Specification.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships$Specification.html @@ -17,28 +17,25 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="form-group"> - <span wicket:id="type" /> - </div> + <wicket:panel> + <div class="form-group"> + <span wicket:id="type" /> + </div> - <div class="form-group"> - <span wicket:id="otherType"/> - </div> + <div class="form-group"> + <span wicket:id="otherType"/> + </div> - <div wicket:id="searchPanelContainer"> - <span wicket:id="searchPanel"/> - </div> + <div wicket:id="searchPanelContainer"> + <span wicket:id="searchPanel"/> + </div> - <wicket:fragment wicket:id="emptyFragment"/> - <wicket:fragment wicket:id="searchFragment"> - <span wicket:id="searchPanel"/> - <div class="searchResult"> - <span wicket:id="searchResultPanel"/> - </div> - </wicket:fragment> - </wicket:panel> - </body> + <wicket:fragment wicket:id="emptyFragment"/> + <wicket:fragment wicket:id="searchFragment"> + <span wicket:id="searchPanel"/> + <div class="searchResult"> + <span wicket:id="searchResultPanel"/> + </div> + </wicket:fragment> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships.html index bfa6f45..992c3af 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Relationships.html @@ -17,25 +17,22 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="wizard-step-title"> - <div><span wicket:id="title">[RELATIONSHIPS]</span></div><span wicket:id="changed"></span> - </div> + <wicket:panel> + <div class="wizard-step-title"> + <div><span wicket:id="title">[RELATIONSHIPS]</span></div><span wicket:id="changed"></span> + </div> - <div id="emptyPlaceholder"/> - <span wicket:id="relationships"/> + <div id="emptyPlaceholder"/> + <span wicket:id="relationships"/> - <wicket:fragment wicket:id="viewFragment"> - <div wicket:id="relationships"/> - <div id="inline-actions" class="modal-footer"> - <span wicket:id="actions" class="circular-actions">[ACTIONS]</span> - </div> - </wicket:fragment> - <wicket:fragment wicket:id="addFragment"> - <span wicket:id="specification" /> - </wicket:fragment> - </wicket:panel> - </body> + <wicket:fragment wicket:id="viewFragment"> + <div wicket:id="relationships"/> + <div id="inline-actions" class="modal-footer"> + <span wicket:id="actions" class="circular-actions">[ACTIONS]</span> + </div> + </wicket:fragment> + <wicket:fragment wicket:id="addFragment"> + <span wicket:id="specification" /> + </wicket:fragment> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Resources.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Resources.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Resources.html index 54219d1..10f17f7 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Resources.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Resources.html @@ -17,22 +17,19 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="col-xs-12"> - <div class="box"> - <div class="box-header"> - <h3 class="box-title"> - <wicket:message key="resources.palette">[ROLES]</wicket:message> - </h3> - <span wicket:id="changed"></span> - </div> - <div class="box-body"> - <span wicket:id="resources">[RESOURCES]</span> - </div> + <wicket:panel> + <div class="col-xs-12"> + <div class="box"> + <div class="box-header"> + <h3 class="box-title"> + <wicket:message key="resources.palette">[ROLES]</wicket:message> + </h3> + <span wicket:id="changed"></span> + </div> + <div class="box-body"> + <span wicket:id="resources">[RESOURCES]</span> </div> </div> - </wicket:panel> - </body> + </div> + </wicket:panel> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ResultPage.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ResultPage.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ResultPage.html index cf43602..bca1667 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ResultPage.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ResultPage.html @@ -17,13 +17,10 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <span wicket:id="customResultBody"/> - <div id="inline-actions" class="modal-footer circular-actions"> - <span wicket:id="action"/> - </div> - </wicket:panel> - </body> + <wicket:panel> + <span wicket:id="customResultBody"/> + <div id="inline-actions" class="modal-footer circular-actions"> + <span wicket:id="action"/> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html index f7eded7..5243059 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html @@ -17,35 +17,32 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="col-xs-12"> - <div class="box"> - <div class="box-header"> - <h3 class="box-title"> - <wicket:message key="roles.palette">[ROLES]</wicket:message> - </h3> - <span wicket:id="changed"></span> - </div> - <div class="box-body"> - <span wicket:id="roles">[ROLES]</span> - </div> + <wicket:panel> + <div class="col-xs-12"> + <div class="box"> + <div class="box-header"> + <h3 class="box-title"> + <wicket:message key="roles.palette">[ROLES]</wicket:message> + </h3> + <span wicket:id="changed"></span> + </div> + <div class="box-body"> + <span wicket:id="roles">[ROLES]</span> </div> </div> + </div> - <div class="col-xs-12"> - <div class="box"> - <div class="box-header"> - <h3 class="box-title"> - <wicket:message key="dynroles.palette">[ROLES]</wicket:message> - </h3> - </div> - <div class="box-body"> - <span wicket:id="dynroles">[ROLES]</span> - </div> + <div class="col-xs-12"> + <div class="box"> + <div class="box-header"> + <h3 class="box-title"> + <wicket:message key="dynroles.palette">[ROLES]</wicket:message> + </h3> + </div> + <div class="box-body"> + <span wicket:id="dynroles">[ROLES]</span> </div> </div> - </wicket:panel> - </body> + </div> + </wicket:panel> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.html index a411f3f..de9b10d 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.html @@ -17,7 +17,6 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> <wicket:panel> <span wicket:id="resources">[RESOURCES]</span> </wicket:panel> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserInformationPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserInformationPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserInformationPanel.html index 0b10b23..aa47866 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserInformationPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserInformationPanel.html @@ -17,53 +17,50 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:extend> - <div class="infoleft"> - <div class="infolabel"> - <wicket:message key="lastLoginDate"/>: - </div> - <div> - <span wicket:id="lastLoginDate"/> - </div> + <wicket:extend> + <div class="infoleft"> + <div class="infolabel"> + <wicket:message key="lastLoginDate"/>: </div> + <div> + <span wicket:id="lastLoginDate"/> + </div> + </div> - <div class="inforight"> - <div class="infolabel"> - <wicket:message key="failedLogins"/>: - </div> - <div> - <span wicket:id="failedLogins"/> - </div> + <div class="inforight"> + <div class="infolabel"> + <wicket:message key="failedLogins"/>: + </div> + <div> + <span wicket:id="failedLogins"/> </div> + </div> - <div class="infoleft"> - <div class="infolabel"> - <wicket:message key="changePwdDate"/>: - </div> - <div> - <span wicket:id="changePwdDate"/> - </div> + <div class="infoleft"> + <div class="infolabel"> + <wicket:message key="changePwdDate"/>: + </div> + <div> + <span wicket:id="changePwdDate"/> </div> + </div> - <div class="inforight"> - <div class="infolabel"> - <wicket:message key="tokenExpireTime"/> - </div> - <div> - <span wicket:id="tokenExpireTime"/> - </div> + <div class="inforight"> + <div class="infolabel"> + <wicket:message key="tokenExpireTime"/> </div> + <div> + <span wicket:id="tokenExpireTime"/> + </div> + </div> - <div class="inforow"> - <div class="infolabel"> - <wicket:message key="token"/>: - </div> - <div class="wrap"> - <span wicket:id="token"/> - </div> + <div class="inforow"> + <div class="infolabel"> + <wicket:message key="token"/>: + </div> + <div class="wrap"> + <span wicket:id="token"/> </div> - </wicket:extend> - </body> + </div> + </wicket:extend> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html index 80ebc0c..0908605 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html @@ -17,13 +17,10 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="form-group"> - <span wicket:id="key">[NAME]</span> - </div> - <div wicket:id="dynMembershipCond" /> - </wicket:panel> - </body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="key">[NAME]</span> + </div> + <div wicket:id="dynMembershipCond" /> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html index c55493c..d043a5a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html @@ -17,12 +17,9 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="form-group"> - <span wicket:id="dynRealms">[DYNAMIC REALMS]</span> - </div> - </wicket:panel> - </body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="dynRealms">[DYNAMIC REALMS]</span> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html index f14d054..ffbd5aa 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html @@ -17,12 +17,9 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="form-group"> - <span wicket:id="entitlements">[ENTITLEMENTS]</span> - </div> - </wicket:panel> - </body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="entitlements">[ENTITLEMENTS]</span> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html index 7c3d20e..b4031e2 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html @@ -17,12 +17,9 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <head><title></title></head> - <body> - <wicket:panel> - <div class="form-group"> - <span wicket:id="realms">[REALMS]</span> - </div> - </wicket:panel> - </body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="realms">[REALMS]</span> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReconStatus.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReconStatus.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReconStatus.java new file mode 100644 index 0000000..e5baf8f --- /dev/null +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReconStatus.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.common.lib.to; + +import io.swagger.annotations.ApiModelProperty; +import org.apache.syncope.common.lib.AbstractBaseBean; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/** + * Reconciliation status. + */ +@XmlRootElement(name = "reconciliationStatus") +@XmlType +public class ReconStatus extends AbstractBaseBean { + + private static final long serialVersionUID = -8516345256596521490L; + + private String resource; + + private ConnObjectTO onSyncope; + + private ConnObjectTO onResource; + + @ApiModelProperty(readOnly = true) + public String getResource() { + return resource; + } + + public void setResource(final String resource) { + this.resource = resource; + } + + @ApiModelProperty(readOnly = true) + public ConnObjectTO getOnSyncope() { + return onSyncope; + } + + public void setOnSyncope(final ConnObjectTO onSyncope) { + this.onSyncope = onSyncope; + } + + @ApiModelProperty(readOnly = true) + public ConnObjectTO getOnResource() { + return onResource; + } + + public void setOnResource(final ConnObjectTO onResource) { + this.onResource = onResource; + } +} http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReconciliationStatus.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReconciliationStatus.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReconciliationStatus.java deleted file mode 100644 index bd4f8b7..0000000 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReconciliationStatus.java +++ /dev/null @@ -1,56 +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. - */ -package org.apache.syncope.common.lib.to; - -import io.swagger.annotations.ApiModelProperty; -import org.apache.syncope.common.lib.AbstractBaseBean; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * Reconciliation status. - */ -@XmlRootElement(name = "reconciliationStatus") -@XmlType -public class ReconciliationStatus extends AbstractBaseBean { - - private static final long serialVersionUID = -8516345256596521490L; - - private ConnObjectTO onSyncope; - - private ConnObjectTO onResource; - - @ApiModelProperty(readOnly = true) - public ConnObjectTO getOnSyncope() { - return onSyncope; - } - - public void setOnSyncope(final ConnObjectTO onSyncope) { - this.onSyncope = onSyncope; - } - - @ApiModelProperty(readOnly = true) - public ConnObjectTO getOnResource() { - return onResource; - } - - public void setOnResource(final ConnObjectTO onResource) { - this.onResource = onResource; - } -} http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java index 12fbf59..5f01d23 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java @@ -41,4 +41,12 @@ public enum AnyTypeKind { return toClass; } + public static AnyTypeKind fromTOClass(final Class<? extends AnyTO> clazz) { + return UserTO.class.isAssignableFrom(clazz) + ? AnyTypeKind.USER + : GroupTO.class.isAssignableFrom(clazz) + ? AnyTypeKind.GROUP + : AnyTypeKind.ANY_OBJECT; + } + } http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReconciliationService.java ---------------------------------------------------------------------- diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReconciliationService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReconciliationService.java index bfec63c..f3e5650 100644 --- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReconciliationService.java +++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReconciliationService.java @@ -33,7 +33,7 @@ import javax.ws.rs.core.MediaType; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; -import org.apache.syncope.common.lib.to.ReconciliationStatus; +import org.apache.syncope.common.lib.to.ReconStatus; import org.apache.syncope.common.lib.types.AnyTypeKind; /** @@ -57,7 +57,7 @@ public interface ReconciliationService extends JAXRSService { */ @GET @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML }) - ReconciliationStatus status( + ReconStatus status( @NotNull @QueryParam("anyTypeKind") AnyTypeKind anyTypeKind, @NotNull @QueryParam("anyKey") String anyKey, @NotNull @QueryParam("resourceKey") String resourceKey); http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java index 58fd708..cdfe9ef 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java @@ -31,7 +31,7 @@ import org.apache.syncope.common.lib.to.AttrTO; import org.apache.syncope.common.lib.to.ConnObjectTO; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; -import org.apache.syncope.common.lib.to.ReconciliationStatus; +import org.apache.syncope.common.lib.to.ReconStatus; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.StandardEntitlement; @@ -139,6 +139,9 @@ public class ReconciliationLogic extends AbstractTransactionalLogic<AbstractBase + " on resource '" + provision.getResource().getKey() + "'"); } String connObjectKeyValue = mappingManager.getConnObjectKeyValue(any, provision); + if (connObjectKeyValue == null) { + return null; + } // 2. determine attributes to query Set<MappingItem> linkinMappingItems = new HashSet<>(); @@ -173,10 +176,11 @@ public class ReconciliationLogic extends AbstractTransactionalLogic<AbstractBase } @PreAuthorize("hasRole('" + StandardEntitlement.RESOURCE_GET_CONNOBJECT + "')") - public ReconciliationStatus status(final AnyTypeKind anyTypeKind, final String anyKey, final String resourceKey) { + public ReconStatus status(final AnyTypeKind anyTypeKind, final String anyKey, final String resourceKey) { Pair<Any<?>, Provision> init = init(anyTypeKind, anyKey, resourceKey); - ReconciliationStatus status = new ReconciliationStatus(); + ReconStatus status = new ReconStatus(); + status.setResource(resourceKey); status.setOnSyncope(getOnSyncope(init.getLeft(), init.getRight(), resourceKey)); status.setOnResource(getOnResource(init.getLeft(), init.getRight())); http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARoleDAO.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARoleDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARoleDAO.java index 367ee8d..37096c7 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARoleDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARoleDAO.java @@ -91,12 +91,11 @@ public class JPARoleDAO extends AbstractDAO<Role> implements RoleDAO { Role merged = entityManager().merge(role); // refresh dynamic memberships + clearDynMembers(merged); if (merged.getDynMembership() != null) { List<User> matching = searchDAO().search( SearchCondConverter.convert(merged.getDynMembership().getFIQLCond()), AnyTypeKind.USER); - clearDynMembers(merged); - for (User user : matching) { Query insert = entityManager().createNativeQuery("INSERT INTO " + DYNMEMB_TABLE + " VALUES(?, ?)"); insert.setParameter(1, user.getKey());
