Skip to content

Commit cbbe526

Browse files
author
travis
committed
Added and updated Show.html for new releases
1 parent d02a525 commit cbbe526

File tree

3 files changed

+351
-4
lines changed

3 files changed

+351
-4
lines changed

‎app/views/issues/2.6.1.show.html.erb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
<%= link_to_if @prev_issue_id,
99
"\xc2\xab #{l(:label_previous)}",
1010
(@prev_issue_id ? issue_path(@prev_issue_id) : nil),
11-
:title => "##{@prev_issue_id}",
12-
:accesskey => accesskey(:previous) %> |
11+
:title => "##{@prev_issue_id}" %> |
1312
<% if @issue_position && @issue_count %>
1413
<span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
1514
<% end %>
1615
<%= link_to_if @next_issue_id,
1716
"#{l(:label_next)} \xc2\xbb",
1817
(@next_issue_id ? issue_path(@next_issue_id) : nil),
19-
:title => "##{@next_issue_id}",
20-
:accesskey => accesskey(:next) %>
18+
:title => "##{@next_issue_id}" %>
2119
</div>
2220
<% end %>
2321

@@ -88,6 +86,7 @@ end %>
8886
<% end -%>
8987

9088
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
89+
9190
<% if User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? and (Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "ticket_body" or Setting.plugin_redmine_spent_time_in_issue_description['report_location'].nil? )%>
9291
<%= render :partial => 'time_spent_report' %>
9392
<% end %>

