Commit a61e70b5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

UI improvements to issue show page



* labels moved below the issue
* removed margin in "created by..." area
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 2b3bfdc37738
......@@ -122,5 +122,5 @@
.edit-issue.inline-update select {
width: 100%;
max-width: 230px;
max-width: 200px;
}
......@@ -126,1 +126,9 @@
}
.issue-labels .label {
padding: 6px 10px;
}
form.edit-issue {
margin: 0;
}
= form_for [@project, @issue], :remote => true, :html => {:class => 'edit-issue inline-update'} do |f|
= form_for [@project, @issue], remote: true, html: {class: 'edit-issue inline-update'} do |f|
.pull-right
......@@ -2,7 +2,7 @@
.pull-right
Created by #{link_to_member(@project, issue.author)}
Created by #{link_to_member(@project, issue.author)}&nbsp;
- if issue.assignee
\ and currently assigned to
- if can?(current_user, :modify_issue, @issue)
= link_to profile_path(issue.assignee) do
......@@ -4,9 +4,9 @@
- if issue.assignee
\ and currently assigned to
- if can?(current_user, :modify_issue, @issue)
= link_to profile_path(issue.assignee) do
= image_tag(avatar_icon(issue.assignee.email), :class => 'avatar avatar-inline s16 assignee') if issue.assignee
= image_tag(avatar_icon(issue.assignee.email), class: 'avatar avatar-inline s16 assignee') if issue.assignee
= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Assign to user (none):" }, {class: 'chosen'})
- elsif issue.assignee
= link_to_member(@project, @issue.assignee)
......@@ -14,8 +14,8 @@
- if issue.milestone
- milestone = issue.milestone
%cite.cgray and attached to milestone
- if can?(current_user, :modify_issue, @issue)
= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone (none):" }, {class: 'chosen'})
= hidden_field_tag :issue_context
......@@ -18,7 +18,7 @@
- if can?(current_user, :modify_issue, @issue)
= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone (none):" }, {class: 'chosen'})
= hidden_field_tag :issue_context
= f.submit :class => 'btn'
= f.submit class: 'btn'
- elsif issue.milestone
= link_to issue.milestone.title, project_milestone_path
......@@ -23,9 +23,2 @@
- elsif issue.milestone
= link_to issue.milestone.title, project_milestone_path
.pull-right
- issue.labels.each do |label|
%span{class: "label #{label_css_class(label.name)}"}
%i.icon-tag
= label.name
&nbsp;
......@@ -28,7 +28,7 @@
&larr; To issues list
%span.milestone-nav-link
- if @issue.milestone
|
|
= link_to project_milestone_path(@project, @issue.milestone) do
<strong>Milestone:</strong>
= @issue.milestone.title
......@@ -64,4 +64,11 @@
- @issue.participants.each do |participant|
= link_to_member(@project, participant, name: false, size: 24)
.issue-labels.pull-right
- @issue.labels.each do |label|
%span{class: "label #{label_css_class(label.name)}"}
%i.icon-tag
= label.name
&nbsp;
.voting_notes#notes= render "projects/notes/notes_with_form"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment