From b3f41eb626e20d3ed9de5b93d213dc04f8d320fd Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Mon, 7 May 2018 17:49:36 +0200
Subject: [PATCH] Reorders admin menu sections

---
 app/helpers/admin_helper.rb    |  14 +-
 app/views/admin/_menu.html.erb | 282 +++++++++++++++++----------------
 2 files changed, 148 insertions(+), 148 deletions(-)

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index c88deba56..ce92b0da5 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -12,12 +12,8 @@ module AdminHelper
     t("#{namespace}.header.title")
   end
 
-  def menu_tags?
-    ["tags"].include?(controller_name)
-  end
-
   def menu_moderated_content?
-    ["proposals", "debates", "comments", "hidden_users"].include?(controller_name) && controller.class.parent != Admin::Legislation
+    ["proposals", "debates", "comments", "hidden_users", "activity"].include?(controller_name) && controller.class.parent != Admin::Legislation
   end
 
   def menu_budget?
@@ -29,15 +25,15 @@ module AdminHelper
   end
 
   def menu_profiles?
-    %w[administrators organizations officials moderators valuators managers users activity].include?(controller_name)
+    %w[administrators organizations officials moderators valuators managers users].include?(controller_name)
   end
 
-  def menu_banners?
-    ["banners"].include?(controller_name)
+  def menu_settings?
+    ["settings", "tags", "geozones", "images", "content_blocks"].include?(controller_name)
   end
 
   def menu_customization?
-    ["pages", "images", "content_blocks"].include?(controller_name) || menu_homepage?
+    ["pages", "banners"].include?(controller_name) || menu_homepage?
   end
 
   def menu_homepage?
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index d1663652c..7b1dd9044 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,18 +1,130 @@
 <div class="admin-sidebar" data-equalizer-watch>
   <ul id="admin_menu" data-accordion-menu data-multi-open="false">
+    <% if feature?(:polls) %>
+      <li class="section-title">
+        <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::Poll::Questions::Answers %>>
+          <li <%= "class=is-active" if controller_name == "polls" && action_name != "booth_assignments" ||
+                                    %w(booth_assignments officer_assignments recounts results).include?(controller_name) %>>
+            <%= link_to t("admin.menu.polls"), admin_polls_path %>
+          </li>
 
-    <li class="section-title">
+          <li <%= "class=is-active" if %w(questions answers).include?(controller_name) ||
+                                    controller.class.parent == Admin::Poll::Questions::Answers %>>
+            <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
+          </li>
+
+          <li <%= "class=is-active" if controller_name == "officers" %>>
+            <%= link_to t("admin.menu.poll_officers"), admin_officers_path %>
+          </li>
+
+          <li <%= "class=is-active" if controller_name == "booths" &&
+                                    action_name != "available" %>>
+            <%= link_to t("admin.menu.poll_booths"), admin_booths_path %>
+          </li>
+
+          <li <%= "class=is-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=is-active" if %w(shifts booths).include?(controller_name) &&
+                                    action_name == "available" %>>
+            <%= link_to t("admin.menu.poll_shifts"), available_admin_booths_path %>
+          </li>
+        </ul>
+      </li>
+    <% end %>
+
+    <% if feature?(:legislation) %>
+      <li class="section-title <%= "is-active" if controller.class.parent == Admin::Legislation %>">
+        <%= link_to admin_legislation_processes_path do %>
+          <span class="icon-file-text"></span>
+          <strong><%= t("admin.menu.legislation") %></strong>
+        <% end %>
+      </li>
+    <% end %>
+
+    <% if feature?(:budgets) %>
+      <li class="section-title <%= "is-active" if controller_name == "budgets" %>">
+        <%= link_to admin_budgets_path do %>
+          <span class="icon-budget"></span>
+          <strong><%= t("admin.menu.budgets") %></strong>
+        <% end %>
+      </li>
+    <% end %>
+
+    <% if feature?(:spending_proposals) %>
+      <li class="section-title">
+        <a href="#">
+          <span class="icon-budget"></span>
+          <strong><%= t("admin.menu.title_budgets") %></strong>
+        </a>
+        <ul <%= "class=is-active" if menu_budget? %>>
+          <li <%= "class=is-active" if controller_name == "spending_proposals" %>>
+            <%= link_to t("admin.menu.spending_proposals"), admin_spending_proposals_path %>
+          </li>
+        </ul>
+      </li>
+    <% end %>
+
+    <% messages_sections = %w(newsletters emails_download admin_notifications system_emails) %>
+    <% messages_menu_active = messages_sections.include?(controller_name) %>
+    <li class="section-title" <%= "class=is-active" if messages_menu_active %>>
       <a href="#">
-        <span class="icon-proposals"></span>
-        <strong><%= t("admin.menu.title_categories") %></strong>
+        <span class="icon-zip"></span>
+        <strong><%= t("admin.menu.messaging_users") %></strong>
       </a>