‎app/views/issues/2.6.2.show.html.erb

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
<%= render :partial => 'action_menu' %>
2+
3+
<h2><%= issue_heading(@issue) %></h2>
4+
5+
<div class="<%= @issue.css_classes %> details">
6+
<% if @prev_issue_id || @next_issue_id %>
7+
<div class="next-prev-links contextual">
8+
<%= link_to_if @prev_issue_id,
9+
"\xc2\xab #{l(:label_previous)}",
10+
(@prev_issue_id ? issue_path(@prev_issue_id) : nil),
11+
:title => "##{@prev_issue_id}" %> |
12+
<% if @issue_position && @issue_count %>
13+
<span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
14+
<% end %>
15+
<%= link_to_if @next_issue_id,
16+
"#{l(:label_next)} \xc2\xbb",
17+
(@next_issue_id ? issue_path(@next_issue_id) : nil),
18+
:title => "##{@next_issue_id}" %>
19+
</div>
20+
<% end %>
21+
22+
<%= avatar(@issue.author, :size => "50") %>
23+
24+
<div class="subject">
25+
<%= render_issue_subject_with_tree(@issue) %>
26+
</div>
27+
<p class="author">
28+
<%= authoring @issue.created_on, @issue.author %>.
29+
<% if @issue.created_on != @issue.updated_on %>
30+
<%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
31+
<% end %>
32+
</p>
33+
34+
<table class="attributes">
35+
<%= issue_fields_rows do |rows|
36+
rows.left l(:field_status), h(@issue.status.name), :class => 'status'
37+
rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
38+
39+
unless @issue.disabled_core_fields.include?('assigned_to_id')
40+
rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
41+
end
42+
unless @issue.disabled_core_fields.include?('category_id')
43+
rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
44+
end
45+
unless @issue.disabled_core_fields.include?('fixed_version_id')
46+
rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
47+
end
48+
49+
unless @issue.disabled_core_fields.include?('start_date')
50+
rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
51+
end
52+
unless @issue.disabled_core_fields.include?('due_date')
53+
rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
54+
end
55+
unless @issue.disabled_core_fields.include?('done_ratio')
56+
rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
57+
end
58+
unless @issue.disabled_core_fields.include?('estimated_hours')
59+
unless @issue.estimated_hours.nil?
60+
rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
61+
end
62+
end
63+
if User.current.allowed_to?(:view_time_entries, @project)
64+
rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), issue_time_entries_path(@issue)) : "-"), :class => 'spent-time'
65+
end
66+
end %>
67+
<%= render_custom_fields_rows(@issue) %>
68+
<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
69+
</table>
70+
71+
<% if @issue.description? || @issue.attachments.any? -%>
72+
<hr />
73+
<% if @issue.description? %>
74+
<div class="description">
75+
<div class="contextual">
76+
<%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
77+
</div>
78+
79+
<p><strong><%=l(:field_description)%></strong></p>
80+
<div class="wiki">
81+
<%= textilizable @issue, :description, :attachments => @issue.attachments %>
82+
</div>
83+
</div>
84+
<% end %>
85+
<%= link_to_attachments @issue, :thumbnails => true %>
86+
<% end -%>
87+
88+
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
89+
90+
<% if User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? and (Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "ticket_body" or Setting.plugin_redmine_spent_time_in_issue_description['report_location'].nil? )%>
91+
<%= render :partial => 'time_spent_report' %>
92+
<% end %>
93+
94+
<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
95+
<hr />
96+
<div id="issue_tree">
97+
<div class="contextual">
98+
<%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
99+
</div>
100+
<p><strong><%=l(:label_subtask_plural)%></strong></p>
101+
<%= render_descendants_tree(@issue) unless @issue.leaf? %>
102+
</div>
103+
<% end %>
104+
105+
<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
106+
<hr />
107+
<div id="relations">
108+
<%= render :partial => 'relations' %>
109+
</div>
110+
<% end %>
111+
112+
</div>
113+
114+
<% if Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "above_revisions" and User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? %>
115+
<%= render :partial => 'floating_report' %>
116+
<div style="clear: both;"></div>
117+
<% end %>
118+
119+
<% if @changesets.present? %>
120+
<div id="issue-changesets">
121+
<h3><%=l(:label_associated_revisions)%></h3>
122+
<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
123+
</div>
124+
<% end %>
125+
126+
<% if Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "below_revisions" and User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? %>
127+
<div style="clear: both;"></div>
128+
<%= render :partial => 'floating_report' %>
129+
<% end %>
130+
131+
132+
<% if @journals.present? %>
133+
<div id="history">
134+
<h3><%=l(:label_history)%></h3>
135+
<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
136+
</div>
137+
<% end %>
138+
139+
140+
<div style="clear: both;"></div>
141+
<%= render :partial => 'action_menu' %>
142+
143+
<div style="clear: both;"></div>
144+
<% if @issue.editable? %>
145+
<div id="update" style="display:none;">
146+
<h3><%= l(:button_edit) %></h3>
147+
<%= render :partial => 'edit' %>
148+
</div>
149+
<% end %>
150+
151+
<% other_formats_links do |f| %>
152+
<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
153+
<%= f.link_to 'PDF' %>
154+
<% end %>
155+
156+
<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
157+
158+
<% content_for :sidebar do %>
159+
<%= render :partial => 'issues/sidebar' %>
160+
161+
<% if User.current.allowed_to?(:add_issue_watchers, @project) ||
162+
(@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
163+
<div id="watchers">
164+
<%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
165+
</div>
166+
<% end %>
167+
<% end %>
168+
169+
<% content_for :header_tags do %>
170+
<%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
171+
<% end %>
172+
173+
<%= context_menu issues_context_menu_path %>

‎app/views/issues/3.0.0.show.html.erb

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
<%= render :partial => 'action_menu' %>
2+
3+
<h2><%= issue_heading(@issue) %></h2>
4+
5+
<div class="<%= @issue.css_classes %> details">
6+
<% if @prev_issue_id || @next_issue_id %>
7+
<div class="next-prev-links contextual">
8+
<%= link_to_if @prev_issue_id,
9+
"\xc2\xab #{l(:label_previous)}",
10+
(@prev_issue_id ? issue_path(@prev_issue_id) : nil),
11+
:title => "##{@prev_issue_id}",
12+
:accesskey => accesskey(:previous) %> |
13+
<% if @issue_position && @issue_count %>
14+
<span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
15+
<% end %>
16+
<%= link_to_if @next_issue_id,
17+
"#{l(:label_next)} \xc2\xbb",
18+
(@next_issue_id ? issue_path(@next_issue_id) : nil),
19+
:title => "##{@next_issue_id}",
20+
:accesskey => accesskey(:next) %>
21+
</div>
22+
<% end %>
23+
24+
<%= avatar(@issue.author, :size => "50") %>
25+
26+
<div class="subject">
27+
<%= render_issue_subject_with_tree(@issue) %>
28+
</div>
29+
<p class="author">
30+
<%= authoring @issue.created_on, @issue.author %>.
31+
<% if @issue.created_on != @issue.updated_on %>
32+
<%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
33+
<% end %>
34+
</p>
35+
36+
<table class="attributes">
37+
<%= issue_fields_rows do |rows|
38+
rows.left l(:field_status), h(@issue.status.name), :class => 'status'
39+
rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
40+
41+
unless @issue.disabled_core_fields.include?('assigned_to_id')
42+
rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
43+
end
44+
unless @issue.disabled_core_fields.include?('category_id')
45+
rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
46+
end
47+
unless @issue.disabled_core_fields.include?('fixed_version_id')
48+
rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
49+
end
50+
51+
unless @issue.disabled_core_fields.include?('start_date')
52+
rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
53+
end
54+
unless @issue.disabled_core_fields.include?('due_date')
55+
rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
56+
end
57+
unless @issue.disabled_core_fields.include?('done_ratio')
58+
rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
59+
end
60+
unless @issue.disabled_core_fields.include?('estimated_hours')
61+
unless @issue.estimated_hours.nil?
62+
rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
63+
end
64+
end
65+
if User.current.allowed_to?(:view_time_entries, @project)
66+
rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), issue_time_entries_path(@issue)) : "-"), :class => 'spent-time'
67+
end
68+
end %>
69+
<%= render_custom_fields_rows(@issue) %>
70+
<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
71+
</table>
72+
73+
<% if @issue.description? || @issue.attachments.any? -%>
74+
<hr />
75+
<% if @issue.description? %>
76+
<div class="description">
77+
<div class="contextual">
78+
<%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
79+
</div>
80+
81+
<p><strong><%=l(:field_description)%></strong></p>
82+
<div class="wiki">
83+
<%= textilizable @issue, :description, :attachments => @issue.attachments %>
84+
</div>
85+
</div>
86+
<% end %>
87+
<%= link_to_attachments @issue, :thumbnails => true %>
88+
<% end -%>
89+
90+
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
91+
92+
<% if User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? and (Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "ticket_body" or Setting.plugin_redmine_spent_time_in_issue_description['report_location'].nil? )%>
93+
<%= render :partial => 'time_spent_report' %>
94+
<% end %>
95+
96+
<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
97+
<hr />
98+
<div id="issue_tree">
99+
<div class="contextual">
100+
<%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
101+
</div>
102+
<p><strong><%=l(:label_subtask_plural)%></strong></p>
103+
<%= render_descendants_tree(@issue) unless @issue.leaf? %>
104+
</div>
105+
<% end %>
106+
107+
<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
108+
<hr />
109+
<div id="relations">
110+
<%= render :partial => 'relations' %>
111+
</div>
112+
<% end %>
113+
114+
</div>
115+
116+
<% if Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "above_revisions" and User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? %>
117+
<%= render :partial => 'floating_report' %>
118+
<div style="clear: both;"></div>
119+
<% end %>
120+
121+
<% if @changesets.present? %>
122+
<div id="issue-changesets">
123+
<h3><%=l(:label_associated_revisions)%></h3>
124+
<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
125+
</div>
126+
<% end %>
127+
128+
<% if Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "below_revisions" and User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? %>
129+
<div style="clear: both;"></div>
130+
<%= render :partial => 'floating_report' %>
131+
<% end %>
132+
133+
134+
<% if @journals.present? %>
135+
<div id="history">
136+
<h3><%=l(:label_history)%></h3>
137+
<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
138+
</div>
139+
<% end %>
140+
141+
142+
<div style="clear: both;"></div>
143+
<%= render :partial => 'action_menu' %>
144+
145+
<div style="clear: both;"></div>
146+
<% if @issue.editable? %>
147+
<div id="update" style="display:none;">
148+
<h3><%= l(:button_edit) %></h3>
149+
<%= render :partial => 'edit' %>
150+
</div>
151+
<% end %>
152+
153+
<% other_formats_links do |f| %>
154+
<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
155+
<%= f.link_to 'PDF' %>
156+
<% end %>
157+
158+
<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
159+
160+
<% content_for :sidebar do %>
161+
<%= render :partial => 'issues/sidebar' %>
162+
163+
<% if User.current.allowed_to?(:add_issue_watchers, @project) ||
164+
(@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
165+
<div id="watchers">
166+
<%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
167+
</div>
168+
<% end %>
169+
<% end %>
170+
171+
<% content_for :header_tags do %>
172+
<%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
173+
<% end %>
174+
175+
<%= context_menu issues_context_menu_path %>

0 commit comments

Comments
 (0)