From 2c2646d0a76a56123e620a23740c9b3f350f6e74 Mon Sep 17 00:00:00 2001
From: Manuel Lucena <mlucenap@venet.com.ve>
Date: Wed, 13 Sep 2017 17:40:55 +0200
Subject: [PATCH 1/3] =?UTF-8?q?20170912=20-=20Disabled=20user=20questions?=
 =?UTF-8?q?=20for=20polls=20into=20budgets=20view.=20=20=E2=80=A6=20=20Com?=
 =?UTF-8?q?mitter:=20Manuel=20Lucena=20<mlucenap@venet.com.ve>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 On branch mlucena-admin-menu
 Changes to be committed:
	modified:   app/views/admin/_menu.html.erb
---
 app/views/admin/_menu.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index e629f5807..ce7c6357c 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -65,7 +65,7 @@
             <%= link_to t('admin.menu.polls'), admin_polls_path %>
           </li>
 
-          <li <%= "class=active" if controller_name == "questions" %>>
+          <li <%= "class=active" if controller_name == "questions" && controller.class.parent != Admin::Legislation %>>
             <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
           </li>
 

From 823031af3193ee7ae3fca6eebe549ee889ff5b20 Mon Sep 17 00:00:00 2001
From: Manuel Lucena <mlucenap@venet.com.ve>
Date: Fri, 15 Sep 2017 10:38:08 +0200
Subject: [PATCH 2/3] 20170915 - Fixed behavior for sub menus under legislation
 section  On branch mlucena-admin-menu  Changes to be committed: 
 modified:   app/views/admin/_menu.html.erb

---
 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 ce7c6357c..ebb76d301 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -59,8 +59,8 @@
         <a href="#">
           <span class="icon-checkmark-circle"></span>
           <strong><%= t("admin.menu.title_polls") %></strong>
-        </a>
-        <ul id="polls_menu" <%= "class=is-active" if menu_polls? %>>
+        </a>       
+        <ul id="polls_menu" <%= "class=is-active" if menu_polls? && controller.class.parent != Admin::Legislation %>>
           <li <%= "class=active" if ["polls", "officer_assignments", "booth_assignments", "recounts", "results"].include? controller_name  %>>
             <%= link_to t('admin.menu.polls'), admin_polls_path %>
           </li>

From e93ac4e570b2f7d1b58029a62c9be619eeb04cb4 Mon Sep 17 00:00:00 2001
From: Manuel Lucena <mlucenap@venet.com.ve>
Date: Fri, 15 Sep 2017 11:10:48 +0200
Subject: [PATCH 3/3] 20170915 - fixed additional spacing and implemented
 suggested change of controller conditions

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

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index ebb76d301..37fe96544 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -59,13 +59,13 @@
         <a href="#">
           <span class="icon-checkmark-circle"></span>
           <strong><%= t("admin.menu.title_polls") %></strong>
-        </a>       
-        <ul id="polls_menu" <%= "class=is-active" if menu_polls? && controller.class.parent != Admin::Legislation %>>
-          <li <%= "class=active" if ["polls", "officer_assignments", "booth_assignments", "recounts", "results"].include? controller_name  %>>
+        </a>
+        <ul id="polls_menu" <%= "class=is-active" if menu_polls? && controller.class.parent == Admin::Poll::QuestionsController %>>
+          <li <%= "class=active" if ["polls", "officer_assignments", "booth_assignments", "recounts", "results"].include? controller_name %>>
             <%= link_to t('admin.menu.polls'), admin_polls_path %>
           </li>
 
-          <li <%= "class=active" if controller_name == "questions" && controller.class.parent != Admin::Legislation %>>
+          <li <%= "class=active" if controller_name == "questions" && controller.class.parent == Admin::Poll::QuestionsController %>>
             <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
           </li>
 
@@ -73,13 +73,13 @@
             <%= link_to t('admin.menu.poll_officers'), admin_officers_path %>
           </li>
 
-          <li <%= "class=active" if controller_name == "booths" && 
+          <li <%= "class=active" if controller_name == "booths" &&
                                     action_name != "available" %>>
             <%= link_to t('admin.menu.poll_booths'), admin_booths_path %>
           </li>
 
-          <li <%= "class=active" if controller_name == "shifts" || 
-                                    controller_name == "booths" && 
+          <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>