syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmarte...@apache.org
Subject svn commit: r1457394 - in /syncope/trunk/console/src/main: java/org/apache/syncope/console/pages/ java/org/apache/syncope/console/pages/panels/ java/org/apache/syncope/console/wicket/markup/html/form/ resources/org/apache/syncope/console/pages/ resourc...
Date Sun, 17 Mar 2013 08:01:42 GMT
Author: fmartelli
Date: Sun Mar 17 08:01:41 2013
New Revision: 1457394

URL: http://svn.apache.org/r1457394
Log:
SYNCOPE-326 some fixes merged from branch 1_0_X

Modified:
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
    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/Login.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html
    syncope/trunk/console/src/main/webapp/css/style.css

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1457394&r1=1457393&r2=1457394&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
Sun Mar 17 08:01:41 2013
@@ -148,8 +148,7 @@ public class RoleModalPage extends BaseM
 
     protected void submitAction(final AjaxRequestTarget target, final Form form) {
         final RoleTO roleTO = (RoleTO) form.getDefaultModelObject();
-        final List<String> entitlementList = new ArrayList<String>(
-                rolePanel.getEntitlementsPalette().getModelCollection());
+        final List<String> entitlementList = new ArrayList<String>(rolePanel.getSelectedEntitlements());
         roleTO.setEntitlements(entitlementList);
 
         final RoleTO result;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java?rev=1457394&r1=1457393&r2=1457394&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
Sun Mar 17 08:01:41 2013
@@ -21,19 +21,19 @@ package org.apache.syncope.console.pages
 import static org.apache.wicket.Component.RENDER;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.syncope.common.to.RoleTO;
-import org.apache.syncope.console.commons.SelectChoiceRenderer;
 import org.apache.syncope.console.commons.StatusBean;
 import org.apache.syncope.console.commons.XMLRolesReader;
 import org.apache.syncope.console.pages.RoleModalPage;
 import org.apache.syncope.console.rest.AuthRestClient;
 import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.markup.html.form.palette.Palette;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -51,7 +51,7 @@ public class RolePanel extends Panel {
     @SpringBean
     private XMLRolesReader xmlRolesReader;
 
-    private final Palette<String> entitlementsPalette;
+    private final AjaxPalettePanel entitlementsPalette;
 
     public RolePanel(final String id, final Form form, final RoleTO roleTO, final RoleModalPage.Mode
mode) {
         this(id, form, roleTO, mode, null);
@@ -130,13 +130,12 @@ public class RolePanel extends Panel {
         }
         ListModel<String> availableEntitlements = new ListModel<String>(allEntitlements);
 
-        entitlementsPalette = new Palette<String>("entitlementsPalette", selectedEntitlements,
availableEntitlements,
-                new SelectChoiceRenderer(), 20, false);
+        entitlementsPalette = new AjaxPalettePanel("entitlementsPalette", selectedEntitlements,
availableEntitlements);
 
         this.add(entitlementsPalette);
     }
 
-    public Palette<String> getEntitlementsPalette() {
-        return this.entitlementsPalette;
+    public Collection<String> getSelectedEntitlements() {
+        return this.entitlementsPalette.getModelCollection();
     }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java?rev=1457394&r1=1457393&r2=1457394&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
Sun Mar 17 08:01:41 2013
@@ -19,6 +19,7 @@
 package org.apache.syncope.console.wicket.markup.html.form;
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
 import org.apache.syncope.console.commons.SelectChoiceRenderer;
 import org.apache.wicket.extensions.markup.html.form.palette.Palette;
@@ -63,4 +64,8 @@ public class AjaxPalettePanel<T> extends
         palette.setDefaultModelObject(object);
         return this;
     }
+
+    public Collection<T> getModelCollection() {
+        return palette.getModelCollection();
+    }
 }

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=1457394&r1=1457393&r2=1457394&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
Sun Mar 17 08:01:41 2013
@@ -18,8 +18,8 @@ under the License.
 -->
 <html>
   <head>
-    <link rel="shortcut icon" href="img/favicon.ico"/>
-
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    
     <link rel="stylesheet" type="text/css" href="css/jquery-ui.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="css/fieldstyle.css" media="all"/>
@@ -38,15 +38,6 @@ under the License.
         background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
           repeat-x scroll 50% 50% #E6E6E6 !important;
       }
