Browse Source

Merged r19658 and r19659 to 4.1-stable (#32889).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19666 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.1
Jean-Philippe Lang 4 years ago
parent
commit
9045c9b3d8

+ 4
- 5
app/helpers/issues_helper.rb View File

@@ -124,11 +124,11 @@ module IssuesHelper
link_to_issue(
child,
:project => (issue.project_id != child.project_id)),
:class => 'subject', :style => 'width: 50%') +
:class => 'subject') +
content_tag('td', h(child.status), :class => 'status') +
content_tag('td', link_to_user(child.assigned_to), :class => 'assigned_to') +
content_tag('td', format_date(child.start_date), :class => 'start_date') +
content_tag('td', format_date(child.due_date), :class => 'due_date') +
content_tag('td', link_to_user(child.assigned_to), :class => 'assigned_to') +
content_tag('td',
(if child.disabled_core_fields.include?('done_ratio')
''
@@ -179,12 +179,11 @@ module IssuesHelper
other,
:project => Setting.cross_project_issue_relations?)
}.html_safe,
:class => 'subject',
:style => 'width: 50%') +
:class => 'subject') +
content_tag('td', other_issue.status, :class => 'status') +
content_tag('td', link_to_user(other_issue.assigned_to), :class => 'assigned_to') +
content_tag('td', format_date(other_issue.start_date), :class => 'start_date') +
content_tag('td', format_date(other_issue.due_date), :class => 'due_date') +
content_tag('td', link_to_user(other_issue.assigned_to), :class => 'assigned_to') +
content_tag('td',
(if other_issue.disabled_core_fields.include?('done_ratio')
''

+ 2
- 1
public/stylesheets/application.css View File

@@ -532,7 +532,8 @@ div.issue.overdue .due-date .value { color: #c22; }

#issue_tree table.issues, #relations table.issues { border: 0; }
#issue_tree td.checkbox, #relations td.checkbox {display:none;}
#relations td.buttons, #issue_tree td.buttons {padding:0;}
#issue_tree td.subject, #relations td.subject {width: 50%;}
#issue_tree td.buttons, #relations td.buttons {padding:0;}

#trackers_description {display:none;}
#trackers_description dt {font-weight: bold; text-decoration: underline;}

+ 3
- 3
public/stylesheets/responsive.css View File

@@ -797,12 +797,12 @@
}

#issue_tree .issue > td.subject, #relations .issue > td.subject {
width: 100% !important; /* let subject have one full width column */
width: 100%; /* let subject have one full width column */
word-break: break-word; /* break word if subject is too long */
}

#issue_tree .issue > td:not(.checkbox), #relations .issue > td:not(.checkbox) {
width: 33.33%; /* three columns for all cells that are not subject */
#issue_tree .issue > td:not(.subject), #relations .issue > td:not(.subject) {
width: 20%; /* three columns for all cells that are not subject */
}

#issue_tree .issues, #issue_tree .issue,

Loading…
Cancel
Save