rearrange main menu

2025-01-17 06:52:27 +01:00 · 2020-02-26 18:05:09 +01:00 · 2020-02-26 18:05:09 +01:00 · 38b196feb8
commit 38b196feb8
parent fc5b935495
8 changed files with 84 additions and 76 deletions
--- a/app/assets/javascripts/controllers/main_nav.js
+++ b/app/assets/javascripts/controllers/main_nav.js
@ -22,7 +22,13 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc
      linkIcon: 'home',
      class: 'home-link'
    },
-
+    { class: 'menu-spacer' },
+    {
+      state: 'app.public.calendar',
+      linkText: 'app.public.common.public_calendar',
+      linkIcon: 'calendar',
+      class: 'public-calendar-link'
+    },
    {
      state: 'app.public.machines_list',
      linkText: 'app.public.common.reserve_a_machine',
@ -41,18 +47,14 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc
      linkIcon: 'tags',
      class: 'reserve-event-link'
    },
-    {
-      state: 'app.public.calendar',
-      linkText: 'app.public.common.public_calendar',
-      linkIcon: 'calendar',
-      class: 'public-calendar-link'
-    },
+    { class: 'menu-spacer' },
    {
      state: 'app.public.projects_list',
      linkText: 'app.public.common.projects_gallery',
      linkIcon: 'th',
      class: 'projects-gallery-link'
-    }
+    },
+    { class: 'menu-spacer' }

  ];