-
-      /*            tr.alt td {
-                      background: #eff3ea;
-                  }
-
-                  .stripedTable{
-                      border:1px solid #AAAAAA;
-                  }*/
-
     </style>
   </head>
   <body onload="setTimeout('window.focus();', 0);">

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=1457394&r1=1457393&r2=1457394&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
Sun Mar 17 08:01:41 2013
@@ -19,6 +19,7 @@ under the License.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <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/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html?rev=1457394&r1=1457393&r2=1457394&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html Sun
Mar 17 08:01:41 2013
@@ -18,48 +18,49 @@ specific language governing permissions 
 under the License.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-
-        <title>Apache Syncope - Login</title>
-
-        <link rel="shortcut icon" href="img/favicon.ico"/>
-        <link rel="stylesheet" href="css/style.css" type="text/css" media="all"/>
-
-    </head>
-    <body style="text-align:center">
-        <div id="splash">
-            <img src="img/logo.png" alt="syncope" title="syncope" id="logo" />
-            <p>&nbsp;</p>
-            <div id="loginFeedbackDiv">
-                <span wicket:id="feedback">feedbackmessages will be put here</span>
-            </div>
-            <form wicket:id="login">
-                <label for="userId">
-                    <wicket:message key="userId"/>
-                </label>
-                <input type="text" wicket:id="userId" id="userId" size="25" />
-                <br />
-                <label for="password" class="password">
-                    <wicket:message key="password"/>
-                </label>
-                <input type="password" wicket:id="password" id="password" size="25" />
-                <br />
-                <select wicket:id="language" id="language"/>
-                <br />
-                <br />
-                <input type="submit" wicket:id="submit"/>
-            </form>
-
-            <span style="display: inline-table; margin-bottom: 10px;" wicket:id="selfRegistration"/>
-
-            <wicket:fragment wicket:id="selfRegNotAllowed"/>
-            <wicket:fragment wicket:id="selfRegAllowed">
-                <span wicket:id="selfRegistration"/>
-            </wicket:fragment>
-
-            <div wicket:id="selfRegModal"></div>
-        </div>
-    </body>
+  <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 - Login</title>
+
+    <link rel="shortcut icon" href="img/favicon.ico"/>
+    <link rel="stylesheet" href="css/style.css" type="text/css" media="all"/>
+
+  </head>
+  <body style="text-align:center">
+    <div id="splash">
+      <img src="img/logo.png" alt="syncope" title="syncope" id="logo" />
+      <p>&nbsp;</p>
+      <div id="loginFeedbackDiv">
+        <span wicket:id="feedback">feedbackmessages will be put here</span>
+      </div>
+      <form wicket:id="login">
+        <label for="userId">
+          <wicket:message key="userId"/>
+        </label>
+        <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"  style="width:
180px" />
+        <br />
+        <select wicket:id="language" id="language"/>
+        <br />
+        <br />
+        <input type="submit" wicket:id="submit"/>
+      </form>
+
+      <span style="display: inline-table; margin-bottom: 10px;" wicket:id="selfRegistration"/>
+
+      <wicket:fragment wicket:id="selfRegNotAllowed"/>
+      <wicket:fragment wicket:id="selfRegAllowed">
+        <span wicket:id="selfRegistration"/>
+      </wicket:fragment>
+
+      <div wicket:id="selfRegModal"></div>
+    </div>
+  </body>
 </html>

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html?rev=1457394&r1=1457393&r2=1457394&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
Sun Mar 17 08:01:41 2013
@@ -19,6 +19,7 @@ under the License.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <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"/>
 

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html?rev=1457394&r1=1457393&r2=1457394&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
Sun Mar 17 08:01:41 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/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html?rev=1457394&r1=1457393&r2=1457394&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html
Sun Mar 17 08:01:41 2013
@@ -18,7 +18,7 @@ under the License.
 -->
 <wicket:panel>
 
-  <span wicket:id="roleSummaryPanel"/>
+  <span wicket:id="roleSummaryPanel">[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>

Modified: syncope/trunk/console/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/style.css?rev=1457394&r1=1457393&r2=1457394&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/css/style.css (original)
+++ syncope/trunk/console/src/main/webapp/css/style.css Sun Mar 17 08:01:41 2013
@@ -42,7 +42,7 @@ body {
   font-size: 14px;
 }
 
-#splash a img {
+a img {
   border: none;
 }
 



Mime
View raw message