##// END OF EJS Templates
Fixes #773: Changeset block is smashing the update frame on issues/show....
Jean-Philippe Lang -
r1179:745fec76d0f8
parent child
Show More
@@ -1,112 +1,113
1 <div class="contextual">
1 <div class="contextual">
2 <%= show_and_goto_link(l(:button_update), 'update', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if authorize_for('issues', 'edit') %>
2 <%= show_and_goto_link(l(:button_update), 'update', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if authorize_for('issues', 'edit') %>
3 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
3 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
4 <%= watcher_tag(@issue, User.current) %>
4 <%= watcher_tag(@issue, User.current) %>
5 <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
5 <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
6 <%= link_to_if_authorized l(:button_move), {:controller => 'issues', :action => 'move', :id => @issue }, :class => 'icon icon-move' %>
6 <%= link_to_if_authorized l(:button_move), {:controller => 'issues', :action => 'move', :id => @issue }, :class => 'icon icon-move' %>
7 <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
7 <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
8 </div>
8 </div>
9
9
10 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
10 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
11
11
12 <div class="issue <%= "status-#{@issue.status.position} priority-#{@issue.priority.position}" %>">
12 <div class="issue <%= "status-#{@issue.status.position} priority-#{@issue.priority.position}" %>">
13 <h3><%=h @issue.subject %></h3>
13 <h3><%=h @issue.subject %></h3>
14 <p class="author">
14 <p class="author">
15 <%= authoring @issue.created_on, @issue.author %>.
15 <%= authoring @issue.created_on, @issue.author %>.
16 <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) if @issue.created_on != @issue.updated_on %>.
16 <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) if @issue.created_on != @issue.updated_on %>.
17 </p>
17 </p>
18
18
19 <table width="100%">
19 <table width="100%">
20 <tr>
20 <tr>
21 <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
21 <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
22 <td style="width:15%"><b><%=l(:field_start_date)%> :</b></td><td style="width:35%"><%= format_date(@issue.start_date) %></td>
22 <td style="width:15%"><b><%=l(:field_start_date)%> :</b></td><td style="width:35%"><%= format_date(@issue.start_date) %></td>
23 </tr>
23 </tr>
24 <tr>
24 <tr>
25 <td><b><%=l(:field_priority)%> :</b></td><td><%= @issue.priority.name %></td>
25 <td><b><%=l(:field_priority)%> :</b></td><td><%= @issue.priority.name %></td>
26 <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
26 <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
27 </tr>
27 </tr>
28 <tr>
28 <tr>
29 <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
29 <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
30 <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
30 <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
31 </tr>
31 </tr>
32 <tr>
32 <tr>
33 <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
33 <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
34 <% if User.current.allowed_to?(:view_time_entries, @project) %>
34 <% if User.current.allowed_to?(:view_time_entries, @project) %>
35 <td><b><%=l(:label_spent_time)%> :</b></td>
35 <td><b><%=l(:label_spent_time)%> :</b></td>
36 <td><%= @issue.spent_hours > 0 ? (link_to lwr(:label_f_hour, @issue.spent_hours), {:controller => 'timelog', :action => 'details', :issue_id => @issue}, :class => 'icon icon-time') : "-" %></td>
36 <td><%= @issue.spent_hours > 0 ? (link_to lwr(:label_f_hour, @issue.spent_hours), {:controller => 'timelog', :action => 'details', :issue_id => @issue}, :class => 'icon icon-time') : "-" %></td>
37 <% end %>
37 <% end %>
38 </tr>
38 </tr>
39 <tr>
39 <tr>
40 <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
40 <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
41 <% if @issue.estimated_hours %>
41 <% if @issue.estimated_hours %>
42 <td><b><%=l(:field_estimated_hours)%> :</b></td><td><%= lwr(:label_f_hour, @issue.estimated_hours) %></td>
42 <td><b><%=l(:field_estimated_hours)%> :</b></td><td><%= lwr(:label_f_hour, @issue.estimated_hours) %></td>
43 <% end %>
43 <% end %>
44 </tr>
44 </tr>
45 <tr>
45 <tr>
46 <% n = 0
46 <% n = 0
47 for custom_value in @custom_values %>
47 for custom_value in @custom_values %>
48 <td valign="top"><b><%= custom_value.custom_field.name %> :</b></td><td valign="top"><%= simple_format(h(show_value(custom_value))) %></td>
48 <td valign="top"><b><%= custom_value.custom_field.name %> :</b></td><td valign="top"><%= simple_format(h(show_value(custom_value))) %></td>
49 <% n = n + 1
49 <% n = n + 1
50 if (n > 1)
50 if (n > 1)
51 n = 0 %>
51 n = 0 %>
52 </tr><tr>
52 </tr><tr>
53 <%end
53 <%end
54 end %>
54 end %>
55 </tr>
55 </tr>
56 </table>
56 </table>
57 <hr />
57 <hr />
58
58
59 <p><strong><%=l(:field_description)%></strong></p>
59 <p><strong><%=l(:field_description)%></strong></p>
60 <div class="wiki">
60 <div class="wiki">
61 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
61 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
62 </div>
62 </div>
63
63
64 <% if @issue.attachments.any? %>
64 <% if @issue.attachments.any? %>
65 <%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>
65 <%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>
66 <% end %>
66 <% end %>
67
67
68 <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
68 <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
69 <hr />
69 <hr />
70 <div id="relations">
70 <div id="relations">
71 <%= render :partial => 'relations' %>
71 <%= render :partial => 'relations' %>
72 </div>
72 </div>
73 <% end %>
73 <% end %>
74
74
75 </div>
75 </div>
76
76
77 <% if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>
77 <% if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>
78 <div id="issue-changesets">
78 <div id="issue-changesets">
79 <h3><%=l(:label_associated_revisions)%></h3>
79 <h3><%=l(:label_associated_revisions)%></h3>
80 <%= render :partial => 'changesets', :locals => { :changesets => @issue.changesets} %>
80 <%= render :partial => 'changesets', :locals => { :changesets => @issue.changesets} %>
81 </div>
81 </div>
82 <% end %>
82 <% end %>
83
83
84 <% if @journals.any? %>
84 <% if @journals.any? %>
85 <div id="history">
85 <div id="history">
86 <h3><%=l(:label_history)%></h3>
86 <h3><%=l(:label_history)%></h3>
87 <%= render :partial => 'history', :locals => { :journals => @journals } %>
87 <%= render :partial => 'history', :locals => { :journals => @journals } %>
88 </div>
88 </div>
89 <% end %>
89 <% end %>
90 <div style="clear: both;"></div>
90
91
91 <% if authorize_for('issues', 'edit') %>
92 <% if authorize_for('issues', 'edit') %>
92 <div id="update" style="display:none;">
93 <div id="update" style="display:none;">
93 <h3><%= l(:button_update) %></h3>
94 <h3><%= l(:button_update) %></h3>
94 <%= render :partial => 'edit' %>
95 <%= render :partial => 'edit' %>
95 </div>
96 </div>
96 <% end %>
97 <% end %>
97
98
98 <p class="other-formats">
99 <p class="other-formats">
99 <%= l(:label_export_to) %>
100 <%= l(:label_export_to) %>
100 <span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
101 <span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
101 <span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
102 <span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
102 </p>
103 </p>
103
104
104 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
105 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
105
106
106 <% content_for :sidebar do %>
107 <% content_for :sidebar do %>
107 <%= render :partial => 'issues/sidebar' %>
108 <%= render :partial => 'issues/sidebar' %>
108 <% end %>
109 <% end %>
109
110
110 <% content_for :header_tags do %>
111 <% content_for :header_tags do %>
111 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
112 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
112 <% end %>
113 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now