From 083990c795c74a0dfc76813e44706289a7ede43d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 12 Aug 2013 12:08:52 +0300 Subject: [PATCH] Minor UI improvements --- app/assets/stylesheets/sections/snippets.scss | 1 + app/views/projects/merge_requests/index.html.haml | 1 + app/views/projects/merge_requests/show/_mr_accept.html.haml | 2 +- app/views/projects/snippets/_form.html.haml | 7 +++++-- app/views/projects/snippets/index.html.haml | 8 +++++--- app/views/snippets/_form.html.haml | 5 +++-- app/views/snippets/current_user_index.html.haml | 15 ++++++++++++--- features/steps/project/project_snippets.rb | 2 +- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/sections/snippets.scss b/app/assets/stylesheets/sections/snippets.scss index 7dab0bf..e67ca79 100644 --- a/app/assets/stylesheets/sections/snippets.scss +++ b/app/assets/stylesheets/sections/snippets.scss @@ -1,6 +1,7 @@ .snippet.file-holder { .file-title { .snippet-file-name { + padding: 4px 10px; position: relative; top: -4px; left: -4px; diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 7970745..35de914 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -4,6 +4,7 @@ New Merge Request %h3.page-title Merge Requests + %span (#{@merge_requests.total_count}) .row diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 621a3cf..7cae196 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -32,7 +32,7 @@ .automerge_widget.cannot_be_merged{style: "display:none"} .alert.alert-disabled %span - = 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" + = link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal"   %strong This request can't be merged with GitLab. You should do it manually diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml index 14a42f3..e83f5d0 100644 --- a/app/views/projects/snippets/_form.html.haml +++ b/app/views/projects/snippets/_form.html.haml @@ -27,8 +27,11 @@ = f.hidden_field :content, class: 'snippet-file-content' .form-actions - = f.submit 'Save', class: "btn-save btn" - = link_to "Cancel", project_snippets_path(@project), class: " btn" + - if @snippet.new_record? + = f.submit 'Create snippet', class: "btn-create btn" + - else + = f.submit 'Save', class: "btn-save btn" + = link_to "Cancel", project_snippets_path(@project), class: " btn btn-cancel" - unless @snippet.new_record? .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}" diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml index 2e8ddde..c40f63d 100644 --- a/app/views/projects/snippets/index.html.haml +++ b/app/views/projects/snippets/index.html.haml @@ -1,10 +1,12 @@ %h3.page-title Snippets - %small share code pastes with others out of git repository - - if can? current_user, :write_project_snippet, @project - = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do + = link_to new_project_snippet_path(@project), class: "btn btn-new pull-right", title: "New Snippet" do Add new snippet + +%p.light + Share code pastes with others out of git repository + %hr %ul.bordered-list = render partial: "projects/snippets/snippet", collection: @snippets diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml index fa0d515..e77550e 100644 --- a/app/views/snippets/_form.html.haml +++ b/app/views/snippets/_form.html.haml @@ -14,7 +14,8 @@ .controls= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true .control-group = f.label "Private?" - .controls= f.check_box :private, {class: ''} + .controls + = f.check_box :private, {class: ''} .control-group .file-editor = f.label :file_name, "File" @@ -32,7 +33,7 @@ - else = f.submit 'Save', class: "btn-save btn" - = link_to "Cancel", snippets_path(@project), class: " btn" + = link_to "Cancel", snippets_path(@project), class: "btn btn-cancel" - unless @snippet.new_record? .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}" diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml index a2a9aef..51030f9 100644 --- a/app/views/snippets/current_user_index.html.haml +++ b/app/views/snippets/current_user_index.html.haml @@ -14,11 +14,20 @@ .span3 %ul.nav.nav-pills.nav-stacked = nav_tab :scope, nil do - = link_to "All", user_snippets_path(@user) + = link_to user_snippets_path(@user) do + All + %span.pull-right + = @user.snippets.count = nav_tab :scope, 'private' do - = link_to "Private", user_snippets_path(@user, scope: 'private') + = link_to user_snippets_path(@user, scope: 'private') do + Private + %span.pull-right + = @user.snippets.private.count = nav_tab :scope, 'public' do - = link_to "Public", user_snippets_path(@user, scope: 'public') + = link_to user_snippets_path(@user, scope: 'public') do + Public + %span.pull-right + = @user.snippets.public.count .span9.my-snippets = render 'snippets' diff --git a/features/steps/project/project_snippets.rb b/features/steps/project/project_snippets.rb index d390459..86c0685 100644 --- a/features/steps/project/project_snippets.rb +++ b/features/steps/project/project_snippets.rb @@ -58,7 +58,7 @@ class ProjectSnippets < Spinach::FeatureSteps within('.file-editor') do find(:xpath, "//input[@id='project_snippet_content']").set 'Content of snippet three' end - click_button "Save" + click_button "Create snippet" end Then 'I should see snippet "Snippet three"' do -- libgit2 0.21.2