Refs #2475: updating opened menu items on left menu

2 files changed, 36 insertions, 10 deletions

diff --git a/app/assets/javascripts/main_menu.coffee b/app/assets/javascripts/main_menu.coffee
index c3a4f55a8..45d8c9fe5 100644
--- a/app/assets/javascripts/main_menu.coffee
+++ b/app/assets/javascripts/main_menu.coffee
@@ -7,6 +7,12 @@
     $(this).on 'click', '.closeMenu', (e) ->
       $(this).closest('.nav-menu').removeClass 'open'
 
+    # Opening menu panel according to current url
+    selectedItem = $(this).find('.active')
+
+    selectedItem.closest('.panel-collapse').addClass 'in'
+    selectedItem.closest('.panel-title').children('a').attr('aria-expanded') == true
+
     # Sticky behavior
     toStick = $('.page_header')
     limit = 51
@@ -29,4 +35,5 @@
         if $('#menu_top').find('.sticky-content').length > 0
           $('.sticky-content').remove()
 
+
 $(document).on 'ready page:load', mainmenu
diff --git a/app/views/layouts/navigation/_main_nav_left.html.slim b/app/views/layouts/navigation/_main_nav_left.html.slim
index 1b31f6f94..88491635f 100644
--- a/app/views/layouts/navigation/_main_nav_left.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left.html.slim
@@ -3,33 +3,52 @@
 
   .menu-content
     .closeMenu title='Fermer le menu'
-    .brandname IBOO
+    .brandname
+      = "IBOO"
+      small = "#{params[:controller]}, #{params[:action]}"
 
     #menu-items.panel-group
       .menu-item.panel
         .panel-heading
           h4.panel-title
-            = link_to '#miOne', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'true' do
+            = link_to '#miOne', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'false' do
+              |Offres courantes
+
+        #miOne.panel-collapse.collapse
+          .list-group
+            = link_to root_path, class: "list-group-item #{(params[:controller] == 'referentials' && params[:action] == 'index') ? 'active' : ''}" do
+              span Tableau de bord
+            = link_to '#', class: 'list-group-item' do
+              span Offre de mon organisation
+            = link_to '#', class: 'list-group-item' do
+              span Offre IDF
+
+      .menu-item.panel
+        .panel-heading
+          h4.panel-title
+            = link_to '#miTwo', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'false' do
               |Espace de travail
 
-        #miOne.panel-collapse.collapse.in
+        #miTwo.panel-collapse.collapse
           .list-group
-            = link_to '#', class: 'list-group-item active' do
+            = link_to '#', class: "list-group-item #{params[:controller] == 'workbenches' ? 'active' : ''}" do
               span Jeux de données
             = link_to '#', class: 'list-group-item' do
               span Rapports d'import
             = link_to '#', class: 'list-group-item' do
               span Modèles de calendrier
             = link_to '#', class: 'list-group-item' do
+              span Rapports de contrôle
+            = link_to '#', class: 'list-group-item' do
               span Jeux de contrôle
 
       .menu-item.panel
         .panel-heading
           h4.panel-title
-            = link_to '#miTwo', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'false' do
+            = link_to '#miThree', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'false' do
               |Données
 
-        #miTwo.panel-collapse.collapse
+        #miThree.panel-collapse.collapse
           .panel-body
             em.text-muted
               = "Sélectionnez un jeu de données pour accéder à plus de fonctionnalités"
@@ -37,10 +56,10 @@
       .menu-item.panel
         .panel-heading
           h4.panel-title
-            = link_to '#miThree', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'false' do
+            = link_to '#miFour', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'false' do
               |Synchronisation
 
-        #miThree.panel-collapse.collapse
+        #miFour.panel-collapse.collapse
           .list-group
             = link_to line_referential_path(1), class: 'list-group-item' do
               span Synchronisation iLLICO
@@ -50,10 +69,10 @@
       .menu-item.panel
         .panel-heading
           h4.panel-title
-            = link_to '#miFour', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'true' do
+            = link_to '#miFive', data: { toggle: 'collapse', parent: '#menu-items' }, 'aria-expanded' => 'false' do
               |Outils
               
-        #miFour.panel-collapse.collapse.in
+        #miFive.panel-collapse.collapse
           .list-group
             = link_to '#', target: '_blank', class: 'list-group-item' do
               span