Download as
Browse Code »

Commit 083990c795c74a0dfc76813e44706289a7ede43d

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

Minor UI improvements

Showing 8 changed files with 29 additions and 12 deletions   Show diff stats
app/assets/stylesheets/sections/snippets.scss
  Diff comments   View file @083990c
1 .snippet.file-holder { 1 .snippet.file-holder {
2 .file-title { 2 .file-title {
3 .snippet-file-name { 3 .snippet-file-name {
  4 + padding: 4px 10px;
4 position: relative; 5 position: relative;
5 top: -4px; 6 top: -4px;
6 left: -4px; 7 left: -4px;
app/views/projects/merge_requests/index.html.haml
  Diff comments   View file @083990c
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 New Merge Request 4 New Merge Request
5 %h3.page-title 5 %h3.page-title
6 Merge Requests 6 Merge Requests
  7 + %span (#{@merge_requests.total_count})
7 8
8 9
9 .row 10 .row
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @083990c
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 .automerge_widget.cannot_be_merged{style: "display:none"} 32 .automerge_widget.cannot_be_merged{style: "display:none"}
33 .alert.alert-disabled 33 .alert.alert-disabled
34 %span 34 %span
35 - = link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn btn-small padded", title: "How To Merge", "data-toggle" => "modal" 35 + = link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal"
36   36  
37 %strong This request can't be merged with GitLab. You should do it manually 37 %strong This request can't be merged with GitLab. You should do it manually
38 38
app/views/projects/snippets/_form.html.haml
  Diff comments   View file @083990c
@@ -27,8 +27,11 @@ @@ -27,8 +27,11 @@
27 = f.hidden_field :content, class: 'snippet-file-content' 27 = f.hidden_field :content, class: 'snippet-file-content'
28 28
29 .form-actions 29 .form-actions
30 - = f.submit 'Save', class: "btn-save btn"  
31 - = link_to "Cancel", project_snippets_path(@project), class: " btn" 30 + - if @snippet.new_record?
  31 + = f.submit 'Create snippet', class: "btn-create btn"
  32 + - else
  33 + = f.submit 'Save', class: "btn-save btn"
  34 + = link_to "Cancel", project_snippets_path(@project), class: " btn btn-cancel"
32 - unless @snippet.new_record? 35 - unless @snippet.new_record?
33 .pull-right= link_to 'Destroy', project_snippet_path(@project, @snippet), confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}" 36 .pull-right= link_to 'Destroy', project_snippet_path(@project, @snippet), confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
34 37
app/views/projects/snippets/index.html.haml
  Diff comments   View file @083990c
1 %h3.page-title 1 %h3.page-title
2 Snippets 2 Snippets
3 - %small share code pastes with others out of git repository  
4 -  
5 - if can? current_user, :write_project_snippet, @project 3 - if can? current_user, :write_project_snippet, @project
6 - = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do 4 + = link_to new_project_snippet_path(@project), class: "btn btn-new pull-right", title: "New Snippet" do
7 Add new snippet 5 Add new snippet
  6 +
  7 +%p.light
  8 + Share code pastes with others out of git repository
  9 +
8 %hr 10 %hr
9 %ul.bordered-list 11 %ul.bordered-list
10 = render partial: "projects/snippets/snippet", collection: @snippets 12 = render partial: "projects/snippets/snippet", collection: @snippets
app/views/snippets/_form.html.haml
  Diff comments   View file @083990c
@@ -14,7 +14,8 @@ @@ -14,7 +14,8 @@
14 .controls= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true 14 .controls= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
15 .control-group 15 .control-group
16 = f.label "Private?" 16 = f.label "Private?"
17 - .controls= f.check_box :private, {class: ''} 17 + .controls
  18 + = f.check_box :private, {class: ''}
18 .control-group 19 .control-group
19 .file-editor 20 .file-editor
20 = f.label :file_name, "File" 21 = f.label :file_name, "File"
@@ -32,7 +33,7 @@ @@ -32,7 +33,7 @@
32 - else 33 - else
33 = f.submit 'Save', class: "btn-save btn" 34 = f.submit 'Save', class: "btn-save btn"
34 35
35 - = link_to "Cancel", snippets_path(@project), class: " btn" 36 + = link_to "Cancel", snippets_path(@project), class: "btn btn-cancel"
36 - unless @snippet.new_record? 37 - unless @snippet.new_record?
37 .pull-right= link_to 'Destroy', snippet_path(@snippet), confirm: 'Removed snippet cannot be restored! Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}" 38 .pull-right= link_to 'Destroy', snippet_path(@snippet), confirm: 'Removed snippet cannot be restored! Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
38 39
app/views/snippets/current_user_index.html.haml
  Diff comments   View file @083990c
@@ -14,11 +14,20 @@ @@ -14,11 +14,20 @@
14 .span3 14 .span3
15 %ul.nav.nav-pills.nav-stacked 15 %ul.nav.nav-pills.nav-stacked
16 = nav_tab :scope, nil do 16 = nav_tab :scope, nil do
17 - = link_to "All", user_snippets_path(@user) 17 + = link_to user_snippets_path(@user) do
  18 + All
  19 + %span.pull-right
  20 + = @user.snippets.count
18 = nav_tab :scope, 'private' do 21 = nav_tab :scope, 'private' do
19 - = link_to "Private", user_snippets_path(@user, scope: 'private') 22 + = link_to user_snippets_path(@user, scope: 'private') do
  23 + Private
  24 + %span.pull-right
  25 + = @user.snippets.private.count
20 = nav_tab :scope, 'public' do 26 = nav_tab :scope, 'public' do
21 - = link_to "Public", user_snippets_path(@user, scope: 'public') 27 + = link_to user_snippets_path(@user, scope: 'public') do
  28 + Public
  29 + %span.pull-right
  30 + = @user.snippets.public.count
22 31
23 .span9.my-snippets 32 .span9.my-snippets
24 = render 'snippets' 33 = render 'snippets'
features/steps/project/project_snippets.rb
  Diff comments   View file @083990c
@@ -58,7 +58,7 @@ class ProjectSnippets < Spinach::FeatureSteps @@ -58,7 +58,7 @@ class ProjectSnippets < Spinach::FeatureSteps
58 within('.file-editor') do 58 within('.file-editor') do
59 find(:xpath, "//input[@id='project_snippet_content']").set 'Content of snippet three' 59 find(:xpath, "//input[@id='project_snippet_content']").set 'Content of snippet three'
60 end 60 end
61 - click_button "Save" 61 + click_button "Create snippet"
62 end 62 end
63 63
64 Then 'I should see snippet "Snippet three"' do 64 Then 'I should see snippet "Snippet three"' do