From 571efb2ee2b76ec4a752e1468526340beea41135 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Thu, 17 May 2018 16:54:18 +0200
Subject: Change the place of configuration links in the left menu

---
 .../navigation/_main_nav_left_content.html.slim    | 15 ++++++++++++++
 .../_main_nav_left_content_stif.html.slim          | 23 +++++++++++++++-------
 config/locales/layouts.en.yml                      |  4 +++-
 config/locales/layouts.fr.yml                      |  4 +++-
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/navigation/_main_nav_left_content.html.slim b/app/views/layouts/navigation/_main_nav_left_content.html.slim
index 889f8f944..004ea9050 100644
--- a/app/views/layouts/navigation/_main_nav_left_content.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left_content.html.slim
@@ -68,3 +68,18 @@
         .list-group
           = link_to stop_area_referential_stop_areas_path(workbench.stop_area_referential), class: "list-group-item" do
             span = Chouette::StopArea.t.capitalize
+
+    .menu-item.panel
+      .panel-heading
+        h4.panel-title
+          = link_to '#miSix', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+            = t('layouts.navbar.configuration')
+
+      #miSix.panel-collapse.collapse
+        .list-group
+          - if policy(workbench).edit?
+            = link_to [:edit, workbench], class: 'list-group-item' do
+              span = t('layouts.navbar.workbench_configuration')
+          - if policy(workbench.workgroup).edit?
+            = link_to [:edit, workbench.workgroup], class: 'list-group-item' do
+              span = t('layouts.navbar.workgroup_configuration')
diff --git a/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim b/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
index a7bb3f511..7bea0814e 100644
--- a/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
@@ -14,9 +14,6 @@
             span = t('layouts.navbar.workbench_outputs.organisation')
           = link_to '#', class: 'list-group-item disabled' do
             span = t('layouts.navbar.workbench_outputs.workgroup')
-          - if policy(workbench.workgroup).edit?
-            = link_to [:edit, workbench.workgroup], class: 'list-group-item' do
-              span = t('layouts.navbar.workbench_outputs.edit_workgroup')
 
     .menu-item.panel
       .panel-heading
@@ -38,9 +35,6 @@
             span = t('activerecord.models.compliance_check_set.other').capitalize
           = link_to compliance_control_sets_path, class: 'list-group-item' do
             span = t('activerecord.models.compliance_control_set.other').capitalize
-          - if policy(workbench).edit?
-            = link_to [:edit, workbench], class: 'list-group-item' do
-              span = t('workbenches.edit.link')
 
     .menu-item.panel
       .panel-heading
@@ -76,9 +70,24 @@
       .panel-heading
         h4.panel-title
           = link_to '#miSix', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
-            = t('layouts.navbar.tools')
+            = t('layouts.navbar.configuration')
 
       #miSix.panel-collapse.collapse
+        .list-group
+          - if policy(workbench).edit?
+            = link_to [:edit, workbench], class: 'list-group-item' do
+              span = t('layouts.navbar.workbench_configuration')
+          - if policy(workbench.workgroup).edit?
+            = link_to [:edit, workbench.workgroup], class: 'list-group-item' do
+              span = t('layouts.navbar.workgroup_configuration')
+
+    .menu-item.panel
+      .panel-heading
+        h4.panel-title
+          = link_to '#miSeven', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+            = t('layouts.navbar.tools')
+
+      #miSeven.panel-collapse.collapse
         .list-group
           = link_to Rails.application.config.try(:portal_url), target: '_blank', class: 'list-group-item' do
             span
diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml
index 70e95646e..065437507 100644
--- a/config/locales/layouts.en.yml
+++ b/config/locales/layouts.en.yml
@@ -23,7 +23,9 @@ en:
       workbench_output:
         organisation: Organisation offers
         workgroup: Workgroup offers
-        edit_workgroup: Application settings
+      configuration: Settings
+      workgroup_configuration:  Application
+      workbench_configuration: Workbench
       tools: Tools
       sync: Synchronization
       sync_icar: iCAR synchronization
diff --git a/config/locales/layouts.fr.yml b/config/locales/layouts.fr.yml
index 810ede34c..8e739b6c7 100644
--- a/config/locales/layouts.fr.yml
+++ b/config/locales/layouts.fr.yml
@@ -23,7 +23,9 @@ fr:
       workbench_outputs:
         organisation: Offre de mon organisation
         workgroup: Offre du groupe de travail
-        edit_workgroup: Paramétrages de l'application
+      configuration: Paramétrages
+      workgroup_configuration:  Application
+      workbench_configuration: Espace de travail
       tools: Outils
       sync: Synchronisation
       sync_icar: Synchronisation iCAR
-- 
cgit v1.2.3