-      <ul <%= "class=is-active" if menu_tags? %>>
-        <li <%= "class=is-active" if controller_name == "tags" %>>
-          <%= link_to t("admin.menu.proposals_topics"), admin_tags_path %>
+      <ul <%= "class=is-active" if messages_menu_active %>>
+        <li <%= "class=is-active" if controller_name == "newsletters" %>>
+          <%= link_to t("admin.menu.newsletters"), admin_newsletters_path %>
+        </li>
+        <li <%= "class=is-active" if controller_name == "admin_notifications" %>>
+          <%= link_to t("admin.menu.admin_notifications"), admin_admin_notifications_path %>
+        </li>
+        <li <%= "class=is-active" if controller_name == "system_emails" %>>
+          <%= link_to t("admin.menu.system_emails"), admin_system_emails_path %>
+        </li>
+        <li <%= "class=is-active" if controller_name == "emails_download" %>>
+          <%= link_to t("admin.menu.emails_download"), admin_emails_download_index_path %>
         </li>
       </ul>
     </li>
 
+    <li class="section-title">
+      <a href="#">
+        <span class="icon-edit"></span>
+        <strong><%= t("admin.menu.title_site_customization") %></strong>
+      </a>
+      <ul <%= "class=is-active" if menu_customization? &&
+                                   controller.class.parent != Admin::Poll::Questions::Answers %>>
+
+        <li <%= "class=active" if menu_homepage? %>>
+          <%= link_to t("admin.menu.site_customization.homepage"), admin_homepage_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "pages" %>>
+          <%= link_to t("admin.menu.site_customization.pages"), admin_site_customization_pages_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "banners" %>>
+          <%= link_to t("admin.menu.banner"), admin_banners_path %>
+        </li>
+      </ul>
+    </li>
+
+    <% if feature?(:signature_sheets) %>
+      <li class="section-title <%= "is-active" if controller_name == "signature_sheets" %>">
+        <%= link_to admin_signature_sheets_path do %>
+          <span class="icon-file-text-o"></span>
+          <strong><%= t("admin.menu.signature_sheets") %></strong>
+        <% end %>
+      </li>
+    <% end %>
+
     <li class="section-title">
       <a href="#">
         <span class="icon-eye"></span>
@@ -38,71 +150,13 @@
         <li <%= "class=is-active" if controller_name == "hidden_users" %>>
           <%= link_to t("admin.menu.hidden_users"), admin_hidden_users_path %>
         </li>
+
+        <li <%= "class=is-active" if controller_name == "activity" %>>
+          <%= link_to t("admin.menu.activity"), admin_activity_path %>
+        </li>
       </ul>
     </li>
 
-    <% if feature?(:spending_proposals) %>
-      <li class="section-title">
-        <a href="#">
-          <span class="icon-budget"></span>
-          <strong><%= t("admin.menu.title_budgets") %></strong>
-        </a>
-        <ul <%= "class=is-active" if menu_budget? %>>
-          <li <%= "class=is-active" if controller_name == "spending_proposals" %>>
-            <%= link_to t("admin.menu.spending_proposals"), admin_spending_proposals_path %>
-          </li>
-        </ul>
-      </li>
-    <% end %>
-
-    <% if feature?(:polls) %>
-      <li class="section-title">
-        <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::Poll::Questions::Answers %>>
-          <li <%= "class=is-active" if controller_name == "polls" && action_name != "booth_assignments" ||
-                                    %w(booth_assignments officer_assignments recounts results).include?(controller_name) %>>
-            <%= link_to t('admin.menu.polls'), admin_polls_path %>
-          </li>
-
-          <li <%= "class=is-active" if %w(questions answers).include?(controller_name) ||
-                                    controller.class.parent == Admin::Poll::Questions::Answers %>>
-            <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
-          </li>
-
-          <li <%= "class=is-active" if controller_name == "officers" %>>
-            <%= link_to t('admin.menu.poll_officers'), admin_officers_path %>
-          </li>
-
-          <li <%= "class=is-active" if controller_name == "booths" &&
-                                    action_name != "available" %>>
-            <%= link_to t('admin.menu.poll_booths'), admin_booths_path %>
-          </li>
-
-          <li <%= "class=is-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=is-active" if %w(shifts booths).include?(controller_name) &&
-                                    action_name == "available" %>>
-            <%= link_to t('admin.menu.poll_shifts'), available_admin_booths_path %>
-          </li>
-        </ul>
-      </li>
-    <% end %>
-
-    <% if feature?(:budgets) %>
-      <li class="section-title <%= "is-active" if controller_name == "budgets" %>">
-        <%= link_to admin_budgets_path do %>
-          <span class="icon-budget"></span>
-          <strong><%= t("admin.menu.budgets") %></strong>
-        <% end %>
-      </li>
-    <% end %>
-
     <li class="section-title">
       <a href="#">
         <span class="icon-organizations"></span>
@@ -121,58 +175,46 @@
           <%= link_to t("admin.menu.officials"), admin_officials_path %>
         </li>
 
