Changeset 1596 for trunk/LATMOS-Accounts-Web

Timestamp:

01/06/16 16:02:29 (9 years ago)

Author:

nanardon

Message:

Replace vertical menu by an horizontal top one

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/I18N/fr.po (modified) (1 diff)
• lib/LATMOS/Accounts/Web/I18N/messages.pot (modified) (1 diff)
• root/html/includes/sidebar.tt (modified) (5 diffs)
• root/static/struct.css (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/fr.po

@@ -17 +17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: root/html/includes/wrapper.tt:47
+#: root/html/includes/sidebar.tt:16
+msgid "Change my password"
+msgstr "Changer mon mot de passe"
+
+#: root/html/includes/sidebar.tt:9
+msgid "Connected as"
+msgstr "Connecté en tant que"
+
+#: root/html/includes/sidebar.tt:28
+msgid "Create"
+msgstr "Créer"
+
+#: root/html/includes/wrapper.tt:48
 msgid "IT management"
 msgstr "Gestion informatique"
+
+#: root/html/includes/sidebar.tt:21
+msgid "Logout"
+msgstr "Se déconnecter"
+
+#: root/html/includes/sidebar.tt:40
+msgid "Tools"
+msgstr "Outils"
+
+#: root/html/includes/sidebar.tt:65
+msgid "View"
+msgstr "Voir"

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/messages.pot

@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: root/html/includes/wrapper.tt:47
+#: root/html/includes/sidebar.tt:16
+msgid "Change my password"
+msgstr ""
+
+#: root/html/includes/sidebar.tt:9
+msgid "Connected as"
+msgstr ""
+
+#: root/html/includes/sidebar.tt:28
+msgid "Create"
+msgstr ""
+
+#: root/html/includes/wrapper.tt:48
 msgid "IT management"
 msgstr ""
+
+#: root/html/includes/sidebar.tt:21
+msgid "Logout"
+msgstr ""
+
+#: root/html/includes/sidebar.tt:40
+msgid "Tools"
+msgstr ""
+
+#: root/html/includes/sidebar.tt:65
+msgid "View"
+msgstr ""

trunk/LATMOS-Accounts-Web/root/html/includes/sidebar.tt

@@ +1 @@
+
 [% IF c.user.username %]
 <form action="[% c.uri_for('/search') %]">
@@ -4 +5 @@
 <input type="image" name="" src="[% c.uri_for('/static', 'images', 'gtk-find.png') %]" height="16" width="16">
 </form>
+<span>
+    <a href="[% c.uri_for('/users', c.user.username) %]">
+    [% l('Connected as') %]
+    [% c.model('Accounts').db.get_object('user', c.user.username ) %]
+    </a>
+</span>,
+[% IF c.model('Accounts').db.check_acl('user', 'userPassword', 'w') %]
+    <span>
+    <a href="[% c.uri_for('/users', c.user.username, 'passwd') %]">
+    [% l('Change my password') %]
+    </a>
+    </span>,
+[% END %]
+<span>
+    <a href="[% c.uri_for('/logout') %]">[% l('Logout') %]</a>
+</span>
+
 <ul id="menu">
-
-<li>Mon compte:
-    <ul>
-
-    <li> <a href="[% c.uri_for('/users', c.user.username) %]">Ma page</a></li>
-
-    [% IF c.model('Accounts').db.check_acl('user', 'userPassword', 'w') %]
-    <li><a href="[% c.uri_for('/users', c.user.username, 'passwd') %]">Changer mon mot de passe</a></li>
-    [% END %]
-
-    <li><a href="[% c.uri_for('/logout') %]">Se déconnecter</a></li>
-    </ul>
-</li>
 
 <li><a href="[% c.uri_for('/search', 'adv') %]">Recherche avancée</a></li>
 
-<li>Outils:
+<li>[% l('Create') %]
+<ul>
+[% FOREACH obj = c.model('Accounts').db.list_supported_objects.sort %]
+[% label = c.model('Accounts').obj_to_label(obj) %]
+[% NEXT IF NOT label %]
+    <li><a href="[% c.uri_for('/create', obj) %]">
+    [% label | html %]
+    </a></li>
+[% END %]
+</ul>
+</li>
+
+<li>[% l('Tools') %]
     <ul>
     [% IF c.config.features.offices_list %]
@@ -35 +52 @@
     [% IF loop.first %]
     <li><a href="[% c.uri_for('/stat') %]">Statistiques</a>:
-    <ul>
     [% END %]
     <li><a href="[% c.uri_for('/stat', stat) %]">[% ostat.get_attributes('description') || stat | html %]</a></li>
     [% IF loop.last %]
-    </ul>
     </li>
     [% END %]
@@ -47 +62 @@
 </li>
 
+
+<li>[% l('View') %]
+<ul>
 [% FOREACH obj = c.model('Accounts').db.list_supported_objects.sort %]
 [% label = c.model('Accounts').obj_to_label(obj) %]
 [% NEXT IF NOT label %]
-<li>[% label | html %]
-    <ul>
-    <li><a href="[% c.model('Accounts').obj_to_uri(obj) %]">Listes</a></li>
-    <li><a href="[% c.uri_for('/create', obj) %]">Créer...</a></li>
-    <li><a href="[% c.uri_for('/search/adv', { 'otype' => obj }) %]">Rechercher...</a></li>
-    </ul>
+    <li><a href="[% c.model('Accounts').obj_to_uri(obj) %]">[% label | html %]</a></li>
+[% END %]
+</ul>
 </li>
-[% END %]
 
-<ul>
 <li><a href="[% c.uri_for('/admin')
 %]">Gestion...</a></li>
@@ -66 +79 @@
 <script>
 $(function() {
-    $('#menu').menu();
-});
+         $( "#menu" ).menu({ position: { my: "left top", at: "left-1 top+35" } });
+}); 
 </script>
 [% END %]

trunk/LATMOS-Accounts-Web/root/static/struct.css

@@ -1 +1 @@
 /* $Id$ */
 
+.ui-menu:after {
+    content: ".";
+    display: block;
+    clear: both;
+    visibility: hidden;
+    line-height: 0;
+    height: 0;
+}
+
+#menu>.ui-menu-item {
+    border: 1px solid #A6C9E2;
+    width: auto;
+}
+
+.ui-menu .ui-menu-item {
+    display: inline-block;
+    float: left;
+    margin: 0;
+    padding: 0;
+}
+
 #header  {
-    width: 100%;
+    width: auto;
     padding: 0.2em;
 }
 
 #sidebar {
-    width: 180px;
-    padding: 0.1em;
-    float: left;
     font-size: 0.9em;
 }
@@ -17 +35 @@
 }
 
+#sidebar form {
+    display: inline-block;
+}
+
+#sidebar>span {
+    padding-left: 20px;
+}
+
 #mainbox {
-    width: 78%;
-    padding: 0em;
-    float: left;
+    width: auto;
+    padding: 1em;
+    border: groove 10px;
 }