Move appearance settings as sub tab to application settingsdz-admin-tabs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4 files changed, 23 insertions, 14 deletions

diff --git a/app/views/admin/appearances/show.html.haml b/app/views/admin/appearances/show.html.haml
index 089e8e4cb7a..e220f4956cb 100644
--- a/app/views/admin/appearances/show.html.haml
+++ b/app/views/admin/appearances/show.html.haml
@@ -1,7 +1,7 @@
+- @no_container = true
 - page_title "Appearance"
-%h3.page-title
-  Appearance settings
-%p.light
-  You can modify the look and feel of GitLab here
+= render "admin/application_settings/head"
 
-= render 'form'
+%div{ class: (container_class) }
+  .prepend-top-default
+    = render 'form'
diff --git a/app/views/admin/application_settings/_head.html.haml b/app/views/admin/application_settings/_head.html.haml
new file mode 100644
index 00000000000..de919b298c1
--- /dev/null
+++ b/app/views/admin/application_settings/_head.html.haml
@@ -0,0 +1,11 @@
+.nav-links.sub-nav
+  %ul{ class: (container_class) }
+    = nav_link(controller: :application_settings) do
+      = link_to admin_application_settings_path, title: 'Settings' do
+        %span
+          General
+
+    = nav_link(controller: :appearances) do
+      = link_to admin_appearances_path, title: 'Appearances' do
+        %span
+          Appearance
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index e9c7ca9d5aa..82588c275d0 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -1,4 +1,7 @@
+- @no_container = true
 - page_title "Settings"
-%h3.page-title Settings
-%hr
-= render 'form'
+= render "admin/application_settings/head"
+
+%div{ class: (container_class) }
+  .prepend-top-default
+    = render 'form'
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index f02ac949699..c6d8b17a1e5 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -21,11 +21,6 @@
       %span
         Hooks
 
-  = nav_link(controller: :appearances) do
-    = link_to admin_appearances_path, title: 'Appearances' do
-      %span
-        Appearance
-
   = nav_link(controller: :applications) do
     = link_to admin_applications_path, title: 'Applications' do
       %span
@@ -53,7 +48,7 @@
         %span
           Spam Logs
 
-  = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
+  = nav_link(controller: [:application_settings, :appearances]) do
     = link_to admin_application_settings_path, title: 'Settings' do
       %span
         Settings