Download as
Browse Code »

Commit dac67ed65f22db82bbeeaaa8532460ba772b7311

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

Use new ui-box classes 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 9 changed files with 47 additions and 53 deletions   Show diff stats
app/views/projects/edit.html.haml
  Diff comments   View file @dac67ed
... ... @@ -105,7 +105,7 @@
105 105 Unarchive project
106 106 - else
107 107 Archive project
108   - .ui-box-body
  108 + .body
109 109 - if @project.archived?
110 110 %p
111 111 Unarchiving the project will mark its repository as active.
... ... @@ -168,7 +168,7 @@
168 168 - if can?(current_user, :remove_project, @project)
169 169 .ui-box.ui-box-danger
170 170 .title Remove project
171   - .ui-box-body
  171 + .body
172 172 %p
173 173 Removing the project will delete its repository and all related resources including issues, merge requests etc.
174 174 %br
... ...
app/views/projects/issues/_form.html.haml
  Diff comments   View file @dac67ed
... ... @@ -6,14 +6,14 @@
6 6 - @issue.errors.full_messages.each do |msg|
7 7 %span= msg
8 8 %br
9   - .ui-box.ui-box-show
10   - .ui-box-head
  9 + .issue-box
  10 + .title
11 11 .control-group
12 12 = f.label :title do
13 13 %strong= "Subject *"
14 14 .controls
15 15 = f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true
16   - .ui-box-body
  16 + .context
17 17 .control-group
18 18 .issue_assignee.pull-left
19 19 = f.label :assignee_id do
... ... @@ -31,7 +31,7 @@
31 31 Milestone
32 32 .controls= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'})
33 33  
34   - .ui-box-bottom
  34 + .description
35 35 .control-group
36 36 = f.label :label_list do
37 37 %i.icon-tag
... ...
app/views/projects/issues/show.html.haml
  Diff comments   View file @dac67ed
... ... @@ -37,17 +37,16 @@
37 37 %span.light Milestone
38 38 = @issue.milestone.title
39 39  
40   -.ui-box.ui-box-show
41   - .ui-box-head
42   - %h4.box-title
43   - = gfm escape_once(@issue.title)
  40 +.issue-box
  41 + %h4.title
  42 + = gfm escape_once(@issue.title)
44 43  
45   - .ui-box-body
  44 + .context
46 45 %cite.cgray
47 46 = render partial: 'issue_context', locals: { issue: @issue }
48 47  
49 48 - if @issue.description.present?
50   - .ui-box-bottom
  49 + .description
51 50 .wiki
52 51 = preserve do
53 52 = markdown @issue.description
... ...
app/views/projects/issues/update.js.haml
  Diff comments   View file @dac67ed
... ... @@ -3,8 +3,8 @@
3 3 :plain
4 4 $("##{dom_id(@issue)}").fadeOut();
5 5 - elsif params[:issue_context]
6   - $('.ui-box-body').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
7   - $('.ui-box-body').effect('highlight');
  6 + $('.issue-box .context').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
  7 + $('.issue-box .context').effect('highlight');
8 8 $('.chosen').chosen();
9 9 $('.edit-issue.inline-update input[type="submit"]').hide();
10 10 - if @issue.milestone
... ...
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @dac67ed
1   -.ui-box.ui-box-show
2   - .ui-box-head
3   - %h4.box-title
4   - = gfm escape_once(@merge_request.title)
  1 +.issue-box
  2 + %h4.title
  3 + = gfm escape_once(@merge_request.title)
5 4  
6   - .ui-box-body
7   - %div
8   - %cite.cgray
9   - Created by #{link_to_member(@project, @merge_request.author)}.
10   - - if @merge_request.assignee
11   - Currently assigned to #{link_to_member(@project, @merge_request.assignee)}.
12   - - if @merge_request.milestone
13   - .pull-right
14   - - milestone = @merge_request.milestone
15   - %cite.cgray Attached to milestone
16   - %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
  5 + .context
  6 + %cite.cgray
  7 + Created by #{link_to_member(@project, @merge_request.author)}.
  8 + - if @merge_request.assignee
  9 + Currently assigned to #{link_to_member(@project, @merge_request.assignee)}.
  10 + - if @merge_request.milestone
  11 + .pull-right
  12 + - milestone = @merge_request.milestone
  13 + %cite.cgray Attached to milestone
  14 + %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
