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 2014/01/03 17:45:47 UTC
svn commit: r1555146 - in /syncope/trunk: ./
console/src/main/resources/org/apache/syncope/console/pages/
console/src/main/resources/org/apache/syncope/console/pages/panels/
console/src/test/java/org/apache/syncope/console/
Author: ilgrosso
Date: Fri Jan 3 16:45:46 2014
New Revision: 1555146
URL: http://svn.apache.org/r1555146
Log:
[SYNCOPE-469] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1554830-1555134
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html Fri Jan 3 16:45:46 2014
@@ -29,7 +29,6 @@ under the License.
<script type="text/javascript">
$(function() {
$("#tabs").tabs();
- $("#attrTemplateTabs").tabs();
});
</script>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html Fri Jan 3 16:45:46 2014
@@ -41,11 +41,6 @@ under the License.
<script type="text/javascript">
$(document).ready(function() {
$("#tabs").tabs();
- $("#roletabs").tabs();
- $("#attrTemplateTabs").tabs();
- $("#user").tabs();
- $("#role").tabs();
- $("#membership").tabs();
});
/** Add rollover effect to tables supporting Ajax events */
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html Fri Jan 3 16:45:46 2014
@@ -17,6 +17,15 @@ specific language governing permissions
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();
+ });
+ </script>
+ </wicket:head>
+
<wicket:extend>
<div id="tabs">
@@ -24,16 +33,13 @@ under the License.
<li class="tabs-selected">
<a href="#parameters"><span><wicket:message key="parameters"/></span></a>
</li>
- <li><a href="#passwordPolicies"><span><wicket:message key="passwordPolicies"/></span></a></li>
- <li><a href="#accountPolicies"><span><wicket:message key="accountPolicies"/></span></a></li>
- <li><a href="#syncPolicies"><span><wicket:message key="syncPolicies"/></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="#workflow"><span><wicket:message key="workflow"/></span></a></li>
- <li><a href="#coreLog"><span><wicket:message key="coreLog"/></span></a></li>
- <li><a href="#consoleLog"><span><wicket:message key="consoleLog"/></span></a></li>
+ <li><a href="#logs"><span><wicket:message key="logs"/></span></a></li>
</ul>
- <div id="parameters">
+ <div id="parameters">
<div id="users-contain" class="ui-widget" style="width:inherit">
<span wicket:id="confContainer">
<table class="ui-widget ui-widget-content table-hover"
@@ -57,14 +63,23 @@ under the License.
<wicket:message key="create_configuration"/>
</a>
</div>
- <div id="passwordPolicies">
- <span wicket:id="passwordPoliciesPanel">[password policies]</span>
- </div>
- <div id="accountPolicies">
- <span wicket:id="accountPoliciesPanel">[account policies]</span>
- </div>
- <div id="syncPolicies">
- <span wicket:id="syncPoliciesPanel">[sync policies]</span>
+ <div id="policies">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#password"><span><wicket:message key="password"/></span></a>
+ </li>
+ <li><a href="#account"><span><wicket:message key="account"/></span></a></li>
+ <li><a href="#sync"><span><wicket:message key="sync"/></span></a></li>
+ </ul>
+ <div id="password" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="passwordPoliciesPanel">[password policies]</span>
+ </div>
+ <div id="account" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="accountPoliciesPanel">[account 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">
@@ -122,44 +137,52 @@ under the License.
</span>
</div>
</div>
- <div id="coreLog">
- <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 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>
- <div id="consoleLog">
- <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 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>
</div>
<div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties Fri Jan 3 16:45:46 2014
@@ -17,9 +17,9 @@
key=Key
value=Value
parameters=Parameters
-passwordPolicies=Password Policies
-accountPolicies=Account Policies
-syncPolicies=Synchronization Policies
+password=Password
+account=Account
+sync=Synchronization
notifications=Notifications
workflow=Workflow
coreLog=Core Log
@@ -36,3 +36,5 @@ traceLevel=Trace level
create_notification=Create new notification
subject=Subject
noActivitiEnabledForUsers=Activiti not enabled for users
+policies=Policies
+logs=Logs
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties Fri Jan 3 16:45:46 2014
@@ -17,9 +17,9 @@
key=Chiave
value=Valore
parameters=Parametri
-passwordPolicies=Policy di password
-accountPolicies=Policy di account
-syncPolicies=Policy di sincronizzazione
+password=Password
+account=Account
+sync=Sincronizzazione
notifications=Notifiche
workflow=Workflow
coreLog=Log Core
@@ -36,3 +36,5 @@ traceLevel=Tracciamento
create_notification=Crea nuova notifica
subject=Oggetto
noActivitiEnabledForUsers=Activiti non configurato per gli utenti
+policies=Politiche
+logs=Logs
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties Fri Jan 3 16:45:46 2014
@@ -17,9 +17,9 @@
key=Chave
value=Valor
parameters=Par\u00e2metros
-passwordPolicies=Pol\u00edticas de Senha
-accountPolicies=Pol\u00edticas de Conta
-syncPolicies=Pol\u00edticas de Sincroniza\u00e7\u00e3o
+password=Senha
+account=Conta
+sync=Sincroniza\u00e7\u00e3o
notifications=Notifica\u00e7\u00f5es
workflow=Fluxo de Trabalho
coreLog=Log Central
@@ -36,3 +36,5 @@ traceLevel=N\u00edvel de Trace
create_notification=Criar nova notifica\u00e7\u00e3o
subject=Assunto
noActivitiEnabledForUsers=Activiti n\u00e3o habilitado para usu\u00e1rios
+policies=Pol\u00edticas
+logs=Logs
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html Fri Jan 3 16:45:46 2014
@@ -16,56 +16,63 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:head>
- <style>
- div.role-tree div.wicket-tree-table a {
- color:black;
- }
- </style>
-</wicket:head>
-<wicket:extend>
- <div id="roletabs">
- <ul>
- <li class="tabs-selected">
- <a href="#tabs-tree">
- <span><wicket:message key="tabs-tree"/>
- </span>
- </a>
- </li>
- <li>
- <a href="#tabs-search">
- <span><wicket:message key="tabs-search"/>
- </span>
- </a>
- </li>
- </ul>
-
- <div id="tabs-tree">
- <span wicket:id="treePanel"></span>
- <span wicket:id="summaryPanel"></span>
- <div wicket:id="editRoleWin">[Show modal window for create/editing role]</div>
- </div>
-
- <div id="tabs-search">
- <div>
- <form wicket:id="searchForm">
- <span wicket:id="searchPanel">searchPanel</span>
-
- <br/>
- <a wicket:id="search"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
- <img src="img/search.png" alt="search"/>
- <wicket:message key="search"/>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:head>
+ <style>
+ div.role-tree div.wicket-tree-table a {
+ color:black;
+ }
+ </style>
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $("#roletabs").tabs();
+ });
+ </script>
+ </wicket:head>
+ <wicket:extend>
+ <div id="roletabs">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#tabs-tree">
+ <span><wicket:message key="tabs-tree"/>
+ </span>
+ </a>
+ </li>
+ <li>
+ <a href="#tabs-search">
+ <span><wicket:message key="tabs-search"/>
+ </span>
</a>
- </form>
+ </li>
+ </ul>
+
+ <div id="tabs-tree">
+ <span wicket:id="treePanel"></span>
+ <span wicket:id="summaryPanel"></span>
+ <div wicket:id="editRoleWin">[Show modal window for create/editing role]</div>
</div>
- <div id="users-contain" class="ui-widget" style="width:auto">
- <span wicket:id="searchResult">[search result]</span>
+ <div id="tabs-search">
+ <div>
+ <form wicket:id="searchForm">
+ <span wicket:id="searchPanel">searchPanel</span>
+
+ <br/>
+ <a wicket:id="search"
+ class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <img src="img/search.png" alt="search"/>
+ <wicket:message key="search"/>
+ </a>
+ </form>
+ </div>
+
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <span wicket:id="searchResult">[search result]</span>
+ </div>
</div>
- </div>
- </div>
+ </div>
- <wicket:child/>
-</wicket:extend>
+ <wicket:child/>
+ </wicket:extend>
+</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel.html?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel.html Fri Jan 3 16:45:46 2014
@@ -16,7 +16,14 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:head>
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $("#attrTemplateTabs").tabs();
+ });
+ </script>
+ </wicket:head>
<wicket:panel>
<div id="attrTemplateTabs">
<ul>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html Fri Jan 3 16:45:46 2014
@@ -26,7 +26,7 @@ under the License.
</style>
</wicket:head>
<wicket:panel xmlns:wicket="http://wicket.apache.org">
- <div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
+ <div>
<span wicket:id="tabs-container">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li wicket:id="tabs" class="ui-state-default ui-corner-top">
@@ -34,7 +34,8 @@ under the License.
</li>
</ul>
</span>
- <div wicket:id="panel" class="ui-tabs-panel ui-widget-content ui-corner-bottom">[panel]</div>
+ <div wicket:id="panel" class="ui-tabs-panel ui-widget-content ui-corner-bottom"
+ style="border-width: 1px;border-top-width: 0px;">[panel]</div>
</div>
</wicket:panel>
</html>
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1555146&r1=1555145&r2=1555146&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java Fri Jan 3 16:45:46 2014
@@ -60,25 +60,8 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//div[3]/ul/li[2]/a");
- selenium.click("//div[3]/div[2]/span/div/a");
-
- selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='id:textField']\");", "30000");
-
- selenium.type("name=description:textField", "new description");
- selenium.click("//div[2]/form/div[3]/input[@type='submit']");
-
- selenium.waitForCondition("selenium.isTextPresent(\"new description\");", "30000");
- }
-
- @Test
- public void browseAccountPolicy() {
- selenium.click("css=img[alt=\"Configuration\"]");
-
- selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
-
- selenium.click("//div[3]/ul/li[3]/a");
- selenium.click("//div[3]/div[3]/span/div/a");
+ selenium.click("//div[@id='tabs']/ul/li[2]/a");
+ selenium.click("//div[@id='password']/span/div/a");
selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='id:textField']\");", "30000");
@@ -94,7 +77,7 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//div[@id='tabs']/ul/li[6]/a/span");
+ selenium.click("//div[@id='tabs']/ul/li[4]/a/span");
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='workflow']/div/span/img\");", "30000");
}
@@ -118,9 +101,9 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//div[@id='tabs']/ul/li[7]/a/span");
+ selenium.click("//div[@id='logs']/ul/li/a/span");
- selenium.select("//div[3]/div[7]/div/span/table/tbody/tr/td[2]/select", "label=ERROR");
+ selenium.select("//div[@id='core']/div/span/table/tbody/tr/td[2]/select", "label=ERROR");
selenium.waitForCondition("selenium.isTextPresent(\"Operation executed successfully\");", "30000");
}