##// END OF EJS Templates
Remove the Description label from the issue view and omit the block if empty (#6677)....
Jean-Philippe Lang -
r4150:c058bc224549
parent child
Show More
@@ -1,134 +1,135
1 <%= render :partial => 'action_menu' %>
1 <%= render :partial => 'action_menu' %>
2
2
3 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
3 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
4
4
5 <div class="<%= @issue.css_classes %> details">
5 <div class="<%= @issue.css_classes %> details">
6 <%= avatar(@issue.author, :size => "50") %>
6 <%= avatar(@issue.author, :size => "50") %>
7
7
8 <div class="subject">
8 <div class="subject">
9 <%= render_issue_subject_with_tree(@issue) %>
9 <%= render_issue_subject_with_tree(@issue) %>
10 </div>
10 </div>
11 <p class="author">
11 <p class="author">
12 <%= authoring @issue.created_on, @issue.author %>.
12 <%= authoring @issue.created_on, @issue.author %>.
13 <% if @issue.created_on != @issue.updated_on %>
13 <% if @issue.created_on != @issue.updated_on %>
14 <%= l(:label_updated_time, time_tag(@issue.updated_on)) %>.
14 <%= l(:label_updated_time, time_tag(@issue.updated_on)) %>.
15 <% end %>
15 <% end %>
16 </p>
16 </p>
17
17
18 <table class="attributes">
18 <table class="attributes">
19 <tr>
19 <tr>
20 <th class="status"><%=l(:field_status)%>:</th><td class="status"><%= @issue.status.name %></td>
20 <th class="status"><%=l(:field_status)%>:</th><td class="status"><%= @issue.status.name %></td>
21 <th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
21 <th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
22 </tr>
22 </tr>
23 <tr>
23 <tr>
24 <th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= @issue.priority.name %></td>
24 <th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= @issue.priority.name %></td>
25 <th class="due-date"><%=l(:field_due_date)%>:</th><td class="due-date"><%= format_date(@issue.due_date) %></td>
25 <th class="due-date"><%=l(:field_due_date)%>:</th><td class="due-date"><%= format_date(@issue.due_date) %></td>
26 </tr>
26 </tr>
27 <tr>
27 <tr>
28 <th class="assigned-to"><%=l(:field_assigned_to)%>:</th><td class="assigned-to"><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
28 <th class="assigned-to"><%=l(:field_assigned_to)%>:</th><td class="assigned-to"><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
29 <th class="progress"><%=l(:field_done_ratio)%>:</th><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
29 <th class="progress"><%=l(:field_done_ratio)%>:</th><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
30 </tr>
30 </tr>
31 <tr>
31 <tr>
32 <th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h @issue.category ? @issue.category.name : "-" %></td>
32 <th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h @issue.category ? @issue.category.name : "-" %></td>
33 <% if User.current.allowed_to?(:view_time_entries, @project) %>
33 <% if User.current.allowed_to?(:view_time_entries, @project) %>
34 <th class="spent-time"><%=l(:label_spent_time)%>:</th>
34 <th class="spent-time"><%=l(:label_spent_time)%>:</th>
35 <td class="spent-time"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %></td>
35 <td class="spent-time"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %></td>
36 <% end %>
36 <% end %>
37 </tr>
37 </tr>
38 <tr>
38 <tr>
39 <th class="fixed-version"><%=l(:field_fixed_version)%>:</th><td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
39 <th class="fixed-version"><%=l(:field_fixed_version)%>:</th><td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
40 <% if @issue.estimated_hours %>
40 <% if @issue.estimated_hours %>
41 <th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th><td class="estimated-hours"><%= l_hours(@issue.estimated_hours) %></td>
41 <th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th><td class="estimated-hours"><%= l_hours(@issue.estimated_hours) %></td>
42 <% end %>
42 <% end %>
43 </tr>
43 </tr>
44 <%= render_custom_fields_rows(@issue) %>
44 <%= render_custom_fields_rows(@issue) %>
45 <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
45 <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
46 </table>
46 </table>
47 <hr />
48
47
48 <% if @issue.description? || @issue.attachments.any? -%>
49 <hr />
49 <div class="contextual">
50 <div class="contextual">
50 <%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment') unless @issue.description.blank? %>
51 <%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment') if @issue.description? %>
51 </div>
52 </div>
52
53
53 <p><strong><%=l(:field_description)%></strong></p>
54 <div class="wiki">
54 <div class="wiki">
55 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
55 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
56 </div>
56 </div>
57
57
58 <%= link_to_attachments @issue %>
58 <%= link_to_attachments @issue %>
59 <% end -%>
59
60
60 <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
61 <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
61
62
62 <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
63 <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
63 <hr />
64 <hr />
64 <div id="issue_tree">
65 <div id="issue_tree">
65 <div class="contextual">
66 <div class="contextual">
66 <%= 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) %>
67 <%= 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) %>
67 </div>
68 </div>
68 <p><strong><%=l(:label_subtask_plural)%></strong></p>
69 <p><strong><%=l(:label_subtask_plural)%></strong></p>
69 <%= render_descendants_tree(@issue) unless @issue.leaf? %>
70 <%= render_descendants_tree(@issue) unless @issue.leaf? %>
70 </div>
71 </div>
71 <% end %>
72 <% end %>
72
73
73 <% if authorize_for('issue_relations', 'new') || @issue.relations.present? %>
74 <% if authorize_for('issue_relations', 'new') || @issue.relations.present? %>
74 <hr />
75 <hr />
75 <div id="relations">
76 <div id="relations">
76 <%= render :partial => 'relations' %>
77 <%= render :partial => 'relations' %>
77 </div>
78 </div>
78 <% end %>
79 <% end %>
79
80
80 </div>
81 </div>
81
82
82 <% if @changesets.present? %>
83 <% if @changesets.present? %>
83 <div id="issue-changesets">
84 <div id="issue-changesets">
84 <h3><%=l(:label_associated_revisions)%></h3>
85 <h3><%=l(:label_associated_revisions)%></h3>
85 <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
86 <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
86 </div>
87 </div>
87 <% end %>
88 <% end %>
88
89
89 <% if @journals.present? %>
90 <% if @journals.present? %>
90 <div id="history">
91 <div id="history">
91 <h3><%=l(:label_history)%></h3>
92 <h3><%=l(:label_history)%></h3>
92 <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
93 <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
93 </div>
94 </div>
94 <% end %>
95 <% end %>
95
96
96
97
97 <div style="clear: both;"></div>
98 <div style="clear: both;"></div>
98 <%= render :partial => 'action_menu', :locals => {:replace_watcher => 'watcher2' } %>
99 <%= render :partial => 'action_menu', :locals => {:replace_watcher => 'watcher2' } %>
99
100
100 <div style="clear: both;"></div>
101 <div style="clear: both;"></div>
101 <% if authorize_for('issues', 'edit') %>
102 <% if authorize_for('issues', 'edit') %>
102 <div id="update" style="display:none;">
103 <div id="update" style="display:none;">
103 <h3><%= l(:button_update) %></h3>
104 <h3><%= l(:button_update) %></h3>
104 <%= render :partial => 'edit' %>
105 <%= render :partial => 'edit' %>
105 </div>
106 </div>
106 <% end %>
107 <% end %>
107
108
108 <% other_formats_links do |f| %>
109 <% other_formats_links do |f| %>
109 <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
110 <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
110 <%= f.link_to 'PDF' %>
111 <%= f.link_to 'PDF' %>
111 <% end %>
112 <% end %>
112
113
113 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
114 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
114
115
115 <% content_for :sidebar do %>
116 <% content_for :sidebar do %>
116 <%= render :partial => 'issues/sidebar' %>
117 <%= render :partial => 'issues/sidebar' %>
117
118
118 <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
119 <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
119 (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
120 (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
120 <div id="watchers">
121 <div id="watchers">
121 <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
122 <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
122 </div>
123 </div>
123 <% end %>
124 <% end %>
124 <% end %>
125 <% end %>
125
126
126 <% content_for :header_tags do %>
127 <% content_for :header_tags do %>
127 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
128 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
128 <%= stylesheet_link_tag 'scm' %>
129 <%= stylesheet_link_tag 'scm' %>
129 <%= javascript_include_tag 'context_menu' %>
130 <%= javascript_include_tag 'context_menu' %>
130 <%= stylesheet_link_tag 'context_menu' %>
131 <%= stylesheet_link_tag 'context_menu' %>
131 <%= stylesheet_link_tag 'context_menu_rtl' if l(:direction) == 'rtl' %>
132 <%= stylesheet_link_tag 'context_menu_rtl' if l(:direction) == 'rtl' %>
132 <% end %>
133 <% end %>
133 <div id="context-menu" style="display: none;"></div>
134 <div id="context-menu" style="display: none;"></div>
134 <%= javascript_tag "new ContextMenu('#{issues_context_menu_path}')" %>
135 <%= javascript_tag "new ContextMenu('#{issues_context_menu_path}')" %>
General Comments 0
You need to be logged in to leave comments. Login now