From 228a1d90904f08b94f069cf20b888033cad4443b Mon Sep 17 00:00:00 2001 From: Pierre Mesure Date: Fri, 23 Aug 2019 23:43:22 +0200 Subject: [PATCH 1/2] Add missing link and button on management interface --- app/views/layouts/management.html.erb | 5 +++++ spec/system/management_spec.rb | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index 5f8f77d32..db0b828ca 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -11,6 +11,10 @@
<%= render "shared/locale_switcher" %> + + <%= link_to root_path, class: "float-right" do %> + <%= t("admin.dashboard.index.back", org: setting["org_name"]) %> + <% end %>
@@ -29,6 +33,7 @@
    <%= render "shared/admin_login_items", current_user: manager_logged_in %> + <%= render "layouts/notification_item", current_user: manager_logged_in %> <%= render "devise/menu/login_items", current_user: manager_logged_in %>
diff --git a/spec/system/management_spec.rb b/spec/system/management_spec.rb index e05442287..78ddc11b6 100644 --- a/spec/system/management_spec.rb +++ b/spec/system/management_spec.rb @@ -2,6 +2,7 @@ require "rails_helper" describe "Management" do let(:user) { create(:user) } + before { Setting["org_name"] = "CONSUL" } scenario "Should show admin menu if logged user is admin" do create(:administrator, user: user) @@ -11,9 +12,12 @@ describe "Management" do click_link "Menu" click_link "Management" - expect(page).to have_content("My content") - expect(page).to have_content("My account") - expect(page).to have_content("Sign out") + expect(page).to have_link "Go back to CONSUL" + + expect(page).to have_link "You don't have new notifications" + expect(page).to have_link "My content" + expect(page).to have_link "My account" + expect(page).to have_link "Sign out" end scenario "Should not show admin menu if logged user is manager" do @@ -24,8 +28,11 @@ describe "Management" do click_link "Menu" click_link "Management" - expect(page).not_to have_content("My content") - expect(page).not_to have_content("My account") - expect(page).not_to have_content("Sign out") + expect(page).to have_link "Go back to CONSUL" + + expect(page).not_to have_content "You don't have new notifications" + expect(page).not_to have_content "My content" + expect(page).not_to have_content "My account" + expect(page).not_to have_content "Sign out" end end From 519a34b1f897342642452120d92c237fcf760014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 9 Nov 2021 19:19:30 +0100 Subject: [PATCH 2/2] Use the admin header in the management section Now that we also have the "go back to CONSUL" link, the layouts are so similar that it isn't worth it maintaining both of them separately. With this change, people using small screens also get the "menu" button in the management section, just like they do everywhere else. We're adding the `namespace != "management"` condition so the menu still shows up in the officing namespace. --- app/helpers/admin_helper.rb | 2 ++ app/views/layouts/_admin_header.html.erb | 18 ++++++------ app/views/layouts/management.html.erb | 36 +----------------------- 3 files changed, 13 insertions(+), 43 deletions(-) diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index 45c508107..1ec467ead 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -6,6 +6,8 @@ module AdminHelper def namespaced_header_title if namespace == "moderation/budgets" t("moderation.header.title") + elsif namespace == "management" + t("management.dashboard.index.title") else t("#{namespace}.header.title") end diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index 72ac224de..f8cd11365 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -34,15 +34,17 @@ <% end %>
-
-
-
    - <%= render "shared/admin_login_items" %> - <%= render "layouts/notification_item" %> - <%= render "devise/menu/login_items" %> -
+ <% if show_admin_menu?(current_user) || namespace != "management" %> +
+
+
    + <%= render "shared/admin_login_items", current_user: current_user %> + <%= render "layouts/notification_item", current_user: current_user %> + <%= render "devise/menu/login_items", current_user: current_user %> +
+
-
+ <% end %>
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index db0b828ca..182c12f4a 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -8,41 +8,7 @@ -
-
- <%= render "shared/locale_switcher" %> - - <%= link_to root_path, class: "float-right" do %> - <%= t("admin.dashboard.index.back", org: setting["org_name"]) %> - <% end %> -
- -
-
-
-

- <%= link_to management_root_path do %> - <%= setting["org_name"] %> -
<%= t("management.dashboard.index.title") %> - <% end %> -

-
- <% if show_admin_menu?(manager_logged_in) %> -
- -
-
    - <%= render "shared/admin_login_items", current_user: manager_logged_in %> - <%= render "layouts/notification_item", current_user: manager_logged_in %> - <%= render "devise/menu/login_items", current_user: manager_logged_in %> -
-
- -
- <% end %> -
-
-
+ <%= render "layouts/admin_header", current_user: manager_logged_in %>
<%= check_box_tag :show_menu, nil, false, role: "switch" %>