Dashboard layout uses sidenav

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

4 files changed, 31 insertions, 19 deletions

diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 5460cf56f22..ddabd6e0d52 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -1,10 +1,11 @@
 .panel.panel-default
   .panel-heading.clearfix
-    = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
-    - if current_user.can_create_group?
-      = link_to new_group_path, class: "btn btn-new pull-right" do
-        %i.fa.fa-plus
-        New group
+    .input-group
+      = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
+      - if current_user.can_create_group?
+        .input-group-addon
+          = link_to new_group_path, class: "" do
+            %strong New group
   %ul.well-list.dash-list
     - groups.each do |group|
       %li.group-row
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index 3598425777f..304aa17eba8 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -1,10 +1,11 @@
 .panel.panel-default
   .panel-heading.clearfix
-    = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
-    - if current_user.can_create_project?
-      = link_to new_project_path, class: "btn btn-new pull-right" do
-        %i.fa.fa-plus
-        New project
+    .input-group
+      = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
+      - if current_user.can_create_project?
+        .input-group-addon
+          = link_to new_project_path, class: "" do
+            %strong New project
 
   %ul.well-list.dash-list
     - projects.each do |project|
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 7d0819aa93e..ddae02bbb45 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,12 +1,16 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: "Dashboard"
-  %body{class: "#{app_theme} application", :'data-page' => body_data_page }
+  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page }
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Dashboard"
-    %nav.main-nav.navbar-collapse.collapse
-      .container= render 'layouts/nav/dashboard'
-    .container
-      .content
-        = render "layouts/flash"
-        = yield
+    .page-with-sidebar
+      .sidebar-wrapper
+        = render 'layouts/nav/dashboard'
+      .content-wrapper
+        .container-fluid
+          .content
+            = render "layouts/flash"
+            .clearfix
+              = yield
+    = yield :embedded_scripts
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index a6e9772d93f..619cf625689 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,18 +1,24 @@
-%ul
+%ul.nav.nav-sidebar.navbar-collapse.collapse
   = nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do
     = link_to root_path, title: 'Home', class: 'shortcuts-activity' do
+      %i.fa.fa-dashboard
       Activity
   = nav_link(path: 'dashboard#projects') do
     = link_to projects_dashboard_path, class: 'shortcuts-projects' do
+      %i.fa.fa-cube
       Projects
   = nav_link(path: 'dashboard#issues') do
     = link_to issues_dashboard_path, class: 'shortcuts-issues' do
+      %i.fa.fa-exclamation-circle
       Issues
       %span.count= current_user.assigned_issues.opened.count
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to merge_requests_dashboard_path, class: 'shortcuts-merge_requests' do
+      %i.fa.fa-tasks
       Merge Requests
       %span.count= current_user.assigned_merge_requests.opened.count
   = nav_link(controller: :help) do
-    = link_to "Help", help_path
+    = link_to help_path do
+      %i.fa.fa-question-circle
+      Help