From 4b93437351b59dd2fb872cba1315b4726da4a148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 18 Feb 2020 18:23:04 +0100 Subject: [PATCH 1/5] Remove unused layout It isn't used since commit e5f9cf67. --- .../layouts/proposals_dashboard.html.erb | 67 ------------------- 1 file changed, 67 deletions(-) delete mode 100644 app/views/layouts/proposals_dashboard.html.erb diff --git a/app/views/layouts/proposals_dashboard.html.erb b/app/views/layouts/proposals_dashboard.html.erb deleted file mode 100644 index 050fde8a6..000000000 --- a/app/views/layouts/proposals_dashboard.html.erb +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - <%= render "layouts/tracking_data" %> - <%= render "layouts/meta_tags" %> - <%= content_for?(:title) ? yield(:title) : setting["org_name"] %> - <%= content_for :canonical %> - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application", "data-turbolinks-track" => "reload" %> - <%= csrf_meta_tags %> - <%= favicon_link_tag "favicon.ico" %> - <%= favicon_link_tag image_path_for("apple-touch-icon-200.png"), - rel: "icon apple-touch-icon", - sizes: "200x200", - type: "image/png" %> - <%= content_for :social_media_meta_tags %> - - <%= raw setting["per_page_code_head"] %> - - - <%= raw setting["per_page_code_body"] %> - -

<%= setting["org_name"] %>

