From 631ea77cf706119b14ad1d025ad7c4d04ed90dac Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 19 Jul 2017 18:34:07 +0200
Subject: [PATCH] adds dropdown on admin menu items

---
 app/assets/stylesheets/layout.scss           | 26 +++++++++
 app/views/layouts/_header.html.erb           |  2 +-
 app/views/shared/_admin_login_items.html.erb | 57 +++++++++++---------
 config/locales/en/general.yml                |  1 +
 config/locales/es/general.yml                |  1 +
 5 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 9ac0f2549..0f0c3072e 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -412,6 +412,32 @@ header {
       box-shadow: 0 7px 0 #fff, 0 14px 0 #fff;
     }
   }
+
+  .menu {
+
+    &.is-dropdown-submenu {
+      margin: 0;
+      margin-top: rem-calc(-24);
+      padding: 0;
+    }
+
+    .is-submenu-item {
+      display: block;
+      height: auto;
+      margin-bottom: 0;
+
+      a {
+        color: $text;
+      }
+    }
+  }
+}
+
+.dropdown.menu > li {
+
+  &.is-dropdown-submenu-parent > a::after {
+    border-color: #fff transparent transparent;
+  }
 }
 
 .top-links {
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index a3162bb8c..304c5c954 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -28,7 +28,7 @@
         </div>
 
         <div class="top-bar-right">
-          <ul class="menu">
+          <ul class="dropdown menu" data-dropdown-menu>
             <%= render "shared/admin_login_items" %>
             <%= render "devise/menu/login_items" %>
           </ul>
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb
index 13bbb9d01..7bd673a30 100644
--- a/app/views/shared/_admin_login_items.html.erb
+++ b/app/views/shared/_admin_login_items.html.erb
@@ -1,32 +1,37 @@
 <% if current_user %>
-  <% if current_user.administrator? %>
-    <li>
-      <%= link_to t("layouts.header.administration"), admin_root_path %>
-    </li>
-  <% end %>
+<li>
+  <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow" %>
+  <ul class="menu">
+    <% if current_user.administrator? %>
+      <li>
+        <%= link_to t("layouts.header.administration"), admin_root_path %>
+      </li>
+    <% end %>
 
-  <% if current_user.administrator? || current_user.moderator? %>
-    <li>
-      <%= link_to t("layouts.header.moderation"), moderation_root_path %>
-    </li>
-  <% end %>
+    <% if current_user.administrator? || current_user.moderator? %>
+      <li>
+        <%= link_to t("layouts.header.moderation"), moderation_root_path %>
+      </li>
+    <% end %>
 
-  <% if (feature?(:spending_proposals) || feature?(:budgets)) &&
-        (current_user.administrator? || current_user.valuator?) %>
-    <li>
-      <%= link_to t("layouts.header.valuation"), valuation_root_path %>
-    </li>
-  <% end %>
+    <% if (feature?(:spending_proposals) || feature?(:budgets)) &&
+          (current_user.administrator? || current_user.valuator?) %>
+      <li>
+        <%= link_to t("layouts.header.valuation"), valuation_root_path %>
+      </li>
+    <% end %>
 
-  <% if current_user.administrator? || current_user.manager? %>
-    <li>
-      <%= link_to t("layouts.header.management"), management_sign_in_path %>
-    </li>
-  <% end %>
+    <% if current_user.administrator? || current_user.manager? %>
+      <li>
+        <%= link_to t("layouts.header.management"), management_sign_in_path %>
+      </li>
+    <% end %>
 
-  <% if current_user.administrator? || current_user.poll_officer? %>
-    <li>
-      <%= link_to t("layouts.header.officing"), officing_root_path %>
-    </li>
-  <% end %>
+    <% if current_user.administrator? || current_user.poll_officer? %>
+      <li>
+        <%= link_to t("layouts.header.officing"), officing_root_path %>
+      </li>
+    <% end %>
+  </ul>
+</li>
 <% end %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index fd5a128b8..8ded69018 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -191,6 +191,7 @@ en:
       transparency_title: Transparency
       transparency_url: https://transparency.consul
     header:
+      administration_menu: Administration
       administration: Administration
       available_locales: Available languages
       collaborative_legislation: Legislation processes
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 941a03813..043d73f4e 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -191,6 +191,7 @@ es:
       transparency_title: Transparencia
       transparency_url: https://transparency.consul
     header:
+      administration_menu: Administración
       administration: Administrar
       available_locales: Idiomas disponibles
       collaborative_legislation: Procesos legislativos