Download as
Browse Code »

Commit 46906ca9db15b263acf860874832d01f1efce706

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

Issues, Merge Request show page polished. Fixed +n overflow

Showing 3 changed files with 19 additions and 26 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @46906ca
... ... @@ -1030,6 +1030,8 @@ p.time {
1030 1030 }
1031 1031  
1032 1032 .project_box .project_descr,
  1033 +.merge_request_box .middle_area,
  1034 +.issue_box .middle_area,
1033 1035 .commit_box .commit_message {
1034 1036 margin: -20px;
1035 1037 padding: 20px;
... ...
app/views/issues/show.html.haml
  Diff comments   View file @46906ca
... ... @@ -31,22 +31,19 @@
31 31 .alert-message.success.status_info Open
32 32 = @issue.title
33 33  
34   - %hr
35   - %div
36   - %div.row
37   - %div.issue_meta.span13
38   - %cite.cgray Created by
39   - = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
40   - %strong.author= link_to_issue_author(@issue)
41   -
42   - %cite.cgray and currently assigned to
43   - = image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av"
44   - %strong.author= link_to_issue_assignee(@issue)
  34 + %div.middle_area
  35 + %cite.cgray Created by
  36 + = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
  37 + %strong.author= link_to_issue_author(@issue)
  38 +
  39 + %cite.cgray and currently assigned to
  40 + = image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av"
  41 + %strong.author= link_to_issue_assignee(@issue)
45 42  
46   - %div
47   - - if @issue.description.present?
48   - %hr
49   - = markdown @issue.description
  43 + %div
  44 + - if @issue.description.present?
  45 + %hr
  46 + = markdown @issue.description
50 47  
51 48  
52 49 .issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue"
... ...
app/views/merge_requests/show.html.haml
  Diff comments   View file @46906ca
... ... @@ -5,19 +5,14 @@
5 5 →
6 6 %span.pretty_label.branch= @merge_request.target_branch
7 7  
8   - %small
9   - created at
10   - = @merge_request.created_at.stamp("Aug 21, 2011")
11   -
12 8 %span.right
13 9 - if can?(current_user, :modify_merge_request, @merge_request)
14 10 - if @merge_request.open?
15   - = 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"
16   - = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do
  11 + = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
  12 + = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
  13 + = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
17 14 Edit
18 15  
19   - %br
20   - %small= link_to "Show how to merge", "#", :class => "vlink how_to_merge_link", :title => "How To Merge"
21 16 %br
22 17 - if @merge_request.upvotes > 0
23 18 .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
... ... @@ -27,7 +22,6 @@
27 22 = link_to project_merge_requests_path(@project) do
28 23 ← To merge requests
29 24  
30   -
31 25 .merge_request_box
32 26 .merge_request_status_holder
33 27 %h5
... ... @@ -38,9 +32,9 @@
38 32 = @merge_request.title
39 33  
40 34  
41   - %div
  35 + %div.middle_area
42 36 %div
43   - %cite.cgray Created by
  37 + %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
44 38 = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
45 39 %strong.author= link_to_merge_request_author(@merge_request)
46 40  
... ...