Download as
Browse Code »

Commit d1aff25ca4d20c39340936b2fa2976349f028e43

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

Consistent place for state-label across issues, mr, milestones 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 5 changed files with 45 additions and 33 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @d1aff25
... ... @@ -106,13 +106,11 @@ pre.well-pre {
106 106 /** Big Labels **/
107 107 .state-label {
108 108 font-size: 14px;
109   - padding: 5px 15px;
  109 + padding: 6px 25px;
110 110 text-align: center;
111   - float: right;
112   - position: relative;
113   - top: -5px;
114 111 @include border-radius(4px);
115 112 text-shadow: none;
  113 + margin-left: 10px;
116 114  
117 115 &.state-label-green {
118 116 background: #4A4;
... ...
app/views/projects/issues/show.html.haml
  Diff comments   View file @d1aff25
... ... @@ -5,6 +5,11 @@
5 5 created at
6 6 = @issue.created_at.stamp("Aug 21, 2011")
7 7  
  8 + - if @issue.closed?
  9 + %span.state-label.state-label-red Closed
  10 + - else
  11 + %span.state-label.state-label-green Open
  12 +
8 13 %span.pull-right
9 14 - if can?(current_user, :write_issue, @project)
10 15 = link_to new_project_issue_path(@project), class: "btn grouped", title: "New Issue", id: "new_issue_link" do
... ... @@ -36,10 +41,6 @@
36 41 .ui-box.ui-box-show
37 42 .ui-box-head
38 43 %h4.box-title
39   - - if @issue.closed?
40   - .state-label.state-label-red Closed
41   - - else
42   - .state-label.state-label-green Open
43 44 = gfm escape_once(@issue.title)
44 45  
45 46 .ui-box-body
... ...
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @d1aff25
... ... @@ -2,18 +2,11 @@
2 2 .ui-box-head
3 3 %h4.box-title
4 4 = gfm escape_once(@merge_request.title)
5   - - if @merge_request.merged?
6   - .state-label.state-label-green
7   - %i.icon-ok
8   - Merged
9   - - elsif @merge_request.closed?
10   - .state-label.state-label-red
11   - Closed
12 5  
13 6 .ui-box-body
14 7 %div
15 8 %cite.cgray
16   - Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}.
  9 + Created by #{link_to_member(@project, @merge_request.author)}.
17 10 - if @merge_request.assignee
18 11 Currently assigned to #{link_to_member(@project, @merge_request.assignee)}.
19 12 - if @merge_request.milestone
... ...
app/views/projects/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @d1aff25
1 1 %h3.page-title
2   - = "Merge Request ##{@merge_request.iid}:"
3   - &nbsp;
4   - -if @merge_request.for_fork?
5   - %span.label-branch
6   - %span.label-project= truncate(@merge_request.source_project_path, length: 25)
7   - #{@merge_request.source_branch}
8   - &rarr;
9   - %span.label-branch= @merge_request.target_branch
  2 + = "Merge Request ##{@merge_request.iid}"
  3 + %small
  4 + created at
  5 + = @merge_request.created_at.stamp("Aug 21, 2011")
  6 +
  7 + - if @merge_request.merged?
  8 + %span.state-label.state-label-green
  9 + %i.icon-ok
  10 + Merged
  11 + - elsif @merge_request.closed?
  12 + %span.state-label.state-label-red
  13 + Closed
10 14 - else
11   - %span.label-branch= @merge_request.source_branch
12   - &rarr;
13   - %span.label-branch= @merge_request.target_branch
  15 + %span.state-label.state-label-green
  16 + Open
  17 +
  18 +
14 19  
15 20 %span.pull-right
16 21 - if can?(current_user, :modify_merge_request, @merge_request)
... ... @@ -36,3 +41,16 @@
36 41 .back-link
37 42 = link_to project_merge_requests_path(@project) do
38 43 &larr; To merge requests
  44 +
  45 + %span.prepend-left-20.monospace
  46 + -if @merge_request.for_fork?
  47 + %span
  48 + %strong
  49 + #{truncate(@merge_request.source_project_path, length: 25)}:
  50 + #{@merge_request.source_branch}
  51 + &rarr;
  52 + %span= @merge_request.target_branch
  53 + - else
  54 + %span= @merge_request.source_branch
  55 + &rarr;
  56 + %spanh= @merge_request.target_branch
... ...
app/views/projects/milestones/show.html.haml
  Diff comments   View file @d1aff25
... ... @@ -3,15 +3,21 @@
3 3 Milestone ##{@milestone.iid}
4 4 %small
5 5 = @milestone.expires_at
  6 + - if @milestone.closed?
  7 + %span.state-label.state-label-red Closed
  8 + - elsif @milestone.expired?
  9 + %span.state-label.state-label-red Expired
  10 + - else
  11 + %span.state-label.state-label-green Open
6 12 .pull-right
7 13 - if can?(current_user, :admin_milestone, @project)
8 14 = link_to edit_project_milestone_path(@project, @milestone), class: "btn grouped" do
9 15 %i.icon-edit
10 16 Edit
11 17 - if @milestone.active?
12   - = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove"
  18 + = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove grouped"
13 19 - else
14   - = link_to 'Reopen Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn"
  20 + = link_to 'Reopen Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn grouped"
15 21  
16 22 - if @milestone.issues.any? && @milestone.can_be_closed?
17 23 .alert.alert-success
... ... @@ -25,10 +31,6 @@
25 31 .ui-box.ui-box-show
26 32 .ui-box-head
27 33 %h4.box-title
28   - - if @milestone.closed?
29   - .state-label.state-label-red Closed
30   - - elsif @milestone.expired?
31   - .state-label.state-label-red Expired
32 34  
33 35 = gfm escape_once(@milestone.title)
34 36  
... ...