You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2013/03/15 17:46:02 UTC
svn commit: r1457010 - in /syncope/branches/1_0_X/console/src/main:
java/org/apache/syncope/console/pages/panels/
resources/org/apache/syncope/console/pages/
resources/org/apache/syncope/console/pages/panels/
Author: fmartelli
Date: Fri Mar 15 16:46:02 2013
New Revision: 1457010
URL: http://svn.apache.org/r1457010
Log:
SYNCOPE-326 more fixes for the branch 1_0_X
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/RoleAttributesPanel.java
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Login.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/RoleAttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/RoleAttributesPanel.java?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/RoleAttributesPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/RoleAttributesPanel.java Fri Mar 15 16:46:02 2013
@@ -37,7 +37,7 @@ public class RoleAttributesPanel extends
@SpringBean
private EntitlementRestClient entitlementRestClient;
- final AjaxPalettePanel entitlementsPalette;
+ private final AjaxPalettePanel entitlementsPalette;
public RoleAttributesPanel(final String id, final Form form, final RoleTO roleTO) {
super(id);
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html Fri Mar 15 16:46:02 2013
@@ -18,6 +18,8 @@ under the License.
-->
<html>
<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+
<link rel="shortcut icon" href="img/favicon.ico"/>
<link rel="stylesheet" type="text/css" href="css/jquery.ui.button.css" />
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html Fri Mar 15 16:46:02 2013
@@ -17,8 +17,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
+<html>
<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Style-Type" content="text/css"/>
<meta http-equiv="Content-Script-Type" content="text/javascript"/>
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Login.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Login.html?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Login.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Login.html Fri Mar 15 16:46:02 2013
@@ -16,9 +16,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
+<html>
<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Style-Type" content="text/css"/>
@@ -39,12 +39,12 @@ under the License.
<label for="userId">
<wicket:message key="userId"/>
</label>
- <input type="text" wicket:id="userId" id="userId" size="25" />
+ <input type="text" wicket:id="userId" id="userId" size="25" style="width: 180px" />
<br />
<label for="password" class="password">
<wicket:message key="password"/>
</label>
- <input type="password" wicket:id="password" id="password" size="25" />
+ <input type="password" wicket:id="password" id="password" size="25" style="width: 180px" />
<br />
<select wicket:id="language" id="language"/>
<br />
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html Fri Mar 15 16:46:02 2013
@@ -52,6 +52,18 @@ under the License.
<li><a href="#tabs-6"><span><wicket:message key="tab6"/></span></a></li>
</ul>
<div wicket:id="attributesPanel"></div>
+
+ <script type="text/javascript">
+ /*<![CDATA[*/
+
+ $(function() {
+ $('#formtable div.tablerow:even').addClass("alt");
+ $("#tabs").tabs();
+ });
+
+ /*]]>*/
+ </script>
+
</div>
<div style="bottom:0;margin:10px">
<input type="submit"
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html Fri Mar 15 16:46:02 2013
@@ -14,40 +14,41 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Style-Type" content="text/css"/>
+<html>
+ <head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Style-Type" content="text/css"/>
- <title>Apache Syncope - <wicket:message key="welcome"/></title>
+ <title>Apache Syncope - <wicket:message key="welcome"/></title>
- <link rel="stylesheet" href="css/style.css" type="text/css" media="all"/>
- <style type="text/css">
- em {
- font-size: 14px;
- color: gray;
- }
- em img {
- opacity:0.4;
- filter:alpha(opacity=40);
- }
- </style>
- </head>
- <body style="text-align:center">
- <div id="splash">
- <img src="img/logo.png" alt="syncope" title="syncope" id="logo" />
- <h2 style="font-size:8px;color:#aaaaaa;"><span wicket:id="consoleVersion"/>; <span wicket:id="coreVersion"/></h2>
- <ul>
- <li><a href="#" wicket:id="todo" class="todo"><img wicket:id="todoIcon" alt="TODO" width="80" height="80" /><br /><wicket:message key="todo"/></a></li>
- <li><a href="#" wicket:id="schema" class="schema"><img wicket:id="schemaIcon" alt="Schema" width="80" height="80" /><br /><wicket:message key="schema"/></a></li>
- <li><a href="#" wicket:id="users" class="users"><img wicket:id="usersIcon" alt="Users" width="80" height="80" /><br /><wicket:message key="users"/></a></li>
- <li><a href="#" wicket:id="roles" class="roles"><img wicket:id="rolesIcon" alt="Roles" width="80" height="80" /><br /><wicket:message key="roles"/></a></li>
- <li><a href="#" wicket:id="resources" class="resources"><img wicket:id="resourcesIcon" alt="Resources" width="80" height="80" /><br /><wicket:message key="resources"/></a></li>
- <li><a href="#" wicket:id="tasks" class="tasks"><img wicket:id="tasksIcon" alt="Tasks" width="80" height="80" /><br /><wicket:message key="tasks"/></a></li>
- <li><a href="#" wicket:id="reports" class="reports"><img wicket:id="reportsIcon" alt="Reports" width="80" height="80" /><br /><wicket:message key="reports"/></a></li>
- <li><a href="#" wicket:id="configuration" class="configuration"><img wicket:id="configurationIcon" alt="Configuration" width="80" height="80" /><br /><wicket:message key="configuration"/></a></li>
- <li><a href="#" wicket:id="logout" class="logout"><img src="img/menu/logout.png" alt="Logout" width="80" height="80" /><br /><wicket:message key="logout"/></a></li>
- </ul>
- </div>
- </body>
+ <link rel="stylesheet" href="css/style.css" type="text/css" media="all"/>
+ <style type="text/css">
+ em {
+ font-size: 14px;
+ color: gray;
+ }
+ em img {
+ opacity:0.4;
+ filter:alpha(opacity=40);
+ }
+ </style>
+ </head>
+ <body style="text-align:center">
+ <div id="splash">
+ <img src="img/logo.png" alt="syncope" title="syncope" id="logo" />
+ <h2 style="font-size:8px;color:#aaaaaa;"><span wicket:id="consoleVersion"/>; <span wicket:id="coreVersion"/></h2>
+ <ul>
+ <li><a href="#" wicket:id="todo" class="todo"><img wicket:id="todoIcon" alt="TODO" width="80" height="80" /><br /><wicket:message key="todo"/></a></li>
+ <li><a href="#" wicket:id="schema" class="schema"><img wicket:id="schemaIcon" alt="Schema" width="80" height="80" /><br /><wicket:message key="schema"/></a></li>
+ <li><a href="#" wicket:id="users" class="users"><img wicket:id="usersIcon" alt="Users" width="80" height="80" /><br /><wicket:message key="users"/></a></li>
+ <li><a href="#" wicket:id="roles" class="roles"><img wicket:id="rolesIcon" alt="Roles" width="80" height="80" /><br /><wicket:message key="roles"/></a></li>
+ <li><a href="#" wicket:id="resources" class="resources"><img wicket:id="resourcesIcon" alt="Resources" width="80" height="80" /><br /><wicket:message key="resources"/></a></li>
+ <li><a href="#" wicket:id="tasks" class="tasks"><img wicket:id="tasksIcon" alt="Tasks" width="80" height="80" /><br /><wicket:message key="tasks"/></a></li>
+ <li><a href="#" wicket:id="reports" class="reports"><img wicket:id="reportsIcon" alt="Reports" width="80" height="80" /><br /><wicket:message key="reports"/></a></li>
+ <li><a href="#" wicket:id="configuration" class="configuration"><img wicket:id="configurationIcon" alt="Configuration" width="80" height="80" /><br /><wicket:message key="configuration"/></a></li>
+ <li><a href="#" wicket:id="logout" class="logout"><img src="img/menu/logout.png" alt="Logout" width="80" height="80" /><br /><wicket:message key="logout"/></a></li>
+ </ul>
+ </div>
+ </body>
</html>
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html Fri Mar 15 16:46:02 2013
@@ -50,7 +50,7 @@ under the License.
<td align="center" valign="middle">
<input type="text"
- style="width:100%" wicket:id="value"/>
+ style="width:98%; padding-left: 0px; padding-right: 0px" wicket:id="value"/>
</td>
</tr>
</tbody>
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html Fri Mar 15 16:46:02 2013
@@ -18,7 +18,7 @@ under the License.
-->
<wicket:panel>
- <span wicket:id="rolePanel"/>
+ <span wicket:id="rolePanel">[Role panel]</span>
<wicket:fragment wicket:id="roleViewPanel">
<span wicket:id="nodeViewPanel"></span>
@@ -34,5 +34,4 @@ under the License.
<wicket:fragment wicket:id="fakerootFrag">
</wicket:fragment>
-
</wicket:panel>
\ No newline at end of file
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html?rev=1457010&r1=1457009&r2=1457010&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html Fri Mar 15 16:46:02 2013
@@ -44,12 +44,6 @@ under the License.
<div id="users-contain" class="ui-widget" style="width:auto">
<span wicket:id="userList"> [userList] </span>
</div>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- $("#tabs").tabs();
- });
- </script>
</div>
</div>
</div>