From 3b2f3ae40bf57e6f7ea35bc3f0186855bd3c3945 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Sat, 21 Oct 2017 18:20:09 +0200
Subject: [PATCH 1/2] changes admin menu order

---
 app/views/admin/_menu.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 0518aa0e3..2cc44711f 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -80,15 +80,15 @@
             <%= link_to t('admin.menu.poll_booths'), admin_booths_path %>
           </li>
 
+          <li <%= "class=active" if (controller_name == "polls" && action_name == "booth_assignments") || (controller_name == "booth_assignments" && action_name == "manage") %>>
+            <%= link_to t('admin.menu.poll_booth_assignments'), booth_assignments_admin_polls_path %>
+          </li>
+
           <li <%= "class=active" if controller_name == "shifts" ||
                                     controller_name == "booths" &&
                                     action_name == "available" %>>
             <%= link_to t('admin.menu.poll_shifts'), available_admin_booths_path %>
           </li>
-
-          <li <%= "class=active" if (controller_name == "polls" && action_name == "booth_assignments") || (controller_name == "booth_assignments" && action_name == "manage") %>>
-            <%= link_to t('admin.menu.poll_booth_assignments'), booth_assignments_admin_polls_path %>
-          </li>
         </ul>
       </li>
     <% end %>

From e0a1a73e0b2b8c95ab2d0089866a56c1d8645831 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Sat, 21 Oct 2017 18:20:26 +0200
Subject: [PATCH 2/2] fixes active class on polls admin menu

---
 app/views/admin/_menu.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 2cc44711f..f3abf04aa 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -60,8 +60,8 @@
           <strong><%= t("admin.menu.title_polls") %></strong>
         </a>
         <ul id="polls_menu" <%= "class=is-active" if menu_polls? || controller.class.parent == Admin::Poll::Questions::Answers %>>
-          <li <%= "class=active" if ["polls", "officer_assignments", "booth_assignments", "recounts", "results"].include? controller_name &&
-                                    action_name != "booth_assignments" %>>
+          <li <%= "class=active" if controller_name == "polls" && action_name != "booth_assignments" ||
+                                    (["booth_assignments", "officer_assignments", "recounts", "results"].include? controller_name) %>>
             <%= link_to t('admin.menu.polls'), admin_polls_path %>
           </li>