-        <li <%= "class=is-active" if %w(moderators activity).include?(controller_name) %>>
-          <%= link_to t('admin.menu.moderators'), admin_moderators_path%>
+        <li <%= "class=is-active" if controller_name == "moderators" %>>
+          <%= link_to t("admin.menu.moderators"), admin_moderators_path%>
         </li>
 
         <li <%= "class=is-active" if controller_name == "valuators" %>>
-          <%= link_to t('admin.menu.valuators'), admin_valuators_path %>
+          <%= link_to t("admin.menu.valuators"), admin_valuators_path %>
         </li>
 
         <li <%= "class=is-active" if controller_name == "managers" %>>
-          <%= link_to t('admin.menu.managers'), admin_managers_path %>
+          <%= link_to t("admin.menu.managers"), admin_managers_path %>
         </li>
 
-        <li <%= 'class=is-active' if controller_name == 'users' %>>
-          <%= link_to t('admin.menu.users'), admin_users_path %>
+        <li <%= "class=is-active" if controller_name == "users" %>>
+          <%= link_to t("admin.menu.users"), admin_users_path %>
         </li>
       </ul>
     </li>
 
-    <% if feature?(:legislation) %>
-      <li class="section-title <%= "is-active" if controller.class.parent == Admin::Legislation %>">
-        <%= link_to admin_legislation_processes_path do %>
-          <span class="icon-file-text"></span>
-          <strong><%= t("admin.menu.legislation") %></strong>
-        <% end %>
-      </li>
-    <% end %>
-
-    <li class="section-title">
-      <a href="#">
-        <span class="icon-banner"></span>
-        <strong><%= t("admin.menu.title_banners") %></strong>
-      </a>
-      <ul <%= "class=is-active" if menu_banners? %>>
-        <li <%= "class=is-active" if controller_name == "banners" %>>
-          <%= link_to t("admin.menu.banner"), admin_banners_path %>
-        </li>
-      </ul>
+    <li class="section-title" <%= "class=is-active" if controller_name == "stats" %>>
+      <%= link_to admin_stats_path do %>
+        <span class="icon-stats"></span><%= t("admin.menu.stats") %>
+      <% end %>
     </li>
 
     <li class="section-title">
       <a href="#">
-        <span class="icon-edit"></span>
-        <strong><%= t("admin.menu.title_site_customization") %></strong>
+        <span class="icon-settings"></span>
+        <strong><%= t("admin.menu.title_settings") %></strong>
       </a>
-      <ul <%= "class=is-active" if menu_customization? &&
-                                   controller.class.parent != Admin::Poll::Questions::Answers %>>
-        <li <%= "class=active" if menu_homepage? %>>
-          <%= link_to t("admin.menu.site_customization.homepage"), admin_homepage_path %>
+      <ul <%="class=is-active" if menu_settings? %>>
+        <li <%= "class=is-active" if controller_name == "settings" %>>
+          <%= link_to t("admin.menu.settings"), admin_settings_path %>
         </li>
 
-        <li <%= "class=active" if controller_name == "pages" %>>
-          <%= link_to t("admin.menu.site_customization.pages"), admin_site_customization_pages_path %>
+        <li <%= "class=is-active" if controller_name == "tags" %>>
+          <%= link_to t("admin.menu.proposals_topics"), admin_tags_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "geozones" %>>
+          <%= link_to t("admin.menu.geozones"), admin_geozones_path %>
         </li>
 
         <li <%= "class=is-active" if controller_name == "images" &&
@@ -186,43 +228,5 @@
 
       </ul>
     </li>
-
-    <li class="section-title <%= "is-active" if controller_name == "geozones" %>">
-      <%= link_to admin_geozones_path do %>
-        <span class="icon-map-marker"></span>
-        <strong><%= t('admin.menu.geozones') %></strong>
-      <% end %>
-    </li>
-
-    <% if feature?(:signature_sheets) %>
-      <li class="section-title <%= "is-active" if controller_name == "signature_sheets" %>">
-        <%= link_to admin_signature_sheets_path do %>
-          <span class="icon-file-text-o"></span>
-          <strong><%= t("admin.menu.signature_sheets") %></strong>
-        <% end %>
-      </li>
-    <% end %>
-
-    <li class="section-title" <%= "class=is-active" if %w(newsletters emails_download).include?(controller_name) %>>
-      <a href="#">
-        <span class="icon-zip"></span>
-        <strong><%= t("admin.menu.emails") %></strong>
-      </a>
-      <ul id="emails_menu" <%= "class=is-active" if %w(newsletters emails_download).include?(controller_name) %>>
-        <li <%= "class=is-active" if controller_name == "newsletters" %>>
-          <%= link_to t("admin.menu.newsletters"), admin_newsletters_path %>
-        </li>
-        <li <%= "class=is-active" if controller_name == "emails_download" %>>
-          <%= link_to t("admin.menu.emails_download"), admin_emails_download_index_path %>
-        </li>
-      </ul>
-    </li>
-
-    <li class="section-title <%= "active" if controller_name == "settings" %>">
-      <%= link_to admin_settings_path do %>
-        <span class="icon-settings"></span>
-        <strong><%= t("admin.settings.index.title") %></strong>
-      <% end %>
-    </li>
   </ul>
 </div>