diff options
| -rw-r--r-- | app/helpers/issues_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/issues/_relations.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/show.rhtml | 2 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index db21e9ab7..aa140572f 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -47,9 +47,9 @@ module IssuesHelper issue.descendants.sort_by(&:lft).each do |child| level = child.level - issue.level - 1 s << content_tag('tr', - content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil)) + - content_tag('td', link_to_issue(child), :class => 'subject', - :style => "padding-left: #{level * 20}px") + + content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') + + content_tag('td', link_to_issue(child, :truncate => 60), :class => 'subject', + :style => "padding-left: #{level * 20}px") + content_tag('td', h(child.status)) + content_tag('td', link_to_user(child.assigned_to)) + content_tag('td', progress_bar(child.done_ratio, :width => '80px')), diff --git a/app/views/issues/_relations.rhtml b/app/views/issues/_relations.rhtml index 135bfa681..83a78b1c8 100644 --- a/app/views/issues/_relations.rhtml +++ b/app/views/issues/_relations.rhtml @@ -12,7 +12,7 @@ <tr> <td><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %> <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %> - <%= link_to_issue relation.other_issue(@issue) %> + <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %> </td> <td><%= relation.other_issue(@issue).status.name %></td> <td><%= format_date(relation.other_issue(@issue).start_date) %></td> diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index c07fa921b..a551efb80 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -65,7 +65,7 @@ <div class="contextual"> <%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %> </div> -<p><strong><%=l(:label_subtask_pural)%></strong></p> +<p><strong><%=l(:label_subtask_plural)%></strong></p> <%= render_descendants_tree(@issue) unless @issue.leaf? %> </div> <% end %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index cd8e98699..4623ff961 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -243,6 +243,7 @@ div.issue div.subject>div>p { margin-top: 0.5em; } div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;} #issue_tree table.issues { border: 0; } +#issue_tree td.checkbox {display:none;} fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; } fieldset.collapsible legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; } |