Squash project settings navs

app/assets/stylesheets/gitlab_bootstrap/nav.scss

@@ -22,6 +22,13 @@
       color: $style_color;
       font-weight: bold;
     }
+
+    &.nav-stacked-menu {
+      background: #FAFAFA;
+      li > a {
+        padding: 20px;
+      }
+    }
   }
 }
 

app/controllers/deploy_keys_controller.rb

@@ -4,6 +4,8 @@ class DeployKeysController < ProjectResourceController
   # Authorize
   before_filter :authorize_admin_project!
 
+  layout "project_settings"
+
   def index
     @enabled_keys = @project.deploy_keys.all
     @available_keys = available_keys - @enabled_keys

app/controllers/hooks_controller.rb

@@ -5,6 +5,8 @@ class HooksController < ProjectResourceController
 
   respond_to :html
 
+  layout "project_settings"
+
   def index
     @hooks = @project.hooks.all
     @hook = ProjectHook.new

app/controllers/projects_controller.rb

@@ -15,6 +15,7 @@ class ProjectsController < ProjectResourceController
   end
 
   def edit
+    render 'edit', layout: "project_settings"
   end
 
   def create
@@ -42,7 +43,7 @@ class ProjectsController < ProjectResourceController
         format.html { redirect_to edit_project_path(@project), notice: 'Project was successfully updated.' }
         format.js
       else
-        format.html { render action: "edit" }
+        format.html { render action: "edit", layout: "project_settings" }
         format.js
       end
     end

app/controllers/services_controller.rb

@@ -5,6 +5,8 @@ class ServicesController < ProjectResourceController
 
   respond_to :html
 
+  layout "project_settings"
+
   def index
     @project.build_missing_services
     @services = @project.services.reload

app/controllers/team_members_controller.rb

@@ -3,6 +3,8 @@ class TeamMembersController < ProjectResourceController
   before_filter :authorize_read_project!
   before_filter :authorize_admin_project!, except: [:index, :show]
 
+  layout "project_settings"
+
   def index
     @group = @project.group
     @users_projects = @project.users_projects.order('project_access DESC')

app/views/deploy_keys/index.html.haml

-= render "projects/settings_nav"
-
 %p.slead
   Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers
 
@@ -12,7 +10,7 @@
 %hr.clearfix
 
 .row
-  .span6.enabled-keys
+  .span5.enabled-keys
     %h5.cgreen
       Enabled deploy keys
       %small for this project
@@ -21,7 +19,7 @@
       - if @enabled_keys.blank?
         .light-well
           %p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one
-  .span6.available-keys
+  .span5.available-keys
     %h5
       Available deploy keys
       %small from projects you are able to manage

app/views/deploy_keys/new.html.haml

-= render "projects/settings_nav"
-
 %h3.page_title New Deploy key
 %hr
 

app/views/deploy_keys/show.html.haml

-= render "projects/settings_nav"
-
 %h3.page_title
   Deploy key:
   = @key.title

app/views/hooks/index.html.haml

-= render "projects/settings_nav"
-
 - if can? current_user, :admin_project, @project
   .alert.alert-info
     %span

app/views/layouts/project_settings.html.haml

+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head", title: @project.name_with_namespace
+  %body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
+    = render "layouts/head_panel", title: project_title(@project)
+    = render "layouts/init_auto_complete"
+    = render "layouts/flash"
+    - if can?(current_user, :download_code, @project)
+      = render 'shared/no_ssh'
+
+    %nav.main-nav
+      .container= render 'layouts/nav/project'
+
+    .container
+      .content
+        .row
+          .span2
+            = render "projects/settings_nav"
+          .span10
+            = yield

app/views/projects/_settings_nav.html.haml

-%ul.nav.nav-tabs
+%ul.nav.nav-pills.nav-stacked.nav-stacked-menu
   = nav_link(path: 'projects#edit') do
     = link_to edit_project_path(@project), class: "stat-tab tab " do
       %i.icon-edit
-      Edit
+      Edit Project
   = nav_link(controller: [:team_members, :teams]) do
     = link_to project_team_index_path(@project), class: "team-tab tab" do
       %i.icon-group

app/views/projects/edit.html.haml

-= render "projects/settings_nav"
-
 .project-edit-container
-  %h3.page_title Edit Project
-  %hr
   .project-edit-errors
   .project-edit-content
-    .row
-      .span3
-        %ul.nav.nav-pills.nav-stacked
-          %li.active
-            = link_to 'Settings', '#tab-settings', 'data-toggle' => 'tab'
-          %li
-            = link_to 'Rename repo', '#tab-rename', 'data-toggle' => 'tab'
-          %li
-            = link_to 'Transfer', '#tab-transfer', 'data-toggle' => 'tab'
-          %li
-            = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab'
-
-      .span9
-        .tab-content
-          .tab-pane.active#tab-settings
     .ui-box.white
       %h5.title Settings:
       .form-holder
@@ -117,7 +98,6 @@
           .form-actions
             = f.submit 'Save', class: "btn btn-save"
 
-          .tab-pane#tab-transfer
     - if can?(current_user, :change_namespace, @project)
       .ui-box.ui-box-danger
         %h5.title Transfer project
@@ -139,7 +119,6 @@
     - else
       %p.nothing_here_message Only project owner can transfer a project
 
-          .tab-pane#tab-rename
     .ui-box.ui-box-danger
       %h5.title Rename repository
       .errors-holder
@@ -157,7 +136,6 @@
           .form-actions
             = f.submit 'Rename', class: "btn btn-remove"
 
-          .tab-pane#tab-remove
     - if can?(current_user, :remove_project, @project)
       .ui-box.ui-box-danger
         %h5.title Remove project

app/views/services/edit.html.haml

-= render "projects/settings_nav"
-
 = render 'form'

app/views/services/index.html.haml

-= render "projects/settings_nav"
-
 %h3.page_title Services
 %br
 

app/views/team_members/import.html.haml

-= render "projects/settings_nav"
-
 %h3.page_title
   = "Import team from another project"
 %hr

app/views/team_members/index.html.haml

-= render "projects/settings_nav"
 %h3.page_title
   Users with access to this project
 
@@ -12,15 +11,6 @@
 %p.light
   Read more about project permissions
   %strong= link_to "here", help_permissions_path, class: "vlink"
-
-.clearfix
-
 - if @group
-  .row
-    .span6
   = render "team_members/group_members"
-    .span6
-      = render "team_members/team", members: @users_projects
-
-- else
-  = render "team_members/team", members: @users_projects
+= render "team_members/team", members: @users_projects

app/views/team_members/new.html.haml

-= render "projects/settings_nav"
 = render "team_members/form"