Merge branch 'dz-organize-admin-settings' into 'master'

Move admin->runners tab as subnav of overview tab

cc @annabeldunstone 

See merge request !4716

3 files changed, 70 insertions, 64 deletions

diff --git a/app/views/admin/dashboard/_head.html.haml b/app/views/admin/dashboard/_head.html.haml
index 7b3f88c24df..b74da64f82e 100644
--- a/app/views/admin/dashboard/_head.html.haml
+++ b/app/views/admin/dashboard/_head.html.haml
@@ -20,3 +20,7 @@
       = link_to admin_builds_path, title: 'Builds' do
         %span
           Builds
+    = nav_link path: ['runners#index', 'runners#show'] do
+      = link_to admin_runners_path, title: 'Runners' do
+        %span
+          Runners
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 2dad64b8d0f..5eff77aff2d 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -1,67 +1,73 @@
-%p.lead.prepend-top-default
-  %span
-    To register a new runner you should enter the following registration token.
-    With this token the runner will request a unique runner token and use that for future communication.
-    Registration token is
-    %code{ id: 'runners-token' } #{current_application_settings.runners_registration_token}
+- @no_container = true
+= render "admin/dashboard/head"
 
-.bs-callout.clearfix
-  .pull-left
-    %p
-      You can reset runners registration token by pressing a button below.
-    %p
-      = button_to reset_runners_token_admin_application_settings_path,
-        method: :put, class: 'btn btn-default',
-        data: { confirm: 'Are you sure you want to reset registration token?' } do
-        = icon('refresh')
-        Reset runners registration token
+%div{ class: (container_class) }
+
+  %p.prepend-top-default
+    %span
+      To register a new runner you should enter the following registration token.
+      With this token the runner will request a unique runner token and use that for future communication.
+      %br
+      Registration token is
+      %code{ id: 'runners-token' } #{current_application_settings.runners_registration_token}
 
-.bs-callout
-  %p
-    A 'runner' is a process which runs a build.
-    You can setup as many runners as you need.
-    %br
-    Runners can be placed on separate users, servers, and even on your local machine.
-    %br
+  .bs-callout.clearfix
+    .pull-left
+      %p
+        You can reset runners registration token by pressing a button below.
+      %p
+        = button_to reset_runners_token_admin_application_settings_path,
+          method: :put, class: 'btn btn-default',
+          data: { confirm: 'Are you sure you want to reset registration token?' } do
+          = icon('refresh')
+          Reset runners registration token
+
+  .bs-callout
+    %p
+      A 'runner' is a process which runs a build.
+      You can setup as many runners as you need.
+      %br
+      Runners can be placed on separate users, servers, and even on your local machine.
+      %br
 
-  %div
-    %span Each runner can be in one of the following states:
-    %ul
-      %li
-        %span.label.label-success shared
-        \- run builds from all unassigned projects
-      %li
-        %span.label.label-info specific
-        \- run builds from assigned projects
-      %li
-        %span.label.label-danger paused
-        \- runner will not receive any new builds
+    %div
+      %span Each runner can be in one of the following states:
+      %ul
+        %li
+          %span.label.label-success shared
+          \- run builds from all unassigned projects
+        %li
+          %span.label.label-info specific
+          \- run builds from assigned projects
+        %li
+          %span.label.label-danger paused
+          \- runner will not receive any new builds
 
-.append-bottom-20.clearfix
-  .pull-left
-    = form_tag admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do
-      .form-group
-        = search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner description or token', spellcheck: false
-      = submit_tag 'Search', class: 'btn'
+  .append-bottom-20.clearfix
+    .pull-left
+      = form_tag admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do
+        .form-group
+          = search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner description or token', spellcheck: false
+        = submit_tag 'Search', class: 'btn'
 
-  .pull-right.light
-    Runners with last contact less than a minute ago: #{@active_runners_cnt}
+    .pull-right.light
+      Runners with last contact less than a minute ago: #{@active_runners_cnt}
 
-%br
+  %br
 
-.table-holder
-  %table.table
-    %thead
-      %tr
-        %th Type
-        %th Runner token
-        %th Description
-        %th Projects
-        %th Builds
-        %th Tags
-        %th Last contact
-        %th
+  .table-holder
+    %table.table
+      %thead
+        %tr
+          %th Type
+          %th Runner token
+          %th Description
+          %th Projects
+          %th Builds
+          %th Tags
+          %th Last contact
+          %th
 
-    - @runners.each do |runner|
-      = render "admin/runners/runner", runner: runner
-= paginate @runners
+      - @runners.each do |runner|
+        = render "admin/runners/runner", runner: runner
+  = paginate @runners
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 54aa34bee0b..f02ac949699 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,6 +1,6 @@
 %ul.nav-links.scrolling-tabs
   .fade-left
-  = nav_link(controller: %w(dashboard admin projects users groups builds), html_options: {class: 'home'}) do
+  = 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
       %span
         Overview
@@ -12,10 +12,6 @@
     = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
       %span
         Deploy Keys
-  = nav_link path: ['runners#index', 'runners#show'] do
-    = link_to admin_runners_path, title: 'Runners' do
-      %span
-        Runners
   = nav_link(controller: :broadcast_messages) do
     = link_to admin_broadcast_messages_path, title: 'Messages' do
       %span