Commit 93359c7e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside

parents 26c62cb0 f28f5e49
= render 'shared/show_aside'
.row .row
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%aside.col-md-3 %aside.col-md-3
.admin-filter .admin-filter
= form_tag admin_namespaces_projects_path, method: :get, class: '' do = form_tag admin_namespaces_projects_path, method: :get, class: '' do
......
= render 'shared/show_aside'
.row .row
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%aside.col-md-3 %aside.col-md-3
.admin-filter .admin-filter
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
......
- if @projects.any? - if @projects.any?
= render 'shared/show_aside'
.dashboard.row .dashboard.row
%section.activities.col-md-8 %section.activities.col-md-8
= render 'dashboard/activities' = render 'dashboard/activities'
...@@ -15,9 +17,6 @@ ...@@ -15,9 +17,6 @@
= render 'shared/projects_list', projects: @projects, = render 'shared/projects_list', projects: @projects,
projects_limit: 20, stars: true, avatar: false projects_limit: 20, stars: true, avatar: false
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
- else - else
%h3 You don't have starred projects yet %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. %p.slead Visit project page and press on star icon and it will appear on this page.
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
= auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity") = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
- if @projects.any? - if @projects.any?
= render 'shared/show_aside'
.dashboard.row .dashboard.row
%section.activities.col-md-8 %section.activities.col-md-8
= render 'activities' = render 'activities'
%aside.col-md-4 %aside.col-md-4
= render 'sidebar' = render 'sidebar'
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
- else - else
= render "zero_authorized_projects" = render "zero_authorized_projects"
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
.description .description
= escaped_autolink(@group.description) = escaped_autolink(@group.description)
%hr %hr
= render 'shared/show_aside'
.row .row
%section.activities.col-md-8 %section.activities.col-md-8
.hidden-xs .hidden-xs
...@@ -33,5 +36,3 @@ ...@@ -33,5 +36,3 @@
= spinner = spinner
%aside.side.col-md-4 %aside.side.col-md-4
= render "projects", projects: @projects = render "projects", projects: @projects
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
...@@ -4,6 +4,9 @@ ...@@ -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' = 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 - 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" = 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 .row
%section.col-md-9 %section.col-md-9
.votes-holder.pull-right .votes-holder.pull-right
...@@ -29,5 +32,3 @@ ...@@ -29,5 +32,3 @@
- @issue.labels.each do |label| - @issue.labels.each do |label|
= link_to namespace_project_issues_path(@project.namespace, @project, label_name: label.name) do = link_to namespace_project_issues_path(@project.namespace, @project, label_name: label.name) do
= render_colored_label(label) = render_colored_label(label)
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
- if @merge_request.closed? - 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" = 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 .row
%section.col-md-9 %section.col-md-9
.votes-holder.pull-right .votes-holder.pull-right
...@@ -27,5 +29,3 @@ ...@@ -27,5 +29,3 @@
- @merge_request.labels.each do |label| - @merge_request.labels.each do |label|
= link_to namespace_project_merge_requests_path(@project.namespace, @project, label_name: label.name) do = link_to namespace_project_merge_requests_path(@project.namespace, @project, label_name: label.name) do
= render_colored_label(label) = render_colored_label(label)
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
.tab-content .tab-content
.tab-pane.active#tab-activity .tab-pane.active#tab-activity
= render 'shared/show_aside'
.row .row
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%section.col-md-9 %section.col-md-9
.hidden-xs .hidden-xs
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
......
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
= render 'shared/show_aside'
.row .row
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%section.col-md-8 %section.col-md-8
.header-with-avatar .header-with-avatar
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: '' = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment