##// END OF EJS Templates
Use :button_edit instead of :button_update for editing issues (#15275)....
Jean-Philippe Lang -
r12055:67aa2cb34e2b
parent child
Show More
@@ -1,7 +1,7
1 1 <div class="contextual">
2 <%= link_to l(:button_update), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
2 <%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
3 3 <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
4 4 <%= watcher_link(@issue, User.current) %>
5 5 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %>
6 6 <%= link_to l(:button_delete), issue_path(@issue), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
7 7 </div>
@@ -1,158 +1,158
1 1 <%= render :partial => 'action_menu' %>
2 2
3 3 <h2><%= issue_heading(@issue) %></h2>
4 4
5 5 <div class="<%= @issue.css_classes %> details">
6 6 <% if @prev_issue_id || @next_issue_id %>
7 7 <div class="next-prev-links contextual">
8 8 <%= link_to_if @prev_issue_id,
9 9 "\xc2\xab #{l(:label_previous)}",
10 10 (@prev_issue_id ? issue_path(@prev_issue_id) : nil),
11 11 :title => "##{@prev_issue_id}" %> |
12 12 <% if @issue_position && @issue_count %>
13 13 <span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
14 14 <% end %>
15 15 <%= link_to_if @next_issue_id,
16 16 "#{l(:label_next)} \xc2\xbb",
17 17 (@next_issue_id ? issue_path(@next_issue_id) : nil),
18 18 :title => "##{@next_issue_id}" %>
19 19 </div>
20 20 <% end %>
21 21
22 22 <%= avatar(@issue.author, :size => "50") %>
23 23
24 24 <div class="subject">
25 25 <%= render_issue_subject_with_tree(@issue) %>
26 26 </div>
27 27 <p class="author">
28 28 <%= authoring @issue.created_on, @issue.author %>.
29 29 <% if @issue.created_on != @issue.updated_on %>
30 30 <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
31 31 <% end %>
32 32 </p>
33 33
34 34 <table class="attributes">
35 35 <%= issue_fields_rows do |rows|
36 36 rows.left l(:field_status), h(@issue.status.name), :class => 'status'
37 37 rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
38 38
39 39 unless @issue.disabled_core_fields.include?('assigned_to_id')
40 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 41 end
42 42 unless @issue.disabled_core_fields.include?('category_id')
43 43 rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
44 44 end
45 45 unless @issue.disabled_core_fields.include?('fixed_version_id')
46 46 rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
47 47 end
48 48
49 49 unless @issue.disabled_core_fields.include?('start_date')
50 50 rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
51 51 end
52 52 unless @issue.disabled_core_fields.include?('due_date')
53 53 rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
54 54 end
55 55 unless @issue.disabled_core_fields.include?('done_ratio')
56 56 rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
57 57 end
58 58 unless @issue.disabled_core_fields.include?('estimated_hours')
59 59 unless @issue.estimated_hours.nil?
60 60 rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
61 61 end
62 62 end
63 63 if User.current.allowed_to?(:view_time_entries, @project)
64 64 rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), project_issue_time_entries_path(@project, @issue)) : "-"), :class => 'spent-time'
65 65 end
66 66 end %>
67 67 <%= render_custom_fields_rows(@issue) %>
68 68 <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
69 69 </table>
70 70
71 71 <% if @issue.description? || @issue.attachments.any? -%>
72 72 <hr />
73 73 <% if @issue.description? %>
74 74 <div class="description">
75 75 <div class="contextual">
76 76 <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
77 77 </div>
78 78
79 79 <p><strong><%=l(:field_description)%></strong></p>
80 80 <div class="wiki">
81 81 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
82 82 </div>
83 83 </div>
84 84 <% end %>
85 85 <%= link_to_attachments @issue, :thumbnails => true %>
86 86 <% end -%>
87 87
88 88 <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
89 89
90 90 <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
91 91 <hr />
92 92 <div id="issue_tree">
93 93 <div class="contextual">
94 94 <%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
95 95 </div>
96 96 <p><strong><%=l(:label_subtask_plural)%></strong></p>
97 97 <%= render_descendants_tree(@issue) unless @issue.leaf? %>
98 98 </div>
99 99 <% end %>
100 100
101 101 <% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
102 102 <hr />
103 103 <div id="relations">
104 104 <%= render :partial => 'relations' %>
105 105 </div>
106 106 <% end %>
107 107
108 108 </div>
109 109
110 110 <% if @changesets.present? %>
111 111 <div id="issue-changesets">
112 112 <h3><%=l(:label_associated_revisions)%></h3>
113 113 <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
114 114 </div>
115 115 <% end %>
116 116
117 117 <% if @journals.present? %>
118 118 <div id="history">
119 119 <h3><%=l(:label_history)%></h3>
120 120 <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
121 121 </div>
122 122 <% end %>
123 123
124 124
125 125 <div style="clear: both;"></div>
126 126 <%= render :partial => 'action_menu' %>
127 127
128 128 <div style="clear: both;"></div>
129 129 <% if @issue.editable? %>
130 130 <div id="update" style="display:none;">
131 <h3><%= l(:button_update) %></h3>
131 <h3><%= l(:button_edit) %></h3>
132 132 <%= render :partial => 'edit' %>
133 133 </div>
134 134 <% end %>
135 135
136 136 <% other_formats_links do |f| %>
137 137 <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
138 138 <%= f.link_to 'PDF' %>
139 139 <% end %>
140 140
141 141 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
142 142
143 143 <% content_for :sidebar do %>
144 144 <%= render :partial => 'issues/sidebar' %>
145 145
146 146 <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
147 147 (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
148 148 <div id="watchers">
149 149 <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
150 150 </div>
151 151 <% end %>
152 152 <% end %>
153 153
154 154 <% content_for :header_tags do %>
155 155 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
156 156 <% end %>
157 157
158 158 <%= context_menu issues_context_menu_path %>
General Comments 0
You need to be logged in to leave comments. Login now