diff --git a/app/assets/stylesheets/issues.css.scss b/app/assets/stylesheets/issues.css.scss index 0f87501d150d773a7c49d402e22aded5855fbd3e..d2341edcf3334bc92fd8ce81584f006812306ee3 100644 --- a/app/assets/stylesheets/issues.css.scss +++ b/app/assets/stylesheets/issues.css.scss @@ -11,8 +11,8 @@ } .issues_filter { - margin-top:10px; - .left { + margin:10px 0; + .left { margin-right:15px; } } diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 76a629777bcdfa1b929d460824816d30447b9856..6203a219017839a7e4026fe71cf47bf64803346d 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -440,7 +440,7 @@ header .account-box img{ right: 20px; position: absolute; width: 33px; height: 33px; - display: block; box-shadow: 0 1px 2px black; top:0;} + display: block; top:0;} header .account-box img:after{ content: " "; display: block; diff --git a/app/assets/stylesheets/top_panel.scss b/app/assets/stylesheets/top_panel.scss index 6299f7d0976fa5040e792978c559f3c23f0b53c4..1239ef2c4d6c0886ae076df69cd8e4828fe62dbf 100644 --- a/app/assets/stylesheets/top_panel.scss +++ b/app/assets/stylesheets/top_panel.scss @@ -139,8 +139,7 @@ body header { .rss-icon { margin:0 15px; padding:3px; - border:1px solid #ccc; + border:1px solid #AAA; border-radius:3px; float:left; - background:#DDD; } diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 6f7f1f6a7c7edea13cac6510ef3f2a0dcfc2bd25..3456a0a7fcbd61bc5f9b99deb5dc99c8010b2d25 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -21,6 +21,13 @@ class MergeRequestsController < ApplicationController def index @merge_requests = @project.merge_requests + + @merge_requests = case params[:f].to_i + when 2 then @merge_requests.closed + else @merge_requests.opened + end + + @merge_requests = @merge_requests.includes(:author, :project) end def show diff --git a/app/views/deploy_keys/_form.html.haml b/app/views/deploy_keys/_form.html.haml index 04ea30ba202cbb21d750a9644ce787f323c44890..f0a300bb60ebc2f91a5e8c81c109d8b2a0c7fa9c 100644 --- a/app/views/deploy_keys/_form.html.haml +++ b/app/views/deploy_keys/_form.html.haml @@ -14,5 +14,5 @@ %td= f.text_area :key, :style => "width:300px; height:130px" %br .merge-tabs - = f.submit 'Save', :class => "grey-button" + = f.submit 'Save', :class => "positive-button" diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml index 015b818c76b54d2db423c8fc1f001f505a6cad1e..02c8c13599897fa6b23383984a2bc01ffc633b09 100644 --- a/app/views/deploy_keys/index.html.haml +++ b/app/views/deploy_keys/index.html.haml @@ -9,7 +9,7 @@ .notice_holder %li Deploy Keys do not exist yet. - if can? current_user, :admin_project, @project - %li You can add a new one by clicking on plus icon + %li You can add a new one by clicking on "Add New" button :javascript $('.delete-key').live('ajax:success', function() { diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml index 19d185a1456e2e13daf4ba4a2f8fd33f13a4ff4c..d13827e76ac06cfe146970a19308d819181738fd 100644 --- a/app/views/issues/_form.html.haml +++ b/app/views/issues/_form.html.haml @@ -44,7 +44,7 @@ %br %br .merge-tabs - = f.submit 'Save', :class => "grey-button" + = f.submit 'Save', :class => "positive-button"   - unless @issue.new_record? .right diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index d55e07f1adbea14804d721158c4a8834141e8f54..37654c83e1cadcd51c8145132326f4c18c1afb6a 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -7,18 +7,20 @@ %div#issues-table-holder .top_panel_issues - = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do + = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :right, :id => "issue_search_form" do = hidden_field_tag :project_id, @project.id, { :id => 'project_id' } = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' } - .right.issues_filter + .left.issues_filter = form_tag project_issues_path(@project), :method => :get do .left = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "setIssueFilter(this.form, 0)", :id => "open_issues", :class => "status" - = label_tag "open_issues","Open" + = label_tag "open_issues" do + %span.tag.open Open .left = radio_button_tag :f, 2, params[:f] == "2", :onclick => "setIssueFilter(this.form, 2)", :id => "closed_issues", :class => "status" - = label_tag "closed_issues","Closed" + = label_tag "closed_issues" do + %span.tag.closed Closed .left = radio_button_tag :f, 3, params[:f] == "3", :onclick => "setIssueFilter(this.form, 3)", :id => "my_issues", :class => "status" = label_tag "my_issues","To Me" diff --git a/app/views/merge_requests/_form.html.haml b/app/views/merge_requests/_form.html.haml index 85f765ebc8656e36355c3e81dfbf043da6ffa15b..d771661b03ba8674f7452cb2107daae831fbb861 100644 --- a/app/views/merge_requests/_form.html.haml +++ b/app/views/merge_requests/_form.html.haml @@ -36,7 +36,7 @@ %br %br .merge-tabs - = f.submit 'Save', :class => "grey-button" + = f.submit 'Save', :class => "positive-button"   - unless @merge_request.new_record? .right diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index dc8ddf07511924015c6a078a9876f0df52c34019..fa02be9e92cae22d4c08a34eb1e935ea2a3ea857 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -1,25 +1,28 @@ = render "merge_requests/head" -- if @merge_requests.opened.count > 0 - %div{ :class => "update-data ui-box ui-box-small ui-box-big" } - %h3 - %span.tag.open Open - .data - = render @merge_requests.opened +.left.issues_filter + = form_tag project_merge_requests_path(@project), :method => :get do + .left + = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_merge_requests", :class => "status" + = label_tag "open_merge_requests" do + %span.tag.open Open + .left + = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_merge_requests", :class => "status" + = label_tag "closed_merge_requests" do + %span.tag.closed Closed - .clear - %br +.clear +%hr -- if @merge_requests.closed.count > 0 +- if @merge_requests.count > 0 %div{ :class => "update-data ui-box ui-box-small ui-box-big" } - %h3 - %span.tag.closed Closed .data - = render @merge_requests.closed + = render @merge_requests + .clear %br -- unless @merge_requests.count > 0 +- unless @merge_requests.count > 0 || params[:f] == "2" .notice_holder %li Merge Requests do not exist yet. - if can? current_user, :write_merge_request, @project diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml index af058fbfa0f5bffdf0a6ee9e252b0822846bc6a4..63ba3512e64164d208d42426f01f93fdd523ad4b 100644 --- a/app/views/snippets/_form.html.haml +++ b/app/views/snippets/_form.html.haml @@ -4,12 +4,12 @@ - if @snippet.new_record? = link_to project_snippets_path(@project) do .entity-button - Back + Snippets %i - else = link_to project_snippet_path(@project, @snippet) do .entity-button - Back + Show Snippet %i %h2= @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}" @@ -40,7 +40,7 @@ = f.text_area :content .merge-tabs - = f.submit 'Save', :class => "grey-button" + = f.submit 'Save', :class => "positive-button" - unless @snippet.new_record? .right= link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "red-button delete-snippet", :id => "destroy_snippet_#{@snippet.id}"