From 6b941cf92ce3accbac5656973d3204becc908f9a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 28 Nov 2011 20:30:35 +0200 Subject: [PATCH] merge request list --- app/assets/stylesheets/projects.css.scss | 21 +++++++++- app/controllers/merge_requests_controller.rb | 2 +- app/views/issues/show.html.haml | 6 +-- .../merge_requests/_merge_request.html.haml | 14 +++++++ app/views/merge_requests/index.html.haml | 39 ++++++++----------- app/views/merge_requests/show.html.haml | 8 ++-- 6 files changed, 58 insertions(+), 32 deletions(-) create mode 100644 app/views/merge_requests/_merge_request.html.haml diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 34c9c10b..fb37d6cd 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -328,12 +328,16 @@ body.project-page table .commit { border:none; text-shadow:none; - &.high { + &.inline { + display:inline; + } + + &.high, &.closed { background: #D12F19; color:white; } - &.today { + &.today, &.open { background: #44aa22; color:white; } @@ -399,6 +403,19 @@ body.project-page .merge-request-commits a.commit span.update-author{color: #999 body.project-page .merge-request-commits a.commit span.update-author strong{font-weight: bold; font-style: normal;} +/** Update entry **/ +.update-data { padding: 0 } +.update-data { width:100%; } +.update-data.ui-box .data { padding:0; } +a.update-item {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +a.update-item:last-child{border-bottom: 0} +a.update-item img{float: left; margin-right: 10px;} +a.update-item span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} +a.update-item span.update-title{margin-bottom: 10px} +a.update-item span.update-author{color: #999; font-weight: normal; font-style: italic;} +a.update-item span.update-author strong{font-weight: bold; font-style: normal;} + + body.project-page .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; } body.projects-page input.text.git-url.project_list_url { width:165px; } diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index c163bbd3..92387160 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -10,7 +10,7 @@ class MergeRequestsController < ApplicationController before_filter :authorize_write_project!, :only => [:new, :create, :edit, :update] def index - @merge_requests = @project.merge_requests.all + @merge_requests = @project.merge_requests end def show diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 7eba0adf..1d95f4f1 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -3,9 +3,9 @@ = "Issue ##{@issue.id}" .right - if @issue.closed - %span.tag.high Resolved + %span.tag.closed Closed - else - %span.tag.today Open + %span.tag.open Open .data %p= @issue.title @@ -28,7 +28,7 @@ - if @issue.closed = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "grey-button" - else - = link_to 'Resolve', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button" + = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button" .right = link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "grey-button positive" diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml new file mode 100644 index 00000000..c5bcf779 --- /dev/null +++ b/app/views/merge_requests/_merge_request.html.haml @@ -0,0 +1,14 @@ +%a.update-item{:href => project_merge_request_path(@project, merge_request)} + = image_tag gravatar_icon(merge_request.author_email), :class => "left", :width => 40 + %span.update-title + = merge_request.title + %span.update-author + %strong= merge_request.author_name + authored + = time_ago_in_words(merge_request.created_at) + ago + .right + %span.tag.commit= merge_request.source_branch + → + %span.tag.commit= merge_request.target_branch + diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index b7fcea7d..c3f8d06a 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -1,25 +1,20 @@ -%table - %thead - %th Target branch - %th Source branch - %th Author - %th Assignee - %th Title - %th - %th - %th +- 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 - - @merge_requests.each do |merge_request| - %tr - %td= merge_request.target_branch - %td= merge_request.source_branch - %td= merge_request.author_id - %td= merge_request.assignee_id - %td= merge_request.title - %td= link_to 'Show', [@project, merge_request] - %td= link_to 'Edit', edit_project_merge_request_path(@project, merge_request) - %td= link_to 'Destroy', [@project, merge_request], :confirm => 'Are you sure?', :method => :delete + .clear + %br -%br +- if @merge_requests.closed.count > 0 + %div{ :class => "update-data ui-box ui-box-small ui-box-big" } + %h3 + %span.tag.closed Closed + .data + = render @merge_requests.closed + .clear + %br -= link_to 'New Merge request', new_project_merge_request_path(@project) += link_to 'New Merge request', new_project_merge_request_path(@project), :class => "grey-button" diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index ffd44d65..5ee56cae 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -2,12 +2,12 @@ %h3 = "Merge Request ##{@merge_request.id}:"   - = "'#{@merge_request.source_branch}'" + .tag.commit.inline= @merge_request.source_branch → - = "'#{@merge_request.target_branch}'" + .tag.commit.inline= @merge_request.target_branch .right - if @merge_request.closed - %span.tag.high Resolved + %span.tag.high Closed - else %span.tag.today Open @@ -32,7 +32,7 @@ - if @merge_request.closed = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "grey-button" - else - = link_to 'Resolve', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button" + = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button" .right = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), :class => "grey-button positive"