Download as
Browse Code »

Commit 88b8b15dbdc1247b349c9fc6f8d71377322890b9

Authored by Dmitriy Zaporozhets
1 parent 7e42084f
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Improve UI for Issue/MR 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 7 changed files with 50 additions and 31 deletions   Show diff stats
app/assets/stylesheets/generic/common.scss
  Diff comments   View file @88b8b15
... ... @@ -88,11 +88,15 @@ pre.well-pre {
88 88 /** Big Labels **/
89 89 .state-label {
90 90 font-size: 14px;
91   - padding: 6px 25px;
  91 + padding: 9px 25px;
92 92 text-align: center;
93   - @include border-radius(4px);
94 93 text-shadow: none;
95   - margin-left: 10px;
  94 + margin-right: 20px;
  95 +
  96 + &.state-label-blue {
  97 + background: #31708f;
  98 + color: #FFF;
  99 + }
96 100  
97 101 &.state-label-green {
98 102 background: #4A4;
... ...
app/assets/stylesheets/generic/issue_box.scss
  Diff comments   View file @88b8b15
... ... @@ -17,11 +17,10 @@
17 17 margin-bottom: 0;
18 18 }
19 19  
20   - .creator {
21   - padding: 8px 25px;
22   - background: #eee;
  20 + .state {
  21 + height: 34px;
23 22 border-bottom: 1px solid #DDD;
24   - color: #777;
  23 + line-height: 32px;
25 24 }
26 25  
27 26 .title {
... ...
app/helpers/issues_helper.rb
  Diff comments   View file @88b8b15
... ... @@ -84,4 +84,12 @@ module IssuesHelper
84 84 def milestone_options object
85 85 options_from_collection_for_select(@project.milestones.active, 'id', 'title', object.milestone_id)
86 86 end
  87 +
  88 + def issue_alert_class(issue)
  89 + if issue.closed?
  90 + 'alert-danger'
  91 + else
  92 + 'alert-success'
  93 + end
  94 + end
87 95 end
... ...
app/helpers/merge_requests_helper.rb
  Diff comments   View file @88b8b15
... ... @@ -41,4 +41,14 @@ module MergeRequestsHelper
41 41 "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}"
42 42 end
43 43 end
  44 +
  45 + def merge_request_alert_class(merge_request)
  46 + if merge_request.merged?
  47 + 'alert-info'
  48 + elsif merge_request.closed?
  49 + 'alert-danger'
  50 + else
  51 + 'alert-success'
  52 + end
  53 + end
44 54 end
... ...
app/views/projects/issues/show.html.haml
  Diff comments   View file @88b8b15
1 1 %h3.page-title
2 2 Issue ##{@issue.iid}
3 3  
4   - - if @issue.closed?
5   - %span.state-label.state-label-red Closed
6   - - else
7   - %span.state-label.state-label-green Open
8   -
9 4 %span.pull-right
10 5 - if can?(current_user, :write_issue, @project)
11 6 = link_to new_project_issue_path(@project), class: "btn grouped", title: "New Issue", id: "new_issue_link" do
... ... @@ -35,8 +30,14 @@
35 30 = @issue.milestone.title
36 31  
37 32 .issue-box
38   - .creator
39   - Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)}
  33 + .state{ class: issue_alert_class(@issue) }
  34 + - if @issue.closed?
  35 + %span.state-label.state-label-red Closed
  36 + - else
  37 + %span.state-label.state-label-green Open
  38 +
  39 + %span.creator
  40 + Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)}
40 41  
41 42 %h4.title
42 43 = gfm escape_once(@issue.title)
... ...
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @88b8b15
1 1 .issue-box
2   - .creator
3   - Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)}
  2 + .state{ class: merge_request_alert_class(@merge_request) }
  3 + - if @merge_request.merged?
  4 + %span.state-label.state-label-blue
  5 + Merged
  6 + - elsif @merge_request.closed?
  7 + %span.state-label.state-label-red
  8 + Closed
  9 + - else
  10 + %span.state-label.state-label-green
  11 + Open
  12 + %span.creator
  13 + Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)}
4 14  
5 15 %h4.title
6 16 = gfm escape_once(@merge_request.title)
... ... @@ -16,13 +26,13 @@
16 26 = markdown @merge_request.description
17 27  
18 28 - if @merge_request.closed?
19   - .description.alert-danger
  29 + .description
20 30 %span
21 31 %i.icon-remove
22 32 Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
23 33 #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}.
24 34 - if @merge_request.merged?
25   - .description.alert-success
  35 + .description
26 36 %span
27 37 %i.icon-ok
28 38 Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
... ...
app/views/projects/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @88b8b15
1 1 %h3.page-title
2 2 = "Merge Request ##{@merge_request.iid}"
3 3  
4   - - if @merge_request.merged?
5   - %span.state-label.state-label-green
6   - %i.icon-ok
7   - Merged
8   - - elsif @merge_request.closed?
9   - %span.state-label.state-label-red
10   - Closed
11   - - else
12   - %span.state-label.state-label-green
13   - Open
14   -
15   -
16   -
17 4 %span.pull-right
18 5 - if can?(current_user, :modify_merge_request, @merge_request)
19 6 - if @merge_request.opened?
... ...