Merge branch 'dz-admin-tabs-dropdown' into 'master'

Move part of admin area navigation from tabs into settings dropdown

Partly fix https://gitlab.com/gitlab-org/gitlab-ce/issues/18799 

See merge request !4796

app/views/admin/appearances/show.html.haml

 - page_title "Appearance"
+
 %h3.page-title
   Appearance settings
 %p.light
   You can modify the look and feel of GitLab here
+%hr
 
 = render 'form'

app/views/admin/application_settings/show.html.haml

 - page_title "Settings"
+
 %h3.page-title Settings
 %hr
 = render 'form'

app/views/layouts/nav/_admin.html.haml

-%ul.nav-links.scrolling-tabs
+%div{ class: nav_control_class }
+  = render 'layouts/nav/admin_settings'
+
+  %ul.nav-links.scrolling-tabs
     .fade-left
     = nav_link(controller: %w(dashboard admin projects users groups builds runners), html_options: {class: 'home'}) do
       = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
@@ -8,10 +11,6 @@
       = link_to admin_background_jobs_path, title: 'Monitoring' do
         %span
           Monitoring
-  = nav_link(controller: :deploy_keys) do
-    = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
-      %span
-        Deploy Keys
     = nav_link(controller: :broadcast_messages) do
       = link_to admin_broadcast_messages_path, title: 'Messages' do
         %span
@@ -19,28 +18,13 @@
     = nav_link(controller: :hooks) do
       = link_to admin_hooks_path, title: 'Hooks' do
         %span
-        Hooks
-
-  = nav_link(controller: :appearances) do
-    = link_to admin_appearances_path, title: 'Appearances' do
-      %span
-        Appearance
+          System Hooks
 
     = nav_link(controller: :applications) do
       = link_to admin_applications_path, title: 'Applications' do
         %span
           Applications
 
-  = nav_link(controller: :services) do
-    = link_to admin_application_settings_services_path, title: 'Service Templates' do
-      %span
-        Service Templates
-
-  = nav_link(controller: :labels) do
-    = link_to admin_labels_path, title: 'Labels' do
-      %span
-        Labels
-
     = nav_link(controller: :abuse_reports) do
       = link_to admin_abuse_reports_path, title: "Abuse Reports" do
         %span
@@ -52,9 +36,4 @@
         = link_to admin_spam_logs_path, title: "Spam Logs" do
           %span
             Spam Logs
-
-  = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
-    = link_to admin_application_settings_path, title: 'Settings' do
-      %span
-        Settings
     .fade-right

app/views/layouts/nav/_admin_settings.html.haml

+.controls
+  .dropdown.admin-settings-dropdown
+    %a.dropdown-new.btn.btn-default{href: '#', 'data-toggle' => 'dropdown'}
+      = icon('cog')
+      = icon('caret-down')
+    %ul.dropdown-menu.dropdown-menu-align-right
+      = nav_link(controller: :deploy_keys) do
+        = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
+          %span
+            Deploy Keys
+
+      = nav_link(controller: :services) do
+        = link_to admin_application_settings_services_path, title: 'Service Templates' do
+          %span
+            Service Templates
+
+      = nav_link(controller: :labels) do
+        = link_to admin_labels_path, title: 'Labels' do
+          %span
+            Labels
+
+      = nav_link(controller: :appearances) do
+        = link_to admin_appearances_path, title: 'Appearances' do
+          %span
+            Appearance
+
+      %li.divider
+      = nav_link(controller: :application_settings) do
+        = link_to admin_application_settings_path, title: 'Settings' do
+          %span
+            Settings