Commit 1616dfdc07689ccea258e606f414e65836f666a3
1 parent
5405f19b
Exists in
spb-stable
and in
3 other branches
UI improvements to issue show page
* labels moved below the issue * removed margin in "created by..." area Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
3 changed files
with
22 additions
and
14 deletions
Show diff stats
app/assets/stylesheets/sections/issues.scss
@@ -122,5 +122,13 @@ input.check_all_issues { | @@ -122,5 +122,13 @@ input.check_all_issues { | ||
122 | 122 | ||
123 | .edit-issue.inline-update select { | 123 | .edit-issue.inline-update select { |
124 | width: 100%; | 124 | width: 100%; |
125 | - max-width: 230px; | 125 | + max-width: 200px; |
126 | +} | ||
127 | + | ||
128 | +.issue-labels .label { | ||
129 | + padding: 6px 10px; | ||
130 | +} | ||
131 | + | ||
132 | +form.edit-issue { | ||
133 | + margin: 0; | ||
126 | } | 134 | } |
app/views/projects/issues/_issue_context.html.haml
1 | -= form_for [@project, @issue], :remote => true, :html => {:class => 'edit-issue inline-update'} do |f| | 1 | += form_for [@project, @issue], remote: true, html: {class: 'edit-issue inline-update'} do |f| |
2 | .pull-right | 2 | .pull-right |
3 | - Created by #{link_to_member(@project, issue.author)} | 3 | + Created by #{link_to_member(@project, issue.author)} |
4 | - if issue.assignee | 4 | - if issue.assignee |
5 | \ and currently assigned to | 5 | \ and currently assigned to |
6 | 6 | ||
7 | - if can?(current_user, :modify_issue, @issue) | 7 | - if can?(current_user, :modify_issue, @issue) |
8 | = link_to profile_path(issue.assignee) do | 8 | = link_to profile_path(issue.assignee) do |
9 | - = image_tag(avatar_icon(issue.assignee.email), :class => 'avatar avatar-inline s16 assignee') if issue.assignee | 9 | + = image_tag(avatar_icon(issue.assignee.email), class: 'avatar avatar-inline s16 assignee') if issue.assignee |
10 | = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Assign to user (none):" }, {class: 'chosen'}) | 10 | = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Assign to user (none):" }, {class: 'chosen'}) |
11 | - elsif issue.assignee | 11 | - elsif issue.assignee |
12 | = link_to_member(@project, @issue.assignee) | 12 | = link_to_member(@project, @issue.assignee) |
@@ -14,18 +14,11 @@ | @@ -14,18 +14,11 @@ | ||
14 | - if issue.milestone | 14 | - if issue.milestone |
15 | - milestone = issue.milestone | 15 | - milestone = issue.milestone |
16 | %cite.cgray and attached to milestone | 16 | %cite.cgray and attached to milestone |
17 | - | 17 | + |
18 | - if can?(current_user, :modify_issue, @issue) | 18 | - if can?(current_user, :modify_issue, @issue) |
19 | = f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone (none):" }, {class: 'chosen'}) | 19 | = f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone (none):" }, {class: 'chosen'}) |
20 | 20 | ||
21 | = hidden_field_tag :issue_context | 21 | = hidden_field_tag :issue_context |
22 | - = f.submit :class => 'btn' | 22 | + = f.submit class: 'btn' |
23 | - elsif issue.milestone | 23 | - elsif issue.milestone |
24 | = link_to issue.milestone.title, project_milestone_path | 24 | = link_to issue.milestone.title, project_milestone_path |
25 | - | ||
26 | -.pull-right | ||
27 | - - issue.labels.each do |label| | ||
28 | - %span{class: "label #{label_css_class(label.name)}"} | ||
29 | - %i.icon-tag | ||
30 | - = label.name | ||
31 | - |
app/views/projects/issues/show.html.haml
@@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
28 | ← To issues list | 28 | ← To issues list |
29 | %span.milestone-nav-link | 29 | %span.milestone-nav-link |
30 | - if @issue.milestone | 30 | - if @issue.milestone |
31 | - | | 31 | + | |
32 | = link_to project_milestone_path(@project, @issue.milestone) do | 32 | = link_to project_milestone_path(@project, @issue.milestone) do |
33 | <strong>Milestone:</strong> | 33 | <strong>Milestone:</strong> |
34 | = @issue.milestone.title | 34 | = @issue.milestone.title |
@@ -64,4 +64,11 @@ | @@ -64,4 +64,11 @@ | ||
64 | - @issue.participants.each do |participant| | 64 | - @issue.participants.each do |participant| |
65 | = link_to_member(@project, participant, name: false, size: 24) | 65 | = link_to_member(@project, participant, name: false, size: 24) |
66 | 66 | ||
67 | + .issue-labels.pull-right | ||
68 | + - @issue.labels.each do |label| | ||
69 | + %span{class: "label #{label_css_class(label.name)}"} | ||
70 | + %i.icon-tag | ||
71 | + = label.name | ||
72 | + | ||
73 | + | ||
67 | .voting_notes#notes= render "projects/notes/notes_with_form" | 74 | .voting_notes#notes= render "projects/notes/notes_with_form" |