@ -66,7 +68,7 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc
  }

  if (!Fablab.withoutSpaces) {
-    $scope.navLinks.splice(3, 0, {
+    $scope.navLinks.splice(4, 0, {
      state: 'app.public.spaces_list',
      linkText: 'app.public.common.reserve_a_space',
      linkIcon: 'rocket',
@ -76,56 +78,58 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc

  Fablab.adminNavLinks = Fablab.adminNavLinks || [];
  const adminNavLinks = [
-    {
-      state: 'app.admin.trainings',
-      linkText: 'app.public.common.trainings_monitoring',
-      linkIcon: 'graduation-cap'
-    },
    {
      state: 'app.admin.calendar',
      linkText: 'app.public.common.manage_the_calendar',
      linkIcon: 'calendar'
    },
-    {
-      state: 'app.admin.members',
-      linkText: 'app.public.common.manage_the_users',
-      linkIcon: 'users'
-    },
-    {
-      state: 'app.admin.invoices',
-      linkText: 'app.public.common.manage_the_invoices',
-      linkIcon: 'file-pdf-o'
-    },
-    {
-      state: 'app.admin.pricing',
-      linkText: 'app.public.common.subscriptions_and_prices',
-      linkIcon: 'money'
-    },
-    {
-      state: 'app.admin.events',
-      linkText: 'app.public.common.manage_the_events',
-      linkIcon: 'tags'
-    },
    {
      state: 'app.public.machines_list',
      linkText: 'app.public.common.manage_the_machines',
      linkIcon: 'cogs'
    },
    {
-      state: 'app.admin.project_elements',
-      linkText: 'app.public.common.manage_the_projects_elements',
-      linkIcon: 'tasks'
+      state: 'app.admin.trainings',
+      linkText: 'app.public.common.trainings_monitoring',
+      linkIcon: 'graduation-cap'
+    },
+    {
+      state: 'app.admin.events',
+      linkText: 'app.public.common.manage_the_events',
+      linkIcon: 'tags'
+    },
+    { class: 'menu-spacer' },
+    {
+      state: 'app.admin.members',
+      linkText: 'app.public.common.manage_the_users',
+      linkIcon: 'users'
+    },
+    {
+      state: 'app.admin.pricing',
+      linkText: 'app.public.common.subscriptions_and_prices',
+      linkIcon: 'money'
+    },
+    {
+      state: 'app.admin.invoices',
+      linkText: 'app.public.common.manage_the_invoices',
+      linkIcon: 'file-pdf-o'
    },
    {
      state: 'app.admin.statistics',
      linkText: 'app.public.common.statistics',
      linkIcon: 'bar-chart-o'
    },
+    { class: 'menu-spacer' },
    {
      state: 'app.admin.settings',
      linkText: 'app.public.common.customization',
      linkIcon: 'gear'
    },
+    {
+      state: 'app.admin.project_elements',
+      linkText: 'app.public.common.manage_the_projects_elements',
+      linkIcon: 'tasks'
+    },
    {
      state: 'app.admin.open_api_clients',
      linkText: 'app.public.common.open_api_clients',
@ -136,7 +140,7 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc
  $scope.adminNavLinks = adminNavLinks;

  if (!Fablab.withoutSpaces) {
-    return $scope.adminNavLinks.splice(7, 0, {
+    return $scope.adminNavLinks.splice(4, 0, {
      state: 'app.public.spaces_list',
      linkText: 'app.public.common.manage_the_spaces',
      linkIcon: 'rocket'
--- a/app/assets/stylesheets/app.nav.scss
+++ b/app/assets/stylesheets/app.nav.scss
@ -89,6 +89,10 @@
 				}
 			}
 		}
+        > li.menu-spacer {
+          margin: 6px 80% 6px 5px;
+          border-bottom: 1px solid white;
+        }
 		ul{
 			display: none;
 		}
--- a/app/assets/templates/shared/leftnav.html.erb
+++ b/app/assets/templates/shared/leftnav.html.erb
@ -63,7 +63,7 @@
            </li>
            <!-- Common menu entries -->
            <li class="{{navLink.class}}" ng-repeat="navLink in navLinks">
-              <a ng-click="toggleNavSize($event)" ui-sref="{{navLink.state}}" ui-sref-active="active" class="auto" data-toggle="class:nav-off-screen" data-target="#nav">
+              <a ng-click="toggleNavSize($event)" ui-sref="{{navLink.state}}" ui-sref-active="active" class="auto" data-toggle="class:nav-off-screen" data-target="#nav" ng-if="navLink.state">
                <i class="fa fa-{{navLink.linkIcon}} fa-lg"></i>
                <span>{{navLink.linkText | translate}}</span>
              </a>
@ -74,8 +74,8 @@
          <div class="line-s bg-red-dark dk " ng-if="isAuthorized('admin')"></div>
          <div class="text-xs font-bold text-bordeau hidden-nav-xs padder m-t-lg m-b-sm admin-section" ng-if="isAuthorized('admin')" translate>{{ 'app.public.common.admin' }}</div>
          <ul class="nav" ng-if="isAuthorized('admin')">
-            <li class="" ng-repeat="navLink in adminNavLinks">
-              <a ng-click="toggleNavSize($event)" ga ui-sref="{{navLink.state}}" ui-sref-active="active" class="auto" data-toggle="class:nav-off-screen" data-target="#nav">
+            <li class="{{navLink.class}}" ng-repeat="navLink in adminNavLinks">
+              <a ng-click="toggleNavSize($event)" ga ui-sref="{{navLink.state}}" ui-sref-active="active" class="auto" data-toggle="class:nav-off-screen" data-target="#nav" ng-if="navLink.state">
                <i class="fa fa-{{navLink.linkIcon}} fa-lg"></i>
                <span>{{navLink.linkText | translate}}</span>
              </a>
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@ -1073,7 +1073,7 @@ fr:
            content: "Ici vous pourrez créer, modifier et supprimer des formations. C'est également l'endroit où vous pourrez valider les formations suivies par vos membres."
          trainings:
            title: "Gérer les formations"
-            content: "<p>Lors de la création d'une formation, vous pouvez définir un nombre de places par défaut. Néanmoins, le nombre de places effectives pourra être modifié pour chaque session.</p><p>La programmation des sessions de formation se fait depuis l'onglet [Gérer le calendrier].</p><p>D'autre part, il est possible d'associer une ou plusieurs machines à une formation. Cela permet d'en faire un pré-requis pour la réservation de ces machines.</p>"
+            content: "<p>Lors de la création d'une formation, vous pouvez définir un nombre de places par défaut. Néanmoins, le nombre de places effectives pourra être modifié pour chaque session.</p><p>La programmation des sessions de formation se fait depuis l'onglet administrateur [Agenda].</p><p>D'autre part, il est possible d'associer une ou plusieurs machines à une formation. Cela permet d'en faire un pré-requis pour la réservation de ces machines.</p>"
          filter:
            title: "Filtre"
            content: "Par défaut, seules les formations actives sont affichées ici. Affichez les autres en choisissant un autre filtre ici."
--- a/config/locales/app.public.en.yml
+++ b/config/locales/app.public.en.yml
@ -44,15 +44,15 @@ en:
        public_calendar: "Calendar"

        # left menu (admin)
-        trainings_monitoring: "Trainings monitoring"
-        manage_the_calendar: "Manage the Calendar"
-        manage_the_users: "Manage the Users"
-        manage_the_invoices: "Manage the invoices"
+        trainings_monitoring: "Trainings"
+        manage_the_calendar: "Calendar"
+        manage_the_users: "Users"
+        manage_the_invoices: "Invoices"
        subscriptions_and_prices: "Subscriptions and Prices"
-        manage_the_events: "Manage the events"
-        manage_the_machines: "Manage the Machines"
-        manage_the_spaces: "Manage the Spaces"
-        manage_the_projects_elements: "Manage the Projects Elements"
+        manage_the_events: "Events"
+        manage_the_machines: "Machines"
+        manage_the_spaces: "Spaces"
+        manage_the_projects_elements: "Projects"
        statistics: "Statistics"
        customization: "Customization"
        open_api_clients: "OpenAPI clients"
--- a/config/locales/app.public.es.yml
+++ b/config/locales/app.public.es.yml
@ -36,17 +36,17 @@ es:
        reserve_a_space: "Reservar un espacio"
        projects_gallery: "Galería de proyectos"
        subscriptions: "Suscripciones"
-        public_calendar: "Calendario"
+        public_calendar: "Agenda"
        #left menu (admin)
-        trainings_monitoring: "Monitorización de cursos"
-        manage_the_calendar: "Gestionar calendario"
-        manage_the_users: "Gestionar usuarios"
-        manage_the_invoices: "Gestionar facturas"
+        trainings_monitoring: "Cursos"
+        manage_the_calendar: "Agenda"
+        manage_the_users: "Usuarios"
+        manage_the_invoices: "Facturas"
        subscriptions_and_prices: "Suscripciones y precios"
-        manage_the_events: "Gestionar eventos"
-        manage_the_machines: "Gestionar máquinas"
-        manage_the_spaces: "Gestionar espacios"
-        manage_the_projects_elements: "Gestionar los elementos de los proyectos"
+        manage_the_events: "Eventos"
+        manage_the_machines: "Máquinas"
+        manage_the_spaces: "Espacios"
+        manage_the_projects_elements: "Proyectos"
        statistics: "Estadísticas"
        customization: "Customización"
        open_api_clients: "Clientes OpenAPI"
--- a/config/locales/app.public.fr.yml
+++ b/config/locales/app.public.fr.yml
@ -44,18 +44,18 @@ fr:
        reserve_a_space: "Réserver un espace"
        projects_gallery: "Galerie de projets"
        subscriptions: "Abonnements"
-        public_calendar: "Calendrier"
+        public_calendar: "Agenda"

        # menu de gauche (partie admin)
-        trainings_monitoring: "Suivi formations"
-        manage_the_calendar: "Gérer le calendrier"
-        manage_the_users: "Gérer les utilisateurs"
-        manage_the_invoices: "Gérer les factures"
+        trainings_monitoring: "Formations"
+        manage_the_calendar: "Agenda"
+        manage_the_users: "Utilisateurs"
+        manage_the_invoices: "Factures"
        subscriptions_and_prices: "Abonnements & Tarifs"
-        manage_the_events: "Gérer les évènements"
-        manage_the_machines: "Gérer les machines"
-        manage_the_spaces: "Gérer les espaces"
-        manage_the_projects_elements: "Gérer les éléments projets"
+        manage_the_events: "Évènements"
+        manage_the_machines: "Machines"
+        manage_the_spaces: "Espaces"
+        manage_the_projects_elements: "Projets"
        statistics: "Statistiques"
        customization: "Personnalisation"
        open_api_clients: "Clients OpenAPI"
--- a/config/locales/app.public.pt.yml
+++ b/config/locales/app.public.pt.yml
@ -41,18 +41,18 @@ pt:
        reserve_a_space: "Reserva de espaço"
        projects_gallery: "Galeria de Projetos"
        subscriptions: "Assinaturas"
-        public_calendar: "Calendário"
+        public_calendar: "Agenda"

        # left menu (admin)
        trainings_monitoring: "Treinamentos"
-        manage_the_calendar: "Gerenciar calendário"
-        manage_the_users: "Gerenciar usuários"
-        manage_the_invoices: "Gerenciar contas"
+        manage_the_calendar: "Agenda"
+        manage_the_users: "Uusuários"
+        manage_the_invoices: "Contas"
        subscriptions_and_prices: "Assinaturas e Preços"
-        manage_the_events: "Gerenciar eventos"
-        manage_the_machines: "Gerenciar Máquinas"
-        manage_the_spaces: "Gerenciar espaços"
-        manage_the_projects_elements: "Gerenciar Elementos de Projeto"
+        manage_the_events: "Eventos"
+        manage_the_machines: "Máquinas"
+        manage_the_spaces: "Espaços"
+        manage_the_projects_elements: "Projeto"
        statistics: "Estatísticas"
        customization: "Customizações"
        open_api_clients: "OpenAPI clients"