Download as
Browse Code »

Commit d81f0b7845ff80d22d4ee2bc41208730ffc14df7

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

Bootstrap: Merge Request -> Show

Showing 6 changed files with 64 additions and 62 deletions   Show diff stats
app/models/commit.rb
  Diff comments   View file @d81f0b7
... ... @@ -27,7 +27,7 @@ class Commit
27 27 @head = head
28 28 end
29 29  
30   - def safe_message
  30 + def safe_message()
31 31 message
32 32 end
33 33  
... ...
app/views/layouts/_project_side.html.haml
  Diff comments   View file @d81f0b7
... ... @@ -13,5 +13,7 @@
13 13 Issues
14 14 = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
15 15 Wall
  16 + - if @project.common_notes.today.count > 0
  17 + %span.label= @project.common_notes.today.count
16 18 = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
17 19 Requests
... ...
app/views/merge_requests/_form.html.haml
  Diff comments   View file @d81f0b7
1 1 = form_for [@project, @merge_request] do |f|
2   - %div
3   - %span.entity-info
4   - - if @merge_request.new_record?
5   - = link_to project_merge_requests_path(@project) do
6   - .entity-button
7   - Merge Requests
8   - %i
9   - - else
10   - = link_to project_merge_request_path(@project, @merge_request) do
11   - .entity-button
12   - Show Merge Request
13   - %i
  2 + -if @merge_request.errors.any?
  3 + .alert-message.block-message.error
  4 + %ul
  5 + - @merge_request.errors.full_messages.each do |msg|
  6 + %li= msg
14 7  
15   - %h2= @merge_request.new_record? ? "New Merge Request" : "Edit Merge Request ##{@merge_request.id}"
  8 + .clearfix
  9 + = f.label :source_branch, "From"
  10 + .input= f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
  11 + .clearfix
  12 + = f.label :target_branch, "To"
  13 + .input= f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
  14 + .clearfix
  15 + = f.label :assignee_id, "Assign to"
  16 + .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
16 17  
17   - %hr
18   - %table.no-borders
19   - -if @merge_request.errors.any?
20   - %tr
21   - %td{:colspan => 2}
22   - #error_explanation
23   - - @merge_request.errors.full_messages.each do |msg|
24   - %span= msg
25   - %br
26   - %tr
27   - %td= f.label :source_branch, "From"
28   - %td= f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
29   - %tr
30   - %td= f.label :target_branch, "To"
31   - %td= f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
32   - %tr
33   - %td= f.label :assignee_id, "Assign to"
34   - %td= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
35   - = f.text_area :title, :style => "width:718px; height:100px", :maxlength => 255
36   - %br
37   - %br
38   - .merge-tabs
39   - = f.submit 'Save', :class => "positive-button"
  18 + .clearfix
  19 + = f.label :title
  20 + .input= f.text_area :title, :class => "xlarge", :maxlength => 255, :rows => 5
  21 + .actions
  22 + = f.submit 'Save', :class => "primary btn"
  23 + - if @merge_request.new_record?
  24 + = link_to project_merge_requests_path(@project), :class => "btn" do
  25 + Cancel
  26 + - else
  27 + = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do
  28 + Cancel
40 29  
41 30 - unless @merge_request.new_record?
42 31 .right
43   - = link_to 'Remove', [@project, @merge_request], :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
  32 + = link_to 'Remove', [@project, @merge_request], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger"
44 33  
45 34  
46 35  
... ...
app/views/merge_requests/edit.html.haml
  Diff comments   View file @d81f0b7
  1 +%h3
  2 + = "Edit merge request #{@merge_request.id}"
  3 +%hr
1 4 = render 'form'
... ...
app/views/merge_requests/new.html.haml
  Diff comments   View file @d81f0b7
  1 +%h3 New Merge Request
  2 +%hr
1 3 = render 'form'
... ...
app/views/merge_requests/show.html.haml
  Diff comments   View file @d81f0b7
... ... @@ -7,27 +7,39 @@
7 7  
8 8 %span.right
9 9 - if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
  10 + - if @merge_request.closed
  11 + = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
  12 + - else
  13 + = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
  14 + - if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
10 15 = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small" do
11   - Edit Merge Request
12   -%hr
  16 + Edit
13 17  
14   -%div
15   - %span.entity-info
16   - = image_tag gravatar_icon(@merge_request.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
17   - %span.commit-title
18   - %strong
19   - %span.commit-author
20   - %strong
21   - = link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.author.id)) do
22   - %span.author= @merge_request.author_name
23   - →
24   - = link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.assignee.id)) do
25   - %span.author= @merge_request.assignee_name
26   - %br
27   - = @merge_request.created_at.stamp("Aug 21, 2011 9:23pm")
28 18 %hr
29   -.clearfix
30   -%div.well= simple_format @merge_request.title
  19 +- if @merge_request.closed
  20 + .alert-message.error Closed
  21 +- else
  22 + .alert-message.success Open
  23 +
  24 +
  25 +%div.well
  26 + %div
  27 + %span.entity-info
  28 + = image_tag gravatar_icon(@merge_request.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
  29 + %span.commit-title
  30 + %strong
  31 + %span.commit-author
  32 + %strong
  33 + = link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.author.id)) do
  34 + %span.author= @merge_request.author_name
  35 + →
  36 + = link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.assignee.id)) do
  37 + %span.author= @merge_request.assignee_name
  38 + %br
  39 + .cgray= @merge_request.created_at.stamp("Aug 21, 2011 9:23pm")
  40 +
  41 +
  42 + %div= simple_format @merge_request.title
31 43  
32 44  
33 45 .tabs
... ... @@ -41,12 +53,6 @@
41 53 = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
42 54 Diff
43 55  
44   - - if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
45   - .right
46   - - if @merge_request.closed
47   - = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
48   - - else
49   - = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
50 56 %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
51 57  
52 58 .merge-request-notes
... ...