17 15  
18 16  
19 17 - if @merge_request.description.present?
20   - .ui-box-bottom
  18 + .description
21 19 .wiki
22 20 = preserve do
23 21 = markdown @merge_request.description
24 22  
25 23 - if @merge_request.closed?
26   - .ui-box-bottom.alert-error
  24 + .description.alert-error
27 25 %span
28 26 %i.icon-remove
29 27 Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
30 28 #{time_ago_with_tooltip(@merge_request.closed_event.created_at)} ago.
31 29 - if @merge_request.merged?
32   - .ui-box-bottom.alert-success
  30 + .description.alert-success
33 31 %span
34 32 %i.icon-ok
35 33 Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
36 34 #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} ago.
37 35 - if !@closes_issues.empty? && @merge_request.opened?
38   - .ui-box-bottom.alert-info
  36 + .description.alert-info
39 37 %span
40 38 %i.icon-ok
41 39 Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
... ...
app/views/projects/milestones/show.html.haml
  Diff comments   View file @dac67ed
... ... @@ -28,13 +28,11 @@
28 28 &larr; To milestones list
29 29  
30 30  
31   -.ui-box.ui-box-show
32   - .ui-box-head
33   - %h4.box-title
  31 +.issue-box
  32 + %h4.title
  33 + = gfm escape_once(@milestone.title)
34 34  
35   - = gfm escape_once(@milestone.title)
36   -
37   - .ui-box-body
  35 + .context
38 36 %p
39 37 Progress:
40 38 #{@milestone.closed_items_count} closed
... ... @@ -46,7 +44,7 @@
46 44  
47 45  
48 46 - if @milestone.description.present?
49   - .ui-box-bottom
  47 + .description
50 48 = preserve do
51 49 = markdown @milestone.description
52 50  
... ...
app/views/projects/wikis/_form.html.haml
  Diff comments   View file @dac67ed
... ... @@ -6,15 +6,14 @@
6 6 - @wiki.errors.full_messages.each do |msg|
7 7 %li= msg
8 8  
9   - .ui-box.ui-box-show
10   - .ui-box-head
11   - %h3.page-title
12   - .edit-wiki-header
13   - = @wiki.title.titleize
14   - = f.hidden_field :title, value: @wiki.title
15   - = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
16   - = f.label :format, class: "pull-right", style: "padding-right: 20px;"
17   - .ui-box-body
  9 + .issue-box
  10 + %h3.title
  11 + .edit-wiki-header
  12 + = @wiki.title.titleize
  13 + = f.hidden_field :title, value: @wiki.title
  14 + = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
  15 + = f.label :format, class: "pull-right", style: "padding-right: 20px;"
  16 + .context
18 17 .controls
19 18 %span.cgray
20 19 Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
... ... @@ -22,11 +21,11 @@
22 21 %code [Link Title](page-slug)
23 22 \.
24 23  
25   - .ui-box-bottom
  24 + .description
26 25 .control-group
27 26 = f.label :content
28 27 .controls= f.text_area :content, class: 'span8 js-gfm-input', rows: 18
29   - .ui-box-bottom
  28 + .description
30 29 .control-group
31 30 = f.label :commit_message
32 31 .controls= f.text_field :message, class: 'span8', rows: 18
... ...
app/views/shared/_issues.html.haml
  Diff comments   View file @dac67ed
1 1 - if @issues.any?
2 2 - @issues.group_by(&:project).each do |group|
3   - .ui-box.small-box
  3 + .ui-box.ui-box-small
4 4 - project = group[0]
5 5 .title
6 6 = link_to_project project
... ...
app/views/shared/_merge_requests.html.haml
  Diff comments   View file @dac67ed
1 1 - if @merge_requests.any?
2 2 - @merge_requests.group_by(&:target_project).each do |group|
3   - .ui-box.small-box
  3 + .ui-box.ui-box-small
4 4 - project = group[0]
5 5 .title
6 6 = link_to_project project
... ...