consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the admin header in the management section

Browse Source 
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.
This commit is contained in:
Javi Martín
2021-11-09 19:19:30 +01:00
parent 228a1d9090
commit 519a34b1f8
3 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/admin_helper.rb
View File

@@ -6,6 +6,8 @@ module AdminHelper
def namespaced_header_title def namespaced_header_title
if namespace == "moderation/budgets" if namespace == "moderation/budgets"
t("moderation.header.title") t("moderation.header.title")
elsif namespace == "management"
t("management.dashboard.index.title")
else else
t("#{namespace}.header.title") t("#{namespace}.header.title")
end end

18
app/views/layouts/_admin_header.html.erb
View File

@@ -34,15 +34,17 @@
<% end %> <% end %>
</div> </div>
<div id="responsive_menu"> <% if show_admin_menu?(current_user) || namespace != "management" %>
<div class="top-bar-right"> <div id="responsive_menu">
<ul class="menu" data-responsive-menu="medium-dropdown"> <div class="top-bar-right">
<%= render "shared/admin_login_items" %> <ul class="menu" data-responsive-menu="medium-dropdown">
<%= render "layouts/notification_item" %> <%= render "shared/admin_login_items", current_user: current_user %>
<%= render "devise/menu/login_items" %> <%= render "layouts/notification_item", current_user: current_user %>
</ul> <%= render "devise/menu/login_items", current_user: current_user %>
</ul>
</div>
</div> </div>
</div> <% end %>
</div> </div>
</div> </div>
</header> </header>

36
app/views/layouts/management.html.erb
View File

@@ -8,41 +8,7 @@
</head> </head>
<body class="admin"> <body class="admin">
<header class="header"> <%= render "layouts/admin_header", current_user: manager_logged_in %>
<div class="top-links">
<%= render "shared/locale_switcher" %>
<%= link_to root_path, class: "float-right" do %>
<%= t("admin.dashboard.index.back", org: setting["org_name"]) %>
<% end %>
</div>
<div class="expanded row admin-top-bar">
<div class="top-bar">
<div class="top-bar-left">
<h1>
<%= link_to management_root_path do %>
<%= setting["org_name"] %>
<br><small><%= t("management.dashboard.index.title") %></small>
<% end %>
</h1>
</div>
<% if show_admin_menu?(manager_logged_in) %>
<div id="responsive_menu">
<div class="top-bar-right">
<ul class="menu" data-responsive-menu="medium-dropdown">
<%= 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 %>
</ul>
</div>
</div>
<% end %>
</div>
</div>
</header>
<div class="menu-and-content"> <div class="menu-and-content">
<%= check_box_tag :show_menu, nil, false, role: "switch" %> <%= check_box_tag :show_menu, nil, false, role: "switch" %>