Mercurial > gemma

changeset 1234:1a5564655f2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refac: Sidebar reorganized In order to make context switches between administrative tasks which are map related and those which are system related, we now have a category "administration" and "systemadministration". The Riverbedmorphology does nothing than display the map, so it is renamed to that (map). In case the context of "systemadministration" is chosen, the "map" brings you just back to the map.
author Thomas Junk <thomas.junk@intevation.de>
date Tue, 20 Nov 2018 09:54:53 +0100
parents c9c9c9cc61f6
children 45c2da4f3af0
files client/src/application/Sidebar.vue
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/application/Sidebar.vue	Tue Nov 20 09:25:15 2018 +0100
+++ b/client/src/application/Sidebar.vue	Tue Nov 20 09:54:53 2018 +0100
@@ -9,10 +9,10 @@
         <div :class="menuStyle">
             <div class="menupoints" v-if="this.showSidebar">
                 <router-link to="/" class="text-body d-flex flex-row nav-link">
-                    <i class="fa fa-map-o align-self-center navicon"></i>Riverbed Morphology
+                    <i class="fa fa-map-o align-self-center navicon"></i>Map
                 </router-link>
                 <div class="d-flex flex-row nav-link">
-                    <i class="fa fa-ship align-self-center navicon"></i>
+                    <i v-if="routeName == 'mainview'" class="fa fa-ship align-self-center navicon"></i>
                     <a
                         class="text-body d-flex flex-row"
                         v-if="routeName == 'mainview'"
@@ -22,7 +22,10 @@
                 </div>
                 <div v-if="isSysAdmin">
                     <hr>
-                    <div class="nav-link d-flex menupadding text-muted">Administration</div>
+                    <div
+                        v-if="routeName == 'mainview'"
+                        class="nav-link d-flex menupadding text-muted"
+                    >Administration</div>
                 </div>
                 <div v-if="isWaterwayAdmin">
                     <div v-if="routeName == 'mainview'" class="d-flex flex-row nav-link">
@@ -41,6 +44,7 @@
                             @click="toggleContextBox('staging')"
                         >Staging area</a>
                     </div>
+                    <div class="nav-link d-flex menupadding text-muted">Systemadministration</div>
                     <router-link class="text-body d-flex flex-row nav-link" to="usermanagement">
                         <i class="fa fa-address-card-o align-self-center navicon"></i>Users
                     </router-link>
@@ -52,7 +56,6 @@
                     >
                         <i class="fa fa-wrench align-self-center navicon"></i>Systemconfiguration
                     </router-link>
-                    <div class="nav-link d-flex menupadding text-muted">Systeminformation</div>
                     <router-link class="text-body d-flex flex-row nav-link" to="logs">
                         <i class="fa fa-book align-self-center navicon"></i>Logs
                     </router-link>