summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-05 11:23:25 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-05 11:23:25 +0300
commit04e365ebb761d56f2269452caa7206957afacb1a (patch)
treedf6c0148e1f2a7687dfb2364067a87a21a13b5d8
parent3ccdc02b89ab368e7701c53c38a2c9440c76fcdc (diff)
downloadgitlab-ce-04e365ebb761d56f2269452caa7206957afacb1a.tar.gz
Move project sidebar to separate partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/projects/_aside.html.haml54
-rw-r--r--app/views/projects/show.html.haml54
2 files changed, 55 insertions, 53 deletions
diff --git a/app/views/projects/_aside.html.haml b/app/views/projects/_aside.html.haml
new file mode 100644
index 00000000000..c68478c20f1
--- /dev/null
+++ b/app/views/projects/_aside.html.haml
@@ -0,0 +1,54 @@
+.clearfix
+ - if @project.archived?
+ .alert.alert-warning
+ %h4
+ %i.fa.fa-exclamation-triangle
+ Archived project!
+ %p Repository is read-only
+
+ - if @project.forked_from_project
+ .well
+ %i.fa.fa-code-fork.project-fork-icon
+ Forked from:
+ %br
+ = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
+
+ - unless @project.empty_repo?
+ = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-block' do
+ %i.fa.fa-exchange
+ Compare code
+
+ - if can?(current_user, :download_code, @project)
+ = render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-block'
+
+ - if version = @repository.version
+ - detail_url = changelog_url(@project) || version_url(@project)
+ = link_to detail_url, class: 'btn btn-block' do
+ %i.fa.fa-file-text-o
+ Version:
+ %span.count
+ = @repository.blob_by_oid(version.id).data
+
+.prepend-top-10.append-bottom-10
+ %p
+ %span.light Created on
+ #{@project.created_at.stamp('Aug 22, 2013')}
+ %p
+ %span.light Owned by #{@project.group ? "the" : nil}
+ - if @project.group
+ #{link_to @project.group.name, @project.group} group
+ - else
+ #{link_to @project.owner_name, @project.owner}
+
+
+.prepend-top-10
+ - @project.ci_services.each do |ci_service|
+ - if ci_service.active? && ci_service.respond_to?(:builds_path)
+ %hr
+ - if ci_service.respond_to?(:status_img_path)
+ = link_to ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink' do
+ = image_tag ci_service.status_img_path, alt: "build status"
+ - else
+ %span.light CI provided by
+ = link_to ci_service.title, ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink'
+
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index cd18ae0c8da..5cf2b73600c 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -56,59 +56,7 @@
.content_list
= spinner
%aside.col-md-3.project-side
- .clearfix
- - if @project.archived?
- .alert.alert-warning
- %h4
- %i.fa.fa-exclamation-triangle
- Archived project!
- %p Repository is read-only
-
- - if @project.forked_from_project
- .well
- %i.fa.fa-code-fork.project-fork-icon
- Forked from:
- %br
- = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
-
- - unless @project.empty_repo?
- = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-block' do
- %i.fa.fa-exchange
- Compare code
-
- - if can?(current_user, :download_code, @project)
- = render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-block'
-
- - if version = @repository.version
- - detail_url = changelog_url(@project) || version_url(@project)
- = link_to detail_url, class: 'btn btn-block' do
- %i.fa.fa-file-text-o
- Version:
- %span.count
- = @repository.blob_by_oid(version.id).data
-
- .prepend-top-10.append-bottom-10
- %p
- %span.light Created on
- #{@project.created_at.stamp('Aug 22, 2013')}
- %p
- %span.light Owned by #{@project.group ? "the" : nil}
- - if @project.group
- #{link_to @project.group.name, @project.group} group
- - else
- #{link_to @project.owner_name, @project.owner}
-
-
- .prepend-top-10
- - @project.ci_services.each do |ci_service|
- - if ci_service.active? && ci_service.respond_to?(:builds_path)
- %hr
- - if ci_service.respond_to?(:status_img_path)
- = link_to ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink' do
- = image_tag ci_service.status_img_path, alt: "build status"
- - else
- %span.light CI provided by
- = link_to ci_service.title, ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink'
+ = render 'aside'
- if readme = @repository.readme
.tab-pane#tab-readme