Download as
Browse Code »

Commit e48a0b8eabf4b54342024ed0d2f755d92f48c935

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

usability improvements

Showing 11 changed files with 40 additions and 29 deletions   Show diff stats
app/assets/stylesheets/issues.css.scss
  Diff comments   View file @e48a0b8
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 } 11 }
12 12
13 .issues_filter { 13 .issues_filter {
14 - margin-top:10px;  
15 - .left { 14 + margin:10px 0;
  15 + .left {
16 margin-right:15px; 16 margin-right:15px;
17 } 17 }
18 } 18 }
app/assets/stylesheets/style.scss
  Diff comments   View file @e48a0b8
@@ -440,7 +440,7 @@ header .account-box img{ @@ -440,7 +440,7 @@ header .account-box img{
440 right: 20px; 440 right: 20px;
441 position: absolute; 441 position: absolute;
442 width: 33px; height: 33px; 442 width: 33px; height: 33px;
443 - display: block; box-shadow: 0 1px 2px black; top:0;} 443 + display: block; top:0;}
444 header .account-box img:after{ 444 header .account-box img:after{
445 content: " "; 445 content: " ";
446 display: block; 446 display: block;
app/assets/stylesheets/top_panel.scss
  Diff comments   View file @e48a0b8
@@ -139,8 +139,7 @@ body header { @@ -139,8 +139,7 @@ body header {
139 .rss-icon { 139 .rss-icon {
140 margin:0 15px; 140 margin:0 15px;
141 padding:3px; 141 padding:3px;
142 - border:1px solid #ccc; 142 + border:1px solid #AAA;
143 border-radius:3px; 143 border-radius:3px;
144 float:left; 144 float:left;
145 - background:#DDD;  
146 } 145 }
app/controllers/merge_requests_controller.rb
  Diff comments   View file @e48a0b8
@@ -21,6 +21,13 @@ class MergeRequestsController < ApplicationController @@ -21,6 +21,13 @@ class MergeRequestsController < ApplicationController
21 21
22 def index 22 def index
23 @merge_requests = @project.merge_requests 23 @merge_requests = @project.merge_requests
  24 +
  25 + @merge_requests = case params[:f].to_i
  26 + when 2 then @merge_requests.closed
  27 + else @merge_requests.opened
  28 + end
  29 +
  30 + @merge_requests = @merge_requests.includes(:author, :project)
24 end 31 end
25 32
26 def show 33 def show
app/views/deploy_keys/_form.html.haml
  Diff comments   View file @e48a0b8
@@ -14,5 +14,5 @@ @@ -14,5 +14,5 @@
14 %td= f.text_area :key, :style => "width:300px; height:130px" 14 %td= f.text_area :key, :style => "width:300px; height:130px"
15 %br 15 %br
16 .merge-tabs 16 .merge-tabs
17 - = f.submit 'Save', :class => "grey-button" 17 + = f.submit 'Save', :class => "positive-button"
18 18
app/views/deploy_keys/index.html.haml
  Diff comments   View file @e48a0b8
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 .notice_holder 9 .notice_holder
10 %li Deploy Keys do not exist yet. 10 %li Deploy Keys do not exist yet.
11 - if can? current_user, :admin_project, @project 11 - if can? current_user, :admin_project, @project
12 - %li You can add a new one by clicking on plus icon 12 + %li You can add a new one by clicking on "Add New" button
13 13
14 :javascript 14 :javascript
15 $('.delete-key').live('ajax:success', function() { 15 $('.delete-key').live('ajax:success', function() {
app/views/issues/_form.html.haml
  Diff comments   View file @e48a0b8
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 %br 44 %br
45 %br 45 %br
46 .merge-tabs 46 .merge-tabs
47 - = f.submit 'Save', :class => "grey-button" 47 + = f.submit 'Save', :class => "positive-button"
48   48  
49 - unless @issue.new_record? 49 - unless @issue.new_record?
50 .right 50 .right
app/views/issues/index.html.haml
  Diff comments   View file @e48a0b8
@@ -7,18 +7,20 @@ @@ -7,18 +7,20 @@
7 7
8 %div#issues-table-holder 8 %div#issues-table-holder
9 .top_panel_issues 9 .top_panel_issues
10 - = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do 10 + = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :right, :id => "issue_search_form" do
11 = hidden_field_tag :project_id, @project.id, { :id => 'project_id' } 11 = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
12 = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' } 12 = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
13 13
14 - .right.issues_filter 14 + .left.issues_filter
15 = form_tag project_issues_path(@project), :method => :get do 15 = form_tag project_issues_path(@project), :method => :get do
16 .left 16 .left
17 = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "setIssueFilter(this.form, 0)", :id => "open_issues", :class => "status" 17 = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "setIssueFilter(this.form, 0)", :id => "open_issues", :class => "status"
18 - = label_tag "open_issues","Open" 18 + = label_tag "open_issues" do
  19 + %span.tag.open Open
19 .left 20 .left
20 = radio_button_tag :f, 2, params[:f] == "2", :onclick => "setIssueFilter(this.form, 2)", :id => "closed_issues", :class => "status" 21 = radio_button_tag :f, 2, params[:f] == "2", :onclick => "setIssueFilter(this.form, 2)", :id => "closed_issues", :class => "status"
21 - = label_tag "closed_issues","Closed" 22 + = label_tag "closed_issues" do
  23 + %span.tag.closed Closed
22 .left 24 .left
23 = radio_button_tag :f, 3, params[:f] == "3", :onclick => "setIssueFilter(this.form, 3)", :id => "my_issues", :class => "status" 25 = radio_button_tag :f, 3, params[:f] == "3", :onclick => "setIssueFilter(this.form, 3)", :id => "my_issues", :class => "status"
24 = label_tag "my_issues","To Me" 26 = label_tag "my_issues","To Me"
app/views/merge_requests/_form.html.haml
  Diff comments   View file @e48a0b8
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 %br 36 %br
37 %br 37 %br
38 .merge-tabs 38 .merge-tabs
39 - = f.submit 'Save', :class => "grey-button" 39 + = f.submit 'Save', :class => "positive-button"
40   40  
41 - unless @merge_request.new_record? 41 - unless @merge_request.new_record?
42 .right 42 .right
app/views/merge_requests/index.html.haml
  Diff comments   View file @e48a0b8
1 = render "merge_requests/head" 1 = render "merge_requests/head"
2 2
3 -- if @merge_requests.opened.count > 0  
4 - %div{ :class => "update-data ui-box ui-box-small ui-box-big" }  
5 - %h3  
6 - %span.tag.open Open  
7 - .data  
8 - = render @merge_requests.opened 3 +.left.issues_filter
  4 + = form_tag project_merge_requests_path(@project), :method => :get do
  5 + .left
  6 + = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_merge_requests", :class => "status"
  7 + = label_tag "open_merge_requests" do
  8 + %span.tag.open Open
  9 + .left
  10 + = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_merge_requests", :class => "status"
  11 + = label_tag "closed_merge_requests" do
  12 + %span.tag.closed Closed
9 13
10 - .clear  
11 - %br 14 +.clear
  15 +%hr
12 16
13 -- if @merge_requests.closed.count > 0 17 +- if @merge_requests.count > 0
14 %div{ :class => "update-data ui-box ui-box-small ui-box-big" } 18 %div{ :class => "update-data ui-box ui-box-small ui-box-big" }
15 - %h3  
16 - %span.tag.closed Closed  
17 .data 19 .data
18 - = render @merge_requests.closed 20 + = render @merge_requests
  21 +
19 .clear 22 .clear
20 %br 23 %br
21 24
22 -- unless @merge_requests.count > 0 25 +- unless @merge_requests.count > 0 || params[:f] == "2"
23 .notice_holder 26 .notice_holder
24 %li Merge Requests do not exist yet. 27 %li Merge Requests do not exist yet.
25 - if can? current_user, :write_merge_request, @project 28 - if can? current_user, :write_merge_request, @project
app/views/snippets/_form.html.haml
  Diff comments   View file @e48a0b8
@@ -4,12 +4,12 @@ @@ -4,12 +4,12 @@
4 - if @snippet.new_record? 4 - if @snippet.new_record?
5 = link_to project_snippets_path(@project) do 5 = link_to project_snippets_path(@project) do
6 .entity-button 6 .entity-button
7 - Back 7 + Snippets
8 %i 8 %i
9 - else 9 - else
10 = link_to project_snippet_path(@project, @snippet) do 10 = link_to project_snippet_path(@project, @snippet) do
11 .entity-button 11 .entity-button
12 - Back 12 + Show Snippet
13 %i 13 %i
14 %h2= @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}" 14 %h2= @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
15 15
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 = f.text_area :content 40 = f.text_area :content
41 41
42 .merge-tabs 42 .merge-tabs
43 - = f.submit 'Save', :class => "grey-button" 43 + = f.submit 'Save', :class => "positive-button"
44 - unless @snippet.new_record? 44 - unless @snippet.new_record?
45 .right= link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "red-button delete-snippet", :id => "destroy_snippet_#{@snippet.id}" 45 .right= link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "red-button delete-snippet", :id => "destroy_snippet_#{@snippet.id}"
46 46