- -
-
-
-
-
- <%= render "proposals_dashboard/menu" %> -
-
-
- -
- <%= render "layouts/header", with_subnavigation: false %> - -
-
- -
- -
- -
-
- <%= render "proposals_dashboard/menu" %> -
-
-
-
- <%= render "layouts/flash" %> - <%= render "layouts/dashboard/proposal_totals" %> - <%= render "layouts/dashboard/proposal_header" %> - <%= yield %> -
-
-
-
-
- - From 2363aa4c7699c3d82b5b98c73c57035f1e60b043 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 27 Mar 2020 12:59:58 +0100 Subject: [PATCH 2/5] Avoid using a mixin for side menu and content styles --- app/assets/stylesheets/admin.scss | 4 ---- app/assets/stylesheets/dashboard.scss | 4 ---- app/assets/stylesheets/layout.scss | 19 +++++++++++++++ app/assets/stylesheets/mixins.scss | 33 ++++----------------------- app/views/layouts/admin.html.erb | 2 +- app/views/layouts/dashboard.html.erb | 2 +- 6 files changed, 26 insertions(+), 38 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index b986816e6..d3709a73f 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -291,10 +291,6 @@ $sidebar-active: #f4fcd0; margin-right: rem-calc(12); } - .side-menu-and-admin-content { - @include side-menu-and-content; - } - .admin-content { .proposal-form { padding-top: 0; diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 7de561c42..cfa1985b4 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -16,10 +16,6 @@ // 01. Dashboard global // -------------------- -.dashboard-menu-and-content { - @include side-menu-and-content; -} - .proposal-title { display: inline-block; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 25c769a2a..1118019f1 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -449,6 +449,25 @@ a { margin-top: 0; } +.menu-and-content { + display: flex; + + > :first-child { + flex: 25%; + min-width: 250px; + + > :first-child { + height: 100%; + } + } + + > :last-child { + flex: 75%; + overflow-x: auto; + padding: $line-height !important; + } +} + // 02. Header // ---------- diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 289eb83a6..faef06d3f 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -1,9 +1,8 @@ // Table of Contents // // 01. Logo -// 02. Side menu and content -// 03. Orbit bullets -// 04. Direct uploads +// 02. Orbit bullets +// 03. Direct uploads // ------------------ // 01. Logo @@ -22,30 +21,8 @@ } } -// 02. Side menu and content -// ------------------------- - -@mixin side-menu-and-content { - display: flex; - - > :first-child { - flex: 25%; - min-width: 250px; - - > :first-child { - height: 100%; - } - } - - > :last-child { - flex: 75%; - overflow-x: auto; - padding: $line-height !important; - } -} - -// 03. Orbit bullet -// ---------------- +// 02. Orbit bullets +// ----------------- @mixin orbit-bullets { @include disable-mouse-outline; @@ -72,7 +49,7 @@ } } -// 04. Direct uploads +// 03. Direct uploads // ------------------ @mixin direct-uploads { diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index b73dc8fae..b4d0b39e6 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -19,7 +19,7 @@
<%= render "layouts/admin_header" %> -
+
<%= side_menu %>
diff --git a/app/views/layouts/dashboard.html.erb b/app/views/layouts/dashboard.html.erb index 2b20ca089..a52e740e2 100644 --- a/app/views/layouts/dashboard.html.erb +++ b/app/views/layouts/dashboard.html.erb @@ -38,7 +38,7 @@
<%= render "layouts/header", with_subnavigation: false %> -
+
<%= render "dashboard/menu" %> From 125106f9c0e354ba566a10946e5e69e6cb0337bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 30 Apr 2020 16:51:24 +0200 Subject: [PATCH 3/5] Simplify code to have an off-canvas menu While Foundations's off-canvas menu allows us to forget about writing CSS, it also leads to complicated HTML. Ideally Foundation would provide an easy way to simplify what we're doing, but I haven't found anything in the documentation. We could simplify the HTML a bit more if we used a CSS grid layout instead of a flex one, but old browsers have better support for the latter. Note we're using `breakpoint(medium)` so we can group the CSS for small screens and follow SCSS-Lint rules at the same time. Also note behavior of the main area when the menu appears on small screens is slightly different: it doesn't move the main content to the right. I've done it this way so we don't have any overflow issues, unlike the previous version. There's a small issue using a label and a checkbox to enable/disable the menu: sighted keyboard users with a small screen might not be able to enable the menu. So we're adding the `:focus-within` pseudoclass so the menu can be normally navigated using the keyboard. Even if old browsers don't support this pseudoclass, we believe the probability of a sighted user using a small screen, navigating with the keyboard and using an old browser is really low, particularly in the admin area. We're also adding the `aria-hidden` attribute on the label, since the menu is never hidden for screen readers and so having a control to show it could be confusing. Since the label is not focusable, we're complying with the fourth ARIA rule: > Do not use role="presentation" or aria-hidden="true" on a focusable > element . > > Using either of these on a focusable element will result in some users > focusing on 'nothing'. --- .../stylesheets/foundation_and_overrides.scss | 1 - app/assets/stylesheets/layout.scss | 65 ++- app/views/admin/_menu.html.erb | 540 +++++++++--------- app/views/layouts/admin.html.erb | 36 +- app/views/layouts/dashboard.html.erb | 43 +- app/views/layouts/management.html.erb | 2 +- app/views/management/_menu.html.erb | 122 ++-- app/views/moderation/_menu.html.erb | 96 ++-- 8 files changed, 453 insertions(+), 452 deletions(-) diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss index c4fa6944e..577b8476f 100644 --- a/app/assets/stylesheets/foundation_and_overrides.scss +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -31,7 +31,6 @@ @include foundation-responsive-embed; @include foundation-label; @include foundation-media-object; -@include foundation-off-canvas; @include foundation-orbit; @include foundation-pagination; @include foundation-progress-bar; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 1118019f1..153bf1638 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -436,10 +436,6 @@ a { display: table-cell; } -.off-canvas-content { - box-shadow: none; -} - .uppercase { text-transform: uppercase; } @@ -450,21 +446,62 @@ a { } .menu-and-content { - display: flex; + $side-menu-min-width: 250px; - > :first-child { - flex: 25%; - min-width: 250px; + @include breakpoint(medium) { + display: flex; - > :first-child { - height: 100%; + > nav { + flex: 25%; + min-width: $side-menu-min-width; + + + * { + flex: 75%; + padding: $line-height !important; + } + } + + [for="show_menu"] { + display: none; } } - > :last-child { - flex: 75%; - overflow-x: auto; - padding: $line-height !important; + @include breakpoint(small only) { + > nav { + height: 100%; + left: -$side-menu-min-width; + overflow-y: auto; + position: fixed; + top: 0; + transition: left 0.5s ease; + width: $side-menu-min-width; + z-index: 12; + + + * { + padding: $line-height !important; + } + } + + [name="show_menu"]:checked + nav, + > nav:focus-within { + left: 0; + + + * { + overflow-x: hidden; + + [for="show_menu"]::after { + @include reveal-overlay; + content: ""; + cursor: pointer; + display: block; + z-index: 11; + } + } + } + } + + [name="show_menu"] { + display: none; } } diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 6c61c7e84..b7a85121c 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -1,281 +1,279 @@ -
-
    - <% if feature?(:proposals) %> -
  • - <%= link_to admin_proposals_path do %> - - <%= t("admin.menu.proposals") %> - <% end %> -
    • - <% end %> - - <% if feature?(:debates) %> -
  • "> - <%= link_to admin_debates_path do %> - - <%= t("admin.menu.debates") %> - <% end %> -
    • - <% end %> - -
  • "> - <%= link_to admin_comments_path do %> - - <%= t("admin.menu.comments") %> +
      + <% if feature?(:proposals) %> +
    • + <%= link_to admin_proposals_path do %> + + <%= t("admin.menu.proposals") %> <% end %>
      • + <% end %> - <% if feature?(:polls) %> -
    • "> - <%= link_to admin_polls_path do %> - - <%= t("admin.menu.polls") %> - <% end %> -
      • - <% end %> - - <% if feature?(:legislation) %> -
    • "> - <%= link_to admin_legislation_processes_path do %> - - <%= t("admin.menu.legislation") %> - <% end %> -
      • - <% end %> - - <% if feature?(:budgets) %> -
    • "> - <%= link_to admin_budgets_path do %> - - <%= t("admin.menu.budgets") %> - <% end %> -
      • - <% end %> - -
    • - - - <%= t("admin.menu.title_booths") %> - -
        > -
      • > - <%= link_to t("admin.menu.poll_officers"), admin_officers_path %> -
        • - -
      • > - <%= link_to t("admin.menu.poll_booths"), admin_booths_path %> -
        • - -
      • > - <%= link_to t("admin.menu.poll_booth_assignments"), booth_assignments_admin_polls_path %> -
        • - -
      • > - <%= link_to t("admin.menu.poll_shifts"), available_admin_booths_path %> -
        • -
      -
      • - - <% if feature?(:signature_sheets) %> -
    • "> - <%= link_to admin_signature_sheets_path do %> - - <%= t("admin.menu.signature_sheets") %> - <% end %> -
      • - <% end %> - - <% messages_sections = %w[newsletters emails_download admin_notifications system_emails] %> - <% messages_menu_active = messages_sections.include?(controller_name) %> -
    • > - - - <%= t("admin.menu.messaging_users") %> - -
        > -
      • > - <%= link_to t("admin.menu.newsletters"), admin_newsletters_path %> -
        • -
      • > - <%= link_to t("admin.menu.admin_notifications"), admin_admin_notifications_path %> -
        • -
      • > - <%= link_to t("admin.menu.system_emails"), admin_system_emails_path %> -
        • -
      • > - <%= link_to t("admin.menu.emails_download"), admin_emails_download_index_path %> -
        • -
      -
      • - -
    • - - - <%= t("admin.menu.title_site_customization") %> - -
        > - -
      • > - <%= link_to t("admin.menu.site_customization.homepage"), admin_homepage_path %> -
        • - -
      • > - <%= link_to t("admin.menu.site_customization.pages"), admin_site_customization_pages_path %> -
        • - -
      • > - <%= link_to t("admin.menu.banner"), admin_banners_path %> -
        • - -
      • > - <%= link_to t("admin.menu.site_customization.information_texts"), admin_site_customization_information_texts_path %> -
        • - -
      • > - <%= link_to t("admin.menu.site_customization.documents"), - admin_site_customization_documents_path %> -
        • -
      -
      • - -
    • - - - <%= t("admin.menu.title_moderated_content") %> - -
        > - <% if feature?(:proposals) %> -
      • > - <%= link_to t("admin.menu.hidden_proposals"), admin_hidden_proposals_path %> -
        • - <% end %> - - <% if feature?(:debates) %> -
      • > - <%= link_to t("admin.menu.hidden_debates"), admin_hidden_debates_path %> -
        • - <% end %> - - <% if feature?(:budgets) %> -
      • > - <%= link_to t("admin.menu.hidden_budget_investments"), admin_hidden_budget_investments_path %> -
        • - <% end %> - -
      • > - <%= link_to t("admin.menu.hidden_comments"), admin_hidden_comments_path %> -
        • - -
      • > - <%= link_to t("admin.menu.hidden_proposal_notifications"), admin_hidden_proposal_notifications_path %> -
        • - -
      • > - <%= link_to t("admin.menu.hidden_users"), admin_hidden_users_path %> -
        • - -
      • > - <%= link_to t("admin.menu.activity"), admin_activity_path %> -
        • -
      -
      • - -
    • - - - <%= t("admin.menu.title_profiles") %> - -
        > -
      • > - <%= link_to t("admin.menu.administrators"), admin_administrators_path %> -
        • - -
      • > - <%= link_to t("admin.menu.organizations"), admin_organizations_path %> -
        • - -
      • > - <%= link_to t("admin.menu.officials"), admin_officials_path %> -
        • - -
      • > - <%= link_to t("admin.menu.moderators"), admin_moderators_path %> -
        • - -
      • > - <%= link_to t("admin.menu.valuators"), admin_valuators_path %> -
        • - -
      • > - <%= link_to t("admin.menu.managers"), admin_managers_path %> -
        • - -
      • > - <%= link_to t("admin.menu.users"), admin_users_path %> -
        • -
      -
      • - -
    • > - <%= link_to admin_stats_path do %> - <%= t("admin.menu.stats") %> + <% if feature?(:debates) %> +
    • "> + <%= link_to admin_debates_path do %> + + <%= t("admin.menu.debates") %> <% end %>
      • + <% end %> -
    • - - - <%= t("admin.menu.title_settings") %> - -
        > -
      • > - <%= link_to t("admin.menu.settings"), admin_settings_path %> -
        • +
      • "> + <%= link_to admin_comments_path do %> + + <%= t("admin.menu.comments") %> + <% end %> +
        • -
      • > - <%= link_to t("admin.menu.proposals_topics"), admin_tags_path %> -
        • - -
      • > - <%= link_to t("admin.menu.geozones"), admin_geozones_path %> -
        • - -
      • > - <%= link_to t("admin.menu.site_customization.images"), admin_site_customization_images_path %> -
        • - -
      • > - <%= link_to t("admin.menu.site_customization.content_blocks"), admin_site_customization_content_blocks_path %> -
        • - -
      • > - <%= link_to t("admin.menu.local_census_records"), admin_local_census_records_path %> -
        • -
      + <% if feature?(:polls) %> +
    • "> + <%= link_to admin_polls_path do %> + + <%= t("admin.menu.polls") %> + <% end %>
      • -
    • - - - <%= t("admin.menu.dashboard") %> - -
        > -
      • > - <%= link_to t("admin.menu.dashboard_actions"), admin_dashboard_actions_path %> -
        • + <% end %> -
      • > - <%= link_to admin_dashboard_administrator_tasks_path do %> - <%= t("admin.menu.administrator_tasks") %> - <% end %> -
        • -
      + <% if feature?(:legislation) %> +
    • "> + <%= link_to admin_legislation_processes_path do %> + + <%= t("admin.menu.legislation") %> + <% end %>
      • -
    -
+ <% end %> + + <% if feature?(:budgets) %> +
  • "> + <%= link_to admin_budgets_path do %> + + <%= t("admin.menu.budgets") %> + <% end %> +
    • + <% end %> + +
  • + + + <%= t("admin.menu.title_booths") %> + +
      > +
    • > + <%= link_to t("admin.menu.poll_officers"), admin_officers_path %> +
      • + +
    • > + <%= link_to t("admin.menu.poll_booths"), admin_booths_path %> +
      • + +
    • > + <%= link_to t("admin.menu.poll_booth_assignments"), booth_assignments_admin_polls_path %> +
      • + +
    • > + <%= link_to t("admin.menu.poll_shifts"), available_admin_booths_path %> +
      • +
    +
    • + + <% if feature?(:signature_sheets) %> +
  • "> + <%= link_to admin_signature_sheets_path do %> + + <%= t("admin.menu.signature_sheets") %> + <% end %> +
    • + <% end %> + + <% messages_sections = %w[newsletters emails_download admin_notifications system_emails] %> + <% messages_menu_active = messages_sections.include?(controller_name) %> +
  • > + + + <%= t("admin.menu.messaging_users") %> + +
      > +
    • > + <%= link_to t("admin.menu.newsletters"), admin_newsletters_path %> +
      • +
    • > + <%= link_to t("admin.menu.admin_notifications"), admin_admin_notifications_path %> +
      • +
    • > + <%= link_to t("admin.menu.system_emails"), admin_system_emails_path %> +
      • +
    • > + <%= link_to t("admin.menu.emails_download"), admin_emails_download_index_path %> +
      • +
    +
    • + +
  • + + + <%= t("admin.menu.title_site_customization") %> + +
      > + +
    • > + <%= link_to t("admin.menu.site_customization.homepage"), admin_homepage_path %> +
      • + +
    • > + <%= link_to t("admin.menu.site_customization.pages"), admin_site_customization_pages_path %> +
      • + +
    • > + <%= link_to t("admin.menu.banner"), admin_banners_path %> +
      • + +
    • > + <%= link_to t("admin.menu.site_customization.information_texts"), admin_site_customization_information_texts_path %> +
      • + +
    • > + <%= link_to t("admin.menu.site_customization.documents"), + admin_site_customization_documents_path %> +
      • +
    +
    • + +
  • + + + <%= t("admin.menu.title_moderated_content") %> + +
      > + <% if feature?(:proposals) %> +
    • > + <%= link_to t("admin.menu.hidden_proposals"), admin_hidden_proposals_path %> +
      • + <% end %> + + <% if feature?(:debates) %> +
    • > + <%= link_to t("admin.menu.hidden_debates"), admin_hidden_debates_path %> +
      • + <% end %> + + <% if feature?(:budgets) %> +
    • > + <%= link_to t("admin.menu.hidden_budget_investments"), admin_hidden_budget_investments_path %> +
      • + <% end %> + +
    • > + <%= link_to t("admin.menu.hidden_comments"), admin_hidden_comments_path %> +
      • + +
    • > + <%= link_to t("admin.menu.hidden_proposal_notifications"), admin_hidden_proposal_notifications_path %> +
      • + +
    • > + <%= link_to t("admin.menu.hidden_users"), admin_hidden_users_path %> +
      • + +
    • > + <%= link_to t("admin.menu.activity"), admin_activity_path %> +
      • +
    +
    • + +
  • + + + <%= t("admin.menu.title_profiles") %> + +
      > +
    • > + <%= link_to t("admin.menu.administrators"), admin_administrators_path %> +
      • + +
    • > + <%= link_to t("admin.menu.organizations"), admin_organizations_path %> +
      • + +
    • > + <%= link_to t("admin.menu.officials"), admin_officials_path %> +
      • + +
    • > + <%= link_to t("admin.menu.moderators"), admin_moderators_path %> +
      • + +
    • > + <%= link_to t("admin.menu.valuators"), admin_valuators_path %> +
      • + +
    • > + <%= link_to t("admin.menu.managers"), admin_managers_path %> +
      • + +
    • > + <%= link_to t("admin.menu.users"), admin_users_path %> +
      • +
    +
    • + +
  • > + <%= link_to admin_stats_path do %> + <%= t("admin.menu.stats") %> + <% end %> +
    • + +
  • + + + <%= t("admin.menu.title_settings") %> + +
      > +
    • > + <%= link_to t("admin.menu.settings"), admin_settings_path %> +
      • + +
    • > + <%= link_to t("admin.menu.proposals_topics"), admin_tags_path %> +
      • + +
    • > + <%= link_to t("admin.menu.geozones"), admin_geozones_path %> +
      • + +
    • > + <%= link_to t("admin.menu.site_customization.images"), admin_site_customization_images_path %> +
      • + +
    • > + <%= link_to t("admin.menu.site_customization.content_blocks"), admin_site_customization_content_blocks_path %> +
      • + +
    • > + <%= link_to t("admin.menu.local_census_records"), admin_local_census_records_path %> +
      • +
    +
    • +
  • + + + <%= t("admin.menu.dashboard") %> + +
      > +
    • > + <%= link_to t("admin.menu.dashboard_actions"), admin_dashboard_actions_path %> +
      • + +
    • > + <%= link_to admin_dashboard_administrator_tasks_path do %> + <%= t("admin.menu.administrator_tasks") %> + <% end %> +
      • +
    +
    • + diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index b4d0b39e6..edcb2288c 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -7,34 +7,22 @@ -
    -
    -
    + <%= render "layouts/admin_header" %> -
    - <%= side_menu %> -
    -
    +
    + <%= check_box_tag :show_menu, nil, false, role: "switch" %> -
    - <%= render "layouts/admin_header" %> + -
    -
    - <%= side_menu %> -
    +
    + <%= label_tag :show_menu, t("admin.menu.admin"), + "aria-hidden": true, class: "button hollow expanded" %> -
    -
    - -
    - - <%= render "layouts/flash" %> - <%= render "layouts/officing_booth" if controller.class.parent == Officing && session[:booth_id].present? %> - <%= yield %> -
    -
    -
    + <%= render "layouts/flash" %> + <%= render "layouts/officing_booth" if controller.class.parent == Officing && session[:booth_id].present? %> + <%= yield %>
    diff --git a/app/views/layouts/dashboard.html.erb b/app/views/layouts/dashboard.html.erb index a52e740e2..9e7786812 100644 --- a/app/views/layouts/dashboard.html.erb +++ b/app/views/layouts/dashboard.html.erb @@ -25,40 +25,23 @@

    <%= setting["org_name"] %>

    -
    -
    -
    -
    -
    - <%= render "dashboard/menu" %> -
    -
    -
    + <%= render "layouts/header", with_subnavigation: false %> -
    - <%= render "layouts/header", with_subnavigation: false %> +
    + <%= check_box_tag :show_menu, nil, false, role: "switch" %> -
    -
    -
    - <%= render "dashboard/menu" %> -
    -
    + -
    -
    - -
    +
    + <%= label_tag :show_menu, t("admin.menu.admin"), + "aria-hidden": true, class: "button hollow expanded" %> - <%= render "layouts/flash" %> - <%= render "layouts/dashboard/proposal_totals" %> - <%= render "layouts/dashboard/proposal_header" %> - <%= yield %> -
    -
    -
    + <%= render "layouts/flash" %> + <%= render "layouts/dashboard/proposal_totals" %> + <%= render "layouts/dashboard/proposal_header" %> + <%= yield %>
    diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index a3dc288f9..b16d1778e 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -46,7 +46,7 @@
    -
    +
    <%= render "/management/menu" %>
    diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb index 213e0ece4..2eb65d5b7 100644 --- a/app/views/management/_menu.html.erb +++ b/app/views/management/_menu.html.erb @@ -1,68 +1,66 @@ -
    -
      -
    • - - - <%= t("management.menu.users") %> - -
        +
          +
        • + + + <%= t("management.menu.users") %> + +
            -
          • > - <%= link_to t("management.menu.select_user"), management_document_verifications_path %> -
            • - - <% if managed_user.email %> -
          • > - <%= link_to t("management.account.menu.reset_password_email"), edit_password_email_management_account_path %> -
            • - <% end %> - -
          • > - <%= link_to t("management.account.menu.reset_password_manually"), edit_password_manually_management_account_path %> -
            • - -
          • > - <%= link_to t("management.menu.create_proposal"), new_management_proposal_path %> -
            • - -
          • > - <%= link_to t("management.menu.support_proposals"), management_proposals_path %> -
            • - - <% if Setting["process.budgets"] %> -
          • > - <%= link_to t("management.menu.create_budget_investment"), create_investments_management_budgets_path %> -
            • - -
          • > - <%= link_to t("management.menu.support_budget_investments"), support_investments_management_budgets_path %> -
            • - <% end %> +
          • > + <%= link_to t("management.menu.select_user"), management_document_verifications_path %>
            • -
          + + <% if managed_user.email %> +
        • > + <%= link_to t("management.account.menu.reset_password_email"), edit_password_email_management_account_path %> +
          • + <% end %> + +
        • > + <%= link_to t("management.account.menu.reset_password_manually"), edit_password_manually_management_account_path %> +
          • + +
        • > + <%= link_to t("management.menu.create_proposal"), new_management_proposal_path %> +
          • + +
        • > + <%= link_to t("management.menu.support_proposals"), management_proposals_path %> +
          • + + <% if Setting["process.budgets"] %> +
        • > + <%= link_to t("management.menu.create_budget_investment"), create_investments_management_budgets_path %> +
          • + +
        • > + <%= link_to t("management.menu.support_budget_investments"), support_investments_management_budgets_path %> +
          • + <% end %> +
        + - <% if Setting["process.budgets"] %> -
      • > - <%= link_to print_investments_management_budgets_path do %> - - <%= t("management.menu.print_budget_investments") %> - <% end %> -
        • + <% if Setting["process.budgets"] %> +
      • > + <%= link_to print_investments_management_budgets_path do %> + + <%= t("management.menu.print_budget_investments") %> + <% end %> +
        • + <% end %> + +
      • > + <%= link_to print_management_proposals_path do %> + + <%= t("management.menu.print_proposals") %> <% end %> +
        • -
      • > - <%= link_to print_management_proposals_path do %> - - <%= t("management.menu.print_proposals") %> - <% end %> -
        • - -
      • > - <%= link_to new_management_user_invite_path do %> - - <%= t("management.menu.user_invites") %> - <% end %> -
        • -
      -
    +
  • > + <%= link_to new_management_user_invite_path do %> + + <%= t("management.menu.user_invites") %> + <% end %> +
    • + diff --git a/app/views/moderation/_menu.html.erb b/app/views/moderation/_menu.html.erb index 3437a731f..800b1551c 100644 --- a/app/views/moderation/_menu.html.erb +++ b/app/views/moderation/_menu.html.erb @@ -1,55 +1,53 @@ - + <% end %> + + <% if feature?(:debates) %> +
  • > + <%= link_to moderation_debates_path do %> + + <%= t("moderation.menu.flagged_debates") %> + <% end %> +
    • + <% end %> + + <% if feature?(:budgets) %> +
  • > + <%= link_to moderation_budget_investments_path do %> + + <%= t("moderation.menu.flagged_investments") %> + <% end %> +
    • + <% end %> + +
  • > + <%= link_to moderation_comments_path do %> + + <%= t("moderation.menu.flagged_comments") %> + <% end %> +
    • + +
  • > + <%= link_to moderation_users_path do %> + + <%= t("moderation.menu.users") %> + <% end %> +
    • + From a293dc013d1d10569935b7b389a4d2a7abebcbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 9 May 2020 00:21:12 +0200 Subject: [PATCH 4/5] Make management layout similar to admin layout The
    tag was including the navigation, and now we use the same flex layout, making it more accessible for mobile phone users. I'm not sure the
    tag should actually include the account info and the flash message. I'm keeping it like this in order to keep the layout the way it was. --- app/assets/stylesheets/admin.scss | 2 +- app/views/layouts/management.html.erb | 19 +++--- app/views/management/_account_info.html.erb | 65 ++++++++++----------- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index d3709a73f..8dc11daae 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -648,7 +648,7 @@ code { border-radius: rem-calc(3); font-size: rem-calc(16); font-weight: normal; - margin: $line-height; + margin-bottom: $line-height; padding: $line-height / 2; strong { diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index b16d1778e..449b20a76 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -45,18 +45,21 @@
    -
    -
    +
    + <%= check_box_tag :show_menu, nil, false, role: "switch" %> + +
    + - <%= render "management/account_info" %> +
    + <%= label_tag :show_menu, t("admin.menu.admin"), + "aria-hidden": true, class: "button hollow expanded" %> -
    + <%= render "management/account_info" %> <%= render "layouts/flash" %> <%= yield %> -
    -
    - +
    +
    diff --git a/app/views/management/_account_info.html.erb b/app/views/management/_account_info.html.erb index 28f141ba9..cb262a9ef 100644 --- a/app/views/management/_account_info.html.erb +++ b/app/views/management/_account_info.html.erb @@ -1,43 +1,40 @@ <% if managed_user.document_number.present? %> -
    - + <% end %> + + <% if managed_user.email.present? %> +

    + <%= t("management.account_info.email_label") %> + <%= managed_user.email %> +

    + <% end %> + +

    + <%= t("management.account_info.document_type_label") %> + <%= humanize_document_type(managed_user.document_type) %> +

    + +

    + <%= t("management.account_info.document_number_label") %> + <%= managed_user.document_number %> +

    <% end %> From fc3a7618b10fa4a3df58c53ba97f470904cd2568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 9 May 2020 00:27:39 +0200 Subject: [PATCH 5/5] Simplify method to render admin menu The `side_menu` helper method isn't necessary since commit 13b3d9cebc. --- app/helpers/admin_helper.rb | 8 -------- app/views/layouts/admin.html.erb | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index 119bbe125..44a878bf1 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -1,12 +1,4 @@ module AdminHelper - def side_menu - if namespace == "moderation/budgets" - render "/moderation/menu" - else - render "/#{namespace}/menu" - end - end - def namespaced_root_path "/#{namespace}" end diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index edcb2288c..d25288dc2 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -13,7 +13,7 @@ <%= check_box_tag :show_menu, nil, false, role: "switch" %>