Fix wrong placement of show-aside link

10 files changed, 22 insertions, 19 deletions

diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 3bbe10bc270..0a13791029d 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,6 +1,6 @@
+= render 'shared/show_aside'
+
 .row
-  = link_to '#aside', class: 'show-aside' do
-    %i.fa.fa-angle-left
   %aside.col-md-3
     .admin-filter
       = form_tag admin_namespaces_projects_path, method: :get, class: '' do
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 25c1730ef70..23a9d769639 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -1,6 +1,6 @@
+= render 'shared/show_aside'
+
 .row
-  = link_to '#aside', class: 'show-aside' do
-    %i.fa.fa-angle-left
   %aside.col-md-3
     .admin-filter
       %ul.nav.nav-pills.nav-stacked
diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml
index f4ad2b294b3..67943f2267b 100644
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -1,4 +1,6 @@
 - if @projects.any?
+  = render 'shared/show_aside'
+
   .dashboard.row
     %section.activities.col-md-8
       = render 'dashboard/activities'
@@ -15,9 +17,6 @@
         = render 'shared/projects_list', projects: @projects,
           projects_limit: 20, stars: true, avatar: false
 
-    = link_to '#aside', class: 'show-aside' do
-      %i.fa.fa-angle-left
-
 - else
   %h3 You don't have starred projects yet
   %p.slead Visit project page and press on star icon and it will appear on this page.
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 2754a4894da..5001c2101e1 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -3,13 +3,13 @@
     = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
 
 - if @projects.any?
+  = render 'shared/show_aside'
+
   .dashboard.row
     %section.activities.col-md-8
       = render 'activities'
     %aside.col-md-4
       = render 'sidebar'
-    = link_to '#aside', class: 'show-aside' do
-      %i.fa.fa-angle-left
 
 - else
   = render "zero_authorized_projects"
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 3db0dfa59b1..1678311141e 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -13,6 +13,9 @@
       .description
         = escaped_autolink(@group.description)
   %hr
+
+  = render 'shared/show_aside'
+
   .row
     %section.activities.col-md-8
       .hidden-xs
@@ -33,5 +36,3 @@
       = spinner
     %aside.side.col-md-4
       = render "projects", projects: @projects
-    = link_to '#aside', class: 'show-aside' do
-      %i.fa.fa-angle-left
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 288b48f4583..ceca2653016 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -4,6 +4,9 @@
       = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-grouped btn-reopen js-note-target-reopen", title: 'Reopen Issue'
     - else
       = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close js-note-target-close", title: "Close Issue"
+
+= render 'shared/show_aside'
+
 .row
   %section.col-md-9
     .votes-holder.pull-right
@@ -29,5 +32,3 @@
           - @issue.labels.each do |label|
             = link_to namespace_project_issues_path(@project.namespace, @project, label_name: label.name) do
               = render_colored_label(label)
-  = link_to '#aside', class: 'show-aside' do
-    %i.fa.fa-angle-left
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml
index eb72eaabd8b..9a2aa9c3de0 100644
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
@@ -5,6 +5,8 @@
     - if @merge_request.closed?
       = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
 
+= render 'shared/show_aside'
+
 .row
   %section.col-md-9
     .votes-holder.pull-right
@@ -27,5 +29,3 @@
           - @merge_request.labels.each do |label|
             = link_to namespace_project_merge_requests_path(@project.namespace, @project, label_name: label.name) do
               = render_colored_label(label)
-  = link_to '#aside', class: 'show-aside' do
-    %i.fa.fa-angle-left
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 1787caa243d..cd18ae0c8da 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -37,9 +37,9 @@
 
 .tab-content
   .tab-pane.active#tab-activity
+    = render 'shared/show_aside'
+
     .row
-      = link_to '#aside', class: 'show-aside' do
-        %i.fa.fa-angle-left
       %section.col-md-9
         .hidden-xs
           = render "events/event_last_push", event: @last_push
diff --git a/app/views/shared/_show_aside.html.haml b/app/views/shared/_show_aside.html.haml
new file mode 100644
index 00000000000..3ac9b11b4fa
--- /dev/null
+++ b/app/views/shared/_show_aside.html.haml
@@ -0,0 +1,2 @@
+= link_to '#aside', class: 'show-aside' do
+  %i.fa.fa-angle-left
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 15a3f741e6c..0576c6a11b9 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,9 +1,9 @@
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
 
+= render 'shared/show_aside'
+
 .row
-  = link_to '#aside', class: 'show-aside' do
-    %i.fa.fa-angle-left
   %section.col-md-8
     .header-with-avatar
       = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''