diff --git a/app/assets/stylesheets/admin/styles.sass b/app/assets/stylesheets/admin/styles.sass index 2bef76650ede9a2f857930b9aacf0d4c1941a756..6abd473ba89eef36a410e78e0f013355a4f11fb6 100644 --- a/app/assets/stylesheets/admin/styles.sass +++ b/app/assets/stylesheets/admin/styles.sass @@ -5,6 +5,8 @@ h1 min-width: 20px body, body[data-theme=dark] + .sidebar + background: black .sidebar-content background-color: black background-image: asset-url('sun.svg') diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb index 168a63016581f565831ff66d97f9633fb661da8b..9c3e0febd5d7ab67ff86cbf432f517ef5f987dad 100644 --- a/app/controllers/admin/application_controller.rb +++ b/app/controllers/admin/application_controller.rb @@ -8,4 +8,10 @@ class Admin::ApplicationController < ApplicationController def breadcrumb add_breadcrumb 'Tableau de bord', :admin_root_path end + + def breadcrumb_for(object) + return unless object + object.persisted? ? add_breadcrumb(object, [:admin, object]) + : add_breadcrumb('Créer') + end end diff --git a/app/controllers/admin/features/education/application_controller.rb b/app/controllers/admin/features/education/application_controller.rb index 1346e9b2b66c1581402e4937385f0369f506aa73..20fee4e63413090772444b1ecd80066cf6f8dffc 100644 --- a/app/controllers/admin/features/education/application_controller.rb +++ b/app/controllers/admin/features/education/application_controller.rb @@ -1,6 +1,6 @@ class Admin::Features::Education::ApplicationController < Admin::ApplicationController def breadcrumb super - add_breadcrumb Features::Education.model_name.human, :admin_features_education_dashboard_path + add_breadcrumb 'Enseignement' end end diff --git a/app/controllers/admin/features/education/programs_controller.rb b/app/controllers/admin/features/education/programs_controller.rb index e2a30b7ba97dc451294896ddb6acbea3595650da..180fa38988e093b012ac458da910738bd2117aa5 100644 --- a/app/controllers/admin/features/education/programs_controller.rb +++ b/app/controllers/admin/features/education/programs_controller.rb @@ -46,10 +46,7 @@ class Admin::Features::Education::ProgramsController < Admin::Features::Educatio def breadcrumb super add_breadcrumb Features::Education::Program.model_name.human(count: 2), admin_features_education_programs_path - if @program - @program.persisted? ? add_breadcrumb(@program, [:admin, @program]) - : add_breadcrumb('Créer') - end + breadcrumb_for @program end def program_params diff --git a/app/controllers/admin/features/websites/sites_controller.rb b/app/controllers/admin/features/websites/sites_controller.rb index 8f7b03572cf6177fc115411ff2db11e856ea5560..5aac8fd87eb651b5d7cf063ef4a671354023020e 100644 --- a/app/controllers/admin/features/websites/sites_controller.rb +++ b/app/controllers/admin/features/websites/sites_controller.rb @@ -47,10 +47,7 @@ class Admin::Features::Websites::SitesController < Admin::Features::Websites::Ap def breadcrumb super add_breadcrumb Features::Websites::Site.model_name.human(count: 2), admin_features_websites_sites_path - if @site - @site.persisted? ? add_breadcrumb(@site, [:admin, @site]) - : add_breadcrumb('Créer') - end + breadcrumb_for @site end def site_params diff --git a/config/admin_navigation.rb b/config/admin_navigation.rb index cb2a2c85766d4e03c1e025deebacd586cd2bb12d..dcf622602bc81cea1204cb5c170f84ea17c89b25 100644 --- a/config/admin_navigation.rb +++ b/config/admin_navigation.rb @@ -4,14 +4,10 @@ SimpleNavigation::Configuration.run do |navigation| navigation.highlight_on_subpath = true navigation.selected_class = 'active' navigation.items do |primary| - primary.item :dashboard, t('dashboard'), admin_root_path, { icon: 'tachometer-alt' } + primary.item :dashboard, t('dashboard'), admin_root_path, { icon: 'tachometer-alt', highlights_on: /admin$/ } primary.item :teaching, 'Enseignement', nil, { kind: :header } - primary.item :education, 'Formations', nil, { icon: 'graduation-cap' } do |secondary| - secondary.item :dashboard, t('dashboard'), admin_features_education_dashboard_path - secondary.item :programs, Features::Education::Program.model_name.human(count: 2), admin_features_education_programs_path - secondary.item :qualiopi, Features::Education::Qualiopi.model_name.human, admin_features_education_qualiopi_criterions_path - end + primary.item :education, 'Formations', admin_features_education_programs_path, { icon: 'graduation-cap' } primary.item :teaching, 'Ecoles', nil, { icon: 'university' } primary.item :teaching, 'Enseignants', nil, { icon: 'user-graduate' } primary.item :teaching, 'Feedbacks', nil, { icon: 'comments' } @@ -24,10 +20,7 @@ SimpleNavigation::Configuration.run do |navigation| primary.item :teaching, 'Veille', nil, { icon: 'eye' } primary.item :teaching, 'Communication', nil, { kind: :header } - primary.item :websites, Features::Websites.model_name.human, nil, { icon: 'sitemap' } do |secondary| - secondary.item :dashboard, t('dashboard'), admin_features_websites_dashboard_path - secondary.item :sites, Features::Websites::Site.model_name.human(count: 2), admin_features_websites_sites_path - end + primary.item :websites, 'Sites Web', admin_features_websites_sites_path, { icon: 'sitemap' } primary.item :teaching, 'Lettres d\'information', nil, { icon: 'envelope' } primary.item :teaching, 'Alumni', nil, { icon: 'users' }