Download as
Browse Code »

Commit ca244c35cc0145908caa8aaab956f5dc1240aed1

Authored by Dmitriy Zaporozhets
1 parent afc3c216
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Reorder buttons on clone panel of project

Showing 2 changed files with 26 additions and 25 deletions   Show diff stats
app/views/projects/_clone_panel.html.haml
  Diff comments   View file @ca244c3
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 .pull-right 6 .pull-right
7 - unless @project.empty_repo? 7 - unless @project.empty_repo?
8 - if can? current_user, :fork_project, @project 8 - if can? current_user, :fork_project, @project
9 - = link_to fork_project_path(@project), title: "Fork", class: "btn small grouped", method: "POST" do 9 + = link_to fork_project_path(@project), title: "Fork", class: "btn grouped", method: "POST" do
  10 + %i.icon-copy
10 Fork 11 Fork
11 - if can? current_user, :download_code, @project 12 - if can? current_user, :download_code, @project
12 = link_to archive_project_repository_path(@project), class: "btn grouped" do 13 = link_to archive_project_repository_path(@project), class: "btn grouped" do
@@ -15,28 +16,5 @@ @@ -15,28 +16,5 @@
15 16
16 = link_to tags_project_repository_path(@project), class: "btn grouped only-wide", title: 'Git Tags' do 17 = link_to tags_project_repository_path(@project), class: "btn grouped only-wide", title: 'Git Tags' do
17 %i.icon-tags 18 %i.icon-tags
18 -  
19 - .dropdown.pull-right  
20 - %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}  
21 - %i.icon-plus  
22 - Add new  
23 - %b.caret  
24 - %ul.dropdown-menu  
25 - - if @project.issues_enabled && can?(current_user, :write_issue, @project)  
26 - %li  
27 - = link_to url_for_new_issue, title: "New Issue" do  
28 - Issue  
29 - - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)  
30 - %li  
31 - = link_to new_project_merge_request_path(@project), title: "New Merge Request" do  
32 - Merge Request  
33 - - if @project.snippets_enabled && can?(current_user, :write_snippet, @project)  
34 - %li  
35 - = link_to new_project_snippet_path(@project), title: "New Snippet" do  
36 - Snippet  
37 - - if can?(current_user, :admin_team_member, @project)  
38 - %li.divider  
39 - %li  
40 - = link_to new_project_team_member_path(@project), title: "New Team member" do  
41 - Team member 19 + Tags
42 20
app/views/projects/show.html.haml
  Diff comments   View file @ca244c3
@@ -7,6 +7,29 @@ @@ -7,6 +7,29 @@
7 .loading.hide 7 .loading.hide
8 .span3 8 .span3
9 .light-well 9 .light-well
  10 + .dropdown.pull-right
  11 + %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
  12 + %i.icon-plus-sign-alt
  13 + %b.caret
  14 + %ul.dropdown-menu
  15 + - if @project.issues_enabled && can?(current_user, :write_issue, @project)
  16 + %li
  17 + = link_to url_for_new_issue, title: "New Issue" do
  18 + Issue
  19 + - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
  20 + %li
  21 + = link_to new_project_merge_request_path(@project), title: "New Merge Request" do
  22 + Merge Request
  23 + - if @project.snippets_enabled && can?(current_user, :write_snippet, @project)
  24 + %li
  25 + = link_to new_project_snippet_path(@project), title: "New Snippet" do
  26 + Snippet
  27 + - if can?(current_user, :admin_team_member, @project)
  28 + %li.divider
  29 + %li
  30 + = link_to new_project_team_member_path(@project), title: "New Team member" do
  31 + Team member
  32 +
10 %h3.page_title 33 %h3.page_title
11 = @project.name 34 = @project.name
12 - if @project.description.present? 35 - if @project.description.present?