1 files changed, 88 insertions, 28 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index 3b53117deb6..0ec07605631 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -3,17 +3,21 @@
     .context-header
       = link_to admin_root_path, title: 'Admin Overview' do
         .avatar-container.s40.settings-avatar
-          = icon('wrench')
+          = sprite_icon('admin', size: 24)
         .sidebar-context-title Admin Area
     %ul.sidebar-top-level-items
-      = nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts), html_options: {class: 'home'}) do
-        = sidebar_link admin_root_path, title: _('Overview'), css: 'shortcuts-tree' do
+      = nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts conversational_development_index), html_options: {class: 'home'}) do
+        = link_to admin_root_path, class: 'shortcuts-tree' do
           .nav-icon-container
-            = custom_icon('overview')
+            = sprite_icon('overview')
           %span.nav-item-name
             Overview
-
         %ul.sidebar-sub-level-items
+          = nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts conversational_development_index), html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_root_path do
+              %strong.fly-out-top-item-name
+                #{ _('Overview') }
+          %li.divider.fly-out-top-item
           = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
             = link_to admin_root_path, title: 'Overview' do
               %span
@@ -47,14 +51,19 @@
               %span
                 ConvDev Index
 
-      = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles)) do
-        = sidebar_link admin_conversational_development_index_path, title: _('Monitoring') do
+      = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles)) do
+        = link_to admin_system_info_path do
           .nav-icon-container
-            = custom_icon('monitoring')
+            = sprite_icon('monitor')
           %span.nav-item-name
             Monitoring
 
         %ul.sidebar-sub-level-items
+          = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles), html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_system_info_path do
+              %strong.fly-out-top-item-name
+                #{ _('Monitoring') }
+          %li.divider.fly-out-top-item
           = nav_link(controller: :system_info) do
             = link_to admin_system_info_path, title: 'System Info' do
               %span
@@ -77,75 +86,126 @@
                 Requests Profiles
 
       = nav_link(controller: :broadcast_messages) do
-        = sidebar_link admin_broadcast_messages_path, title: _('Messages') do
+        = link_to admin_broadcast_messages_path do
           .nav-icon-container
-            = custom_icon('messages')
+            = sprite_icon('messages')
           %span.nav-item-name
             Messages
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :broadcast_messages, html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_broadcast_messages_path do
+              %strong.fly-out-top-item-name
+                #{ _('Messages') }
 
       = nav_link(controller: [:hooks, :hook_logs]) do
-        = sidebar_link admin_hooks_path, title: _('Hooks') do
+        = link_to admin_hooks_path do
           .nav-icon-container
-            = custom_icon('system_hooks')
+            = sprite_icon('hook')
           %span.nav-item-name
             System Hooks
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: [:hooks, :hook_logs], html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_hooks_path do
+              %strong.fly-out-top-item-name
+                #{ _('System Hooks') }
 
       = nav_link(controller: :applications) do
-        = sidebar_link admin_applications_path, title: _('Applications') do
+        = link_to admin_applications_path do
           .nav-icon-container
-            = custom_icon('applications')
+            = sprite_icon('applications')
           %span.nav-item-name
             Applications
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :applications, html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_applications_path do
+              %strong.fly-out-top-item-name
+                #{ _('Applications') }
 
       = nav_link(controller: :abuse_reports) do
-        = sidebar_link admin_abuse_reports_path, title: _("Abuse Reports") do
+        = link_to admin_abuse_reports_path do
           .nav-icon-container
-            = custom_icon('abuse_reports')
+            = sprite_icon('slight-frown')
           %span.nav-item-name
             Abuse Reports
           %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :abuse_reports, html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_broadcast_messages_path do
+              %strong.fly-out-top-item-name
+                #{ _('Abuse Reports') }
+              %span.badge.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all))
 
       - if akismet_enabled?
         = nav_link(controller: :spam_logs) do
-          = sidebar_link admin_spam_logs_path, title: _("Spam Logs") do
+          = link_to admin_spam_logs_path do
             .nav-icon-container
-              = custom_icon('spam_logs')
+              = sprite_icon('spam')
             %span.nav-item-name
               Spam Logs
+          %ul.sidebar-sub-level-items.is-fly-out-only
+            = nav_link(controller: :spam_logs, html_options: { class: "fly-out-top-item" } ) do
+              = link_to admin_spam_logs_path do
+                %strong.fly-out-top-item-name
+                  #{ _('Spam Logs') }
 
       = nav_link(controller: :deploy_keys) do
-        = sidebar_link admin_deploy_keys_path, title: _('Deploy Keys') do
+        = link_to admin_deploy_keys_path do
           .nav-icon-container
-            = custom_icon('key')
+            = sprite_icon('key')
           %span.nav-item-name
             Deploy Keys
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :deploy_keys, html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_deploy_keys_path do
+              %strong.fly-out-top-item-name
+                #{ _('Deploy Keys') }
 
       = nav_link(controller: :services) do
-        = sidebar_link admin_application_settings_services_path, title: _('Service Templates') do
+        = link_to admin_application_settings_services_path do
           .nav-icon-container
-            = custom_icon('service_templates')
+            = sprite_icon('template')
           %span.nav-item-name
             Service Templates
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :services, html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_application_settings_services_path do
+              %strong.fly-out-top-item-name
+                #{ _('Service Templates') }
 
       = nav_link(controller: :labels) do
-        = sidebar_link admin_labels_path, title: _('Labels') do
+        = link_to admin_labels_path do
           .nav-icon-container
-            = custom_icon('labels')
+            = sprite_icon('labels')
           %span.nav-item-name
             Labels
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :labels, html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_labels_path do
+              %strong.fly-out-top-item-name
+                #{ _('Labels') }
 
       = nav_link(controller: :appearances) do
-        = sidebar_link admin_appearances_path, title: _('Appearances') do
+        = link_to admin_appearances_path do
           .nav-icon-container
-            = custom_icon('appearance')
+            = sprite_icon('appearance')
           %span.nav-item-name
             Appearance
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :appearances, html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_appearances_path do
+              %strong.fly-out-top-item-name
+                #{ _('Appearance') }
 
       = nav_link(controller: :application_settings) do
-        = sidebar_link admin_application_settings_path, title: _('Settings') do
+        = link_to admin_application_settings_path do
           .nav-icon-container
-            = custom_icon('settings')
+            = sprite_icon('settings')
           %span.nav-item-name
             Settings
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :application_settings, html_options: { class: "fly-out-top-item" } ) do
+            = link_to admin_application_settings_path do
+              %strong.fly-out-top-item-name
+                #{ _('Settings') }
 
     = render 'shared/sidebar_toggle_button'