From 4717d72dde83f613fb1ab943cbef92c73ed36d3d Mon Sep 17 00:00:00 2001 From: JC Date: Fri, 2 Dec 2016 11:25:09 +0100 Subject: [PATCH] Using active css class to display which procedure is selected on dossiers#index --- app/assets/stylesheets/dossiers.scss | 1 + app/assets/stylesheets/left_pannel.scss | 4 +++- app/assets/stylesheets/search.scss | 2 +- .../_left_panel_backoffice_dossierscontroller_index.html.haml | 4 ++-- ...ar_backoffice_dossiers_procedurecontroller_index.html.haml | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/dossiers.scss b/app/assets/stylesheets/dossiers.scss index 644bbd5ae..ce99c08a2 100644 --- a/app/assets/stylesheets/dossiers.scss +++ b/app/assets/stylesheets/dossiers.scss @@ -45,6 +45,7 @@ h5 span { #procedure_list { margin-left: -10px; overflow: scroll; + margin-top: 10px; a, a:hover { color: #FFFFFF; text-decoration: none; diff --git a/app/assets/stylesheets/left_pannel.scss b/app/assets/stylesheets/left_pannel.scss index 7cc6ee22a..159af3d78 100644 --- a/app/assets/stylesheets/left_pannel.scss +++ b/app/assets/stylesheets/left_pannel.scss @@ -18,6 +18,7 @@ } } #action-block { + margin-right: 10px; .action { background-color: #E45B51; text-align: center; @@ -30,7 +31,7 @@ font-size: 16px; font-weight: bold; border: none; - width: 200px; + width: 100%; } } #menu-block { @@ -45,6 +46,7 @@ text-align: center; font-size: 25px; width: 200px; + margin-top: 20px; } .tips { margin: 0 10px 0 5px; diff --git a/app/assets/stylesheets/search.scss b/app/assets/stylesheets/search.scss index acfb899b9..037e2a119 100644 --- a/app/assets/stylesheets/search.scss +++ b/app/assets/stylesheets/search.scss @@ -1,5 +1,5 @@ #search-block{ - margin: 11px 5px 0 0; + margin: 15px 10px 0 0; height: 50px; } diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml index fc4245863..47e202bd2 100644 --- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml @@ -14,6 +14,6 @@ %div.split-hr-left #procedure_list - @facade_data_view.gestionnaire_procedures_name_and_id_list.each do |procedure| - = link_to backoffice_dossiers_procedure_path(procedure[:id]),{title: procedure[:libelle]} do - %div.procedure_list_element + = link_to backoffice_dossiers_procedure_path(procedure[:id]), {title: procedure[:libelle]} do + %div.procedure_list_element{ class: ('active' if procedure[:id] == @facade_data_view.procedure.id) } = truncate(procedure[:libelle], length: 50) diff --git a/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml b/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml index 69a89d245..c9279b51a 100644 --- a/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml +++ b/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml @@ -1,5 +1,5 @@ %div.col-lg-8.col-md-8.main-info - =@facade_data_view.procedure_id.nil? ? "Tous les dossiers" : truncate(@facade_data_view.procedure.libelle, {length: 50}) + = @facade_data_view.procedure_id.nil? ? "Tous les dossiers" : truncate(@facade_data_view.procedure.libelle, {length: 50}) %div.col-lg-3.col-md-3.options %div.row %div.col-lg-12.col-md-12