From bleny@users.labs.libre-entreprise.org Mon Jun 15 01:51:19 2026
From: bleny@users.labs.libre-entreprise.org
To: wao-commits@list.forge.codelutin.com
Subject: [Suiviobsmer-commits] r862 - in trunk/wao-ui/src/main:
	java/fr/ifremer/wao/ui/components	resources/fr/ifremer/wao/ui/components
 webapp/css
Date: Mon, 27 Dec 2010 15:29:25 +0100
Message-ID: <20101227142925.AC7CF2F21B@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2601260923669802397=="

--===============2601260923669802397==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: bleny
Date: 2010-12-27 14:29:24 +0000 (Mon, 27 Dec 2010)
New Revision: 862

Log:
refactor menu generation depending on profile

Modified:
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java
   trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml
   trunk/wao-ui/src/main/webapp/css/main.css

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java	2010-=
12-24 16:32:31 UTC (rev 861)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java	2010-=
12-27 14:29:24 UTC (rev 862)
@@ -25,7 +25,12 @@
 package fr.ifremer.wao.ui.components;
=20
 import fr.ifremer.wao.bean.ConnectedUser;
+import fr.ifremer.wao.ui.pages.Administration;
+import fr.ifremer.wao.ui.pages.Boats;
+import fr.ifremer.wao.ui.pages.Contacts;
 import fr.ifremer.wao.ui.pages.Index;
+import fr.ifremer.wao.ui.pages.SamplingPlan;
+import fr.ifremer.wao.ui.pages.Synthesis;
 import fr.ifremer.wao.ui.services.ServiceAuthentication;
 import fr.ifremer.wao.ui.services.WaoManager;
 import org.apache.tapestry5.BindingConstants;
@@ -38,6 +43,9 @@
 import org.apache.tapestry5.services.Request;
 import org.slf4j.Logger;
=20
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 /**
  * Layout
  *
@@ -122,6 +130,29 @@
         return this.contentFeedback;
     }
=20
+    /*************************** MAIN MENU *********************************=
***/
+
+    /** Page links and link title. */
+    private Map<String, String> menuItems;
+
+    @Property
+    private Map.Entry<String, String> menuItem;
+
+    public Map getMenuItems() {
+        if (menuItems =3D=3D null) {
+            Class[] pagesInMenu =3D new Class[] { SamplingPlan.class, Boats.=
class,
+                                  Contacts.class, Synthesis.class, Administr=
ation.class};
+            menuItems =3D new LinkedHashMap<String, String>();
+            for (Class page : pagesInMenu) {
+                if (serviceAuthentication.isAllowed(page)) {
+                    // menuItems.put(page.getSimpleName(), _(page.getName())=
);
+                    menuItems.put(page.getSimpleName(), page.getSimpleName()=
);
+                }
+            }
+        }
+        return menuItems;
+    }
+
     public String getAdminClass() {
         return !isAdministrationHidden() ? " admin" : "";
     }

Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout=
.tml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml	2=
010-12-24 16:32:31 UTC (rev 861)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml	2=
010-12-27 14:29:24 UTC (rev 862)
@@ -83,7 +83,14 @@
                 </a>
             </div>
         </div>
+
         <ul class=3D"clearfix" id=3D"so-menu">
+            <li t:type=3D"loop" source=3D"menuItems.entrySet()" value=3D"men=
uItem">
+                <a href=3D"${contextPath}/${menuItem.key}">${menuItem.value}=
</a>
+            </li>
+        </ul>
+
+        <!--ul class=3D"clearfix" id=3D"so-menu">
             <li class=3D"link${adminClass} ${samplingSelected}" onclick=3D"l=
ocation.href=3D'${contextPath}/samplingPlan'"
                 title=3D"Plan d'=C3=A9chantillonnage">
                 Plan d'Echantillonnage
@@ -102,7 +109,7 @@
                     Synth=C3=A8se
                 </li>
                 <p:else>
-                    <!-- Menu disabled for Guest user -->
+                    <!- Menu disabled for Guest user ->
                     <li class=3D"disabled" title=3D"Liste des navires inacce=
ssible">
                         Navires
                     </li>
@@ -129,7 +136,7 @@
                     </p:else>
                 </t:if>
             </t:unless>
-        </ul>
+        </ul-->
=20
         <div id=3D"${contentId}">
             <t:feedback t:id=3D"contentFeedback" t:autoClear=3D"false"/>

Modified: trunk/wao-ui/src/main/webapp/css/main.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-ui/src/main/webapp/css/main.css	2010-12-24 16:32:31 UTC (rev 86=
1)
+++ trunk/wao-ui/src/main/webapp/css/main.css	2010-12-27 14:29:24 UTC (rev 86=
2)
@@ -137,65 +137,39 @@
     padding-right: 40px;
 }
=20
-/* MENU */
-ul#so-menu {
-    width: 80%;
-    height: 40px;
+#so-menu {
+    width: 800px;
+    margin-top: 7px;
     margin-left: auto;
     margin-right: auto;
-    margin-top: 7px;
+    display: table;
 }
=20
-ul#so-menu li {
-    list-style-type: none;
+#so-menu li {
+    display: table-cell;
     text-align: center;
-    float:left;
+    padding: 0px;
 }
=20
-ul#so-menu li.link {
-    background-color: #DEE7EC;   =20
-    padding: 5px;   =20
-    width: 23%;
+#so-menu li:first-child {
+    margin-left: 0px;
 }
=20
-ul#so-menu li.disabled {
-    background-color: #e5e5e5;
-    color: white;
-    padding: 5px;
-    width: 23%;
+#so-menu a {
+    color: black;
+    display: block;
+    width: inherit;
+    background-color: #DEE7EC;
+    padding: 7px;
+    text-decoration: none;
+    margin-left: 15px;
 }
=20
-ul#so-menu li.admin {
-    width: 18% !important;
-}
-
-/* Separation */
-ul#so-menu li.sep {
-    height: 12px;
-    width: 0.8%;
-    background-color: #007CC2;
-}
-/* Home */
-ul#so-menu li.home {
-    padding: 4px 0 0 2px;
-    width: 25px;
-}
-
-ul#so-menu li.selected {
+#so-menu a:hover, #so-menu a:active, #so-menu a:focus {
     background-color: #133852;
-    border-top: 3px solid #007CC2;
-    border-bottom: 3px solid #007CC2;
     color: white;
 }
=20
-ul#so-menu li.link:hover {
-    background-color: #133852;
-    border-top: 3px solid #007CC2;
-    border-bottom: 3px solid #007CC2;
-    color: white;
-    cursor: pointer;
-}
-
 div#so-footer {
     margin-top: 20px;
     margin-bottom: 20px;
@@ -216,3 +190,4 @@
 div#so-footer p.cnil {
     font-size: 0.7em;
 }
+


--===============2601260923669802397==--