summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-05 11:47:01 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-05 11:47:01 +0300
commit478a4b19dab663f65cabf0c02d3f72688cdf1ad2 (patch)
tree0fed4cf7084ece4f9d791ac3697f5d658aa8cd0f /app
parent3ce0557ab0ecf365423070e3bcf89224981701c3 (diff)
downloadgitlab-ce-478a4b19dab663f65cabf0c02d3f72688cdf1ad2.tar.gz
Turn sidebar in sections with contribute and repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/projects.scss9
-rw-r--r--app/views/projects/_aside.html.haml48
-rw-r--r--app/views/projects/show.html.haml19
3 files changed, 39 insertions, 37 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index c005470355e..36a8a230578 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -99,15 +99,6 @@
}
}
-.project-home-links {
- padding: 10px 0px;
- float: right;
- a {
- margin-left: 10px;
- font-weight: 500;
- }
-}
-
.git-clone-holder {
.project-home-dropdown + & {
margin-right: 45px;
diff --git a/app/views/projects/_aside.html.haml b/app/views/projects/_aside.html.haml
index c68478c20f1..a5a570c0edb 100644
--- a/app/views/projects/_aside.html.haml
+++ b/app/views/projects/_aside.html.haml
@@ -1,4 +1,41 @@
.clearfix
+ - unless @project.empty_repo?
+ .well
+ %h4 Contribute
+ %ul.nav.nav-pills
+ - 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
+ %hr
+ = link_to url_for_new_issue(@project, only_path: true), title: "New Issue", class: 'btn btn-sm' do
+ %i.fa.fa-fw.fa-exclamation-circle
+ New issue
+
+ .well
+ %h4 Repository
+ %ul.nav.nav-pills
+ %li= link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref)
+ %li= link_to pluralize(number_with_delimiter(@repository.branch_names.count), 'branch'), namespace_project_branches_path(@project.namespace, @project)
+ %li= link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), namespace_project_tags_path(@project.namespace, @project)
+ %hr
+ = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-sm' do
+ %i.fa.fa-exchange
+ Compare code
+ - if can?(current_user, :download_code, @project)
+ &nbsp;
+ = render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-group-sm'
+
+ -#%li
+ %span.light.prepend-left-20= repository_size
- if @project.archived?
.alert.alert-warning
%h4
@@ -13,15 +50,8 @@
%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
+ -#- unless @project.empty_repo?
+ -#- 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
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index f54e5486e96..d944b325952 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -7,25 +7,6 @@
= render 'shared/no_password'
= render "home_panel"
-- 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
= render 'shared/show_aside'