Download as
Browse Code »

Commit 9ef5573c82acb0dc0d9068df08f469926a0a19c3

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

Show project access level right to clone panel

Showing 4 changed files with 13 additions and 22 deletions   Show diff stats
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @9ef5573
@@ -33,14 +33,6 @@ @@ -33,14 +33,6 @@
33 } 33 }
34 34
35 .project_clone_holder { 35 .project_clone_holder {
36 - input[type="text"],  
37 - .btn {  
38 - font-size: 12px;  
39 - line-height: 18px;  
40 - margin: 0;  
41 - padding: 3px 10px;  
42 - }  
43 -  
44 input[type="text"] { 36 input[type="text"] {
45 @extend .monospace; 37 @extend .monospace;
46 border: 1px solid #BBB; 38 border: 1px solid #BBB;
app/views/projects/_clone_panel.html.haml
  Diff comments   View file @9ef5573
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 .pull-right 6 .pull-right
7 - unless @project.empty_repo? 7 - unless @project.empty_repo?
8 - if can? current_user, :download_code, @project 8 - if can? current_user, :download_code, @project
9 - = link_to archive_project_repository_path(@project), class: "btn-small btn grouped" do 9 + = link_to archive_project_repository_path(@project), class: "btn grouped" do
10 %i.icon-download-alt 10 %i.icon-download-alt
11 Download 11 Download
12 - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) 12 - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
13 - = link_to new_project_merge_request_path(@project), title: "New Merge Request", class: "btn-small btn grouped" do 13 + = link_to new_project_merge_request_path(@project), title: "New Merge Request", class: "btn grouped" do
14 Merge Request 14 Merge Request
15 - if @project.issues_enabled && can?(current_user, :write_issue, @project) 15 - if @project.issues_enabled && can?(current_user, :write_issue, @project)
16 - = link_to url_for_new_issue, title: "New Issue", class: "btn-small btn grouped" do 16 + = link_to url_for_new_issue, title: "New Issue", class: "btn grouped" do
17 Issue 17 Issue
app/views/projects/show.html.haml
  Diff comments   View file @9ef5573
@@ -15,16 +15,6 @@ @@ -15,16 +15,6 @@
15 15
16 %hr 16 %hr
17 %p 17 %p
18 - Access level:  
19 - - if @project.public  
20 - %span.cblue  
21 - %i.icon-share  
22 - Public  
23 - - else  
24 - %span.cgreen  
25 - %i.icon-lock  
26 - Private  
27 -  
28 %p Repo Size: #{@project.repository.size} MB 18 %p Repo Size: #{@project.repository.size} MB
29 %p Created at: #{@project.created_at.stamp('Aug 22, 2013')} 19 %p Created at: #{@project.created_at.stamp('Aug 22, 2013')}
30 %p Owner: #{link_to @project.owner_name, @project.owner} 20 %p Owner: #{link_to @project.owner_name, @project.owner}
app/views/shared/_clone_panel.html.haml
  Diff comments   View file @9ef5573
1 -.input-prepend.project_clone_holder 1 +.input-prepend.input-append.project_clone_holder
2 %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH 2 %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH
3 %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase 3 %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase
4 = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge", readonly: true 4 = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge", readonly: true
  5 + %span.add-on
  6 + - if @project.public
  7 + .cblue
  8 + %i.icon-share
  9 + public
  10 + - else
  11 + .cgreen
  12 + %i.icon-lock
  13 + private