Move tabs with activity/readme to section

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

2 files changed, 55 insertions, 56 deletions

diff --git a/app/views/projects/_section.html.haml b/app/views/projects/_section.html.haml
index 3e7a5ae3c22..e6b04c5a34d 100644
--- a/app/views/projects/_section.html.haml
+++ b/app/views/projects/_section.html.haml
@@ -1,15 +1,34 @@
-.hidden-xs
-  = render "events/event_last_push", event: @last_push
+%ul.nav.nav-tabs
+  %li.active
+    = link_to '#tab-activity', 'data-toggle' => 'tab' do
+      Activity
+  - if @repository.readme
+    %li
+      = link_to '#tab-readme', 'data-toggle' => 'tab' do
+        Readme
+.tab-content
+  .tab-pane.active#tab-activity
+    .hidden-xs
+      = render "events/event_last_push", event: @last_push
 
-  - if current_user
-    %ul.nav.nav-pills.event_filter.pull-right
-      %li
-        = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'rss-btn' do
-          %i.fa.fa-rss
-          Activity Feed
+      - if current_user
+        %ul.nav.nav-pills.event_filter.pull-right
+          %li
+            = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'rss-btn' do
+              %i.fa.fa-rss
+              Activity Feed
 
-  = render 'shared/event_filter'
-  %hr
-.content_list
-= spinner
+      = render 'shared/event_filter'
+      %hr
+    .content_list
+    = spinner
 
+  - if readme = @repository.readme
+    .tab-pane#tab-readme
+      %article.readme-holder#README
+        = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do
+          %h4.readme-file-title
+            %i.fa.fa-file
+            = readme.name
+        .wiki
+          = render_readme(readme)
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 8132ac730c8..f54e5486e96 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -7,50 +7,30 @@
   = render 'shared/no_password'
 
 = render "home_panel"
-%ul.nav.nav-tabs
-  %li.active
-    = link_to '#tab-activity', 'data-toggle' => 'tab' do
-      Activity
-  - if @repository.readme
-    %li
-      = link_to '#tab-readme', 'data-toggle' => 'tab' do
-        Readme
-  - if @repository.changelog
-    %li.hidden-xs
-      = link_to changelog_url(@project) do
-        Changelog
-  - if @repository.contribution_guide
-    %li.hidden-xs
-      = link_to contribution_guide_url(@project) do
-        Contribution guide
-  - if @repository.license
-    %li
-      = link_to license_url(@project) do
-        License
+- if @repository.changelog
+  %li.hidden-xs
+    = link_to changelog_url(@project) do
+      Changelog
+- if @repository.contribution_guide
+  %li.hidden-xs
+    = link_to contribution_guide_url(@project) do
+      Contribution guide
+- if @repository.license
+  %li
+    = link_to license_url(@project) do
+      License
 
-  .project-home-links
-    - unless @project.empty_repo?
-      = link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref)
-      = link_to pluralize(number_with_delimiter(@repository.branch_names.count), 'branch'), namespace_project_branches_path(@project.namespace, @project)
-      = link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), namespace_project_tags_path(@project.namespace, @project)
-      %span.light.prepend-left-20= repository_size
+.project-home-links
+  - unless @project.empty_repo?
+    = link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref)
+    = link_to pluralize(number_with_delimiter(@repository.branch_names.count), 'branch'), namespace_project_branches_path(@project.namespace, @project)
+    = link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), namespace_project_tags_path(@project.namespace, @project)
+    %span.light.prepend-left-20= repository_size
 
-.tab-content
-  .tab-pane.active#tab-activity
-    = render 'shared/show_aside'
+= render 'shared/show_aside'
 
-    .row
-      %section.col-md-9
-        = render 'section'
-      %aside.col-md-3.project-side
-        = render 'aside'
-
-  - if readme = @repository.readme
-    .tab-pane#tab-readme
-      %article.readme-holder#README
-        = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do
-          %h4.readme-file-title
-            %i.fa.fa-file
-            = readme.name
-        .wiki
-          = render_readme(readme)
+.row
+  %section.col-md-8
+    = render 'section'
+  %aside.col-md-4.project-side
+    = render 'aside'