| @@ -1,49 +1,50 | |||
|
|
1 | 1 | <h2><%=l(:label_issue_new)%></h2> |
|
|
2 | 2 | |
|
|
3 | 3 | <%= call_hook(:view_issues_new_top, {:issue => @issue}) %> |
|
|
4 | 4 | |
|
|
5 | 5 | <%= labelled_form_for @issue, :url => project_issues_path(@project), |
|
|
6 | 6 | :html => {:id => 'issue-form', :multipart => true} do |f| %> |
|
|
7 | 7 | <%= error_messages_for 'issue' %> |
|
|
8 | 8 | <%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %> |
|
|
9 | 9 | <div class="box tabular"> |
|
|
10 | 10 | <div id="all_attributes"> |
|
|
11 | 11 | <%= render :partial => 'issues/form', :locals => {:f => f} %> |
|
|
12 | 12 | </div> |
|
|
13 | 13 | |
|
|
14 | 14 | <% if @copy_from && @copy_from.attachments.any? %> |
|
|
15 | 15 | <p> |
|
|
16 | 16 | <label for="copy_attachments"><%= l(:label_copy_attachments) %></label> |
|
|
17 | 17 | <%= check_box_tag 'copy_attachments', '1', @copy_attachments %> |
|
|
18 | 18 | </p> |
|
|
19 | 19 | <% end %> |
|
|
20 | 20 | |
|
|
21 | 21 | <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p> |
|
|
22 | 22 | |
|
|
23 | 23 | <% if @issue.safe_attribute? 'watcher_user_ids' -%> |
|
|
24 | 24 | <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label> |
|
|
25 | 25 | <span id="watchers_inputs"> |
|
|
26 | 26 | <%= watchers_checkboxes(@issue, @available_watchers) %> |
|
|
27 | 27 | </span> |
|
|
28 | 28 | <span class="search_for_watchers"> |
|
|
29 |
<%= link_to |
|
|
|
30 |
|
|
|
|
31 |
|
|
|
|
29 | <%= link_to l(:label_search_for_watchers), | |
|
|
30 | {:controller => 'watchers', :action => 'new', :project_id => @issue.project}, | |
|
|
31 | :remote => true, | |
|
|
32 | :method => 'get' %> | |
|
|
32 | 33 | </span> |
|
|
33 | 34 | </p> |
|
|
34 | 35 | <% end %> |
|
|
35 | 36 | </div> |
|
|
36 | 37 | |
|
|
37 | 38 | <%= submit_tag l(:button_create) %> |
|
|
38 | 39 | <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> |
|
|
39 | 40 | <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form' %> |
|
|
40 | 41 | |
|
|
41 | 42 | <%= javascript_tag "Form.Element.focus('issue_subject');" %> |
|
|
42 | 43 | <% end %> |
|
|
43 | 44 | |
|
|
44 | 45 | <div id="preview" class="wiki"></div> |
|
|
45 | 46 | |
|
|
46 | 47 | <% content_for :header_tags do %> |
|
|
47 | 48 | <%= stylesheet_link_tag 'scm' %> |
|
|
48 | 49 | <%= robot_exclusion_tag %> |
|
|
49 | 50 | <% end %> |
| @@ -1,158 +1,159 | |||
|
|
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 | rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours' |
|
|
60 | 60 | end |
|
|
61 | 61 | if User.current.allowed_to?(:view_time_entries, @project) |
|
|
62 | 62 | rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? (link_to l_hours(@issue.total_spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-"), :class => 'spent-time' |
|
|
63 | 63 | end |
|
|
64 | 64 | end %> |
|
|
65 | 65 | <%= render_custom_fields_rows(@issue) %> |
|
|
66 | 66 | <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> |
|
|
67 | 67 | </table> |
|
|
68 | 68 | |
|
|
69 | 69 | <% if @issue.description? || @issue.attachments.any? -%> |
|
|
70 | 70 | <hr /> |
|
|
71 | 71 | <% if @issue.description? %> |
|
|
72 | 72 | <div class="contextual"> |
|
|
73 | <%= link_to_remote_if_authorized( | |
|
|
74 | l(:button_quote), | |
|
|
75 | { :url => {:controller => 'journals', :action => 'new', :id => @issue} }, | |
|
|
76 | :class => 'icon icon-comment') %> | |
|
|
73 | <%= link_to l(:button_quote), | |
|
|
74 | {:controller => 'journals', :action => 'new', :id => @issue}, | |
|
|
75 | :remote => true, | |
|
|
76 | :method => 'post', | |
|
|
77 | :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> | |
|
|
77 | 78 | </div> |
|
|
78 | 79 | |
|
|
79 | 80 | <p><strong><%=l(:field_description)%></strong></p> |
|
|
80 | 81 | <div class="wiki"> |
|
|
81 | 82 | <%= textilizable @issue, :description, :attachments => @issue.attachments %> |
|
|
82 | 83 | </div> |
|
|
83 | 84 | <% end %> |
|
|
84 | 85 | <%= link_to_attachments @issue, :thumbnails => true %> |
|
|
85 | 86 | <% end -%> |
|
|
86 | 87 | |
|
|
87 | 88 | <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %> |
|
|
88 | 89 | |
|
|
89 | 90 | <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %> |
|
|
90 | 91 | <hr /> |
|
|
91 | 92 | <div id="issue_tree"> |
|
|
92 | 93 | <div class="contextual"> |
|
|
93 | 94 | <%= 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) %> |
|
|
94 | 95 | </div> |
|
|
95 | 96 | <p><strong><%=l(:label_subtask_plural)%></strong></p> |
|
|
96 | 97 | <%= render_descendants_tree(@issue) unless @issue.leaf? %> |
|
|
97 | 98 | </div> |
|
|
98 | 99 | <% end %> |
|
|
99 | 100 | |
|
|
100 | 101 | <% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %> |
|
|
101 | 102 | <hr /> |
|
|
102 | 103 | <div id="relations"> |
|
|
103 | 104 | <%= render :partial => 'relations' %> |
|
|
104 | 105 | </div> |
|
|
105 | 106 | <% end %> |
|
|
106 | 107 | |
|
|
107 | 108 | </div> |
|
|
108 | 109 | |
|
|
109 | 110 | <% if @changesets.present? %> |
|
|
110 | 111 | <div id="issue-changesets"> |
|
|
111 | 112 | <h3><%=l(:label_associated_revisions)%></h3> |
|
|
112 | 113 | <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %> |
|
|
113 | 114 | </div> |
|
|
114 | 115 | <% end %> |
|
|
115 | 116 | |
|
|
116 | 117 | <% if @journals.present? %> |
|
|
117 | 118 | <div id="history"> |
|
|
118 | 119 | <h3><%=l(:label_history)%></h3> |
|
|
119 | 120 | <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %> |
|
|
120 | 121 | </div> |
|
|
121 | 122 | <% end %> |
|
|
122 | 123 | |
|
|
123 | 124 | |
|
|
124 | 125 | <div style="clear: both;"></div> |
|
|
125 | 126 | <%= render :partial => 'action_menu' %> |
|
|
126 | 127 | |
|
|
127 | 128 | <div style="clear: both;"></div> |
|
|
128 | 129 | <% if authorize_for('issues', 'edit') %> |
|
|
129 | 130 | <div id="update" style="display:none;"> |
|
|
130 | 131 | <h3><%= l(:button_update) %></h3> |
|
|
131 | 132 | <%= render :partial => 'edit' %> |
|
|
132 | 133 | </div> |
|
|
133 | 134 | <% end %> |
|
|
134 | 135 | |
|
|
135 | 136 | <% other_formats_links do |f| %> |
|
|
136 | 137 | <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> |
|
|
137 | 138 | <%= f.link_to 'PDF' %> |
|
|
138 | 139 | <% end %> |
|
|
139 | 140 | |
|
|
140 | 141 | <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> |
|
|
141 | 142 | |
|
|
142 | 143 | <% content_for :sidebar do %> |
|
|
143 | 144 | <%= render :partial => 'issues/sidebar' %> |
|
|
144 | 145 | |
|
|
145 | 146 | <% if User.current.allowed_to?(:add_issue_watchers, @project) || |
|
|
146 | 147 | (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %> |
|
|
147 | 148 | <div id="watchers"> |
|
|
148 | 149 | <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %> |
|
|
149 | 150 | </div> |
|
|
150 | 151 | <% end %> |
|
|
151 | 152 | <% end %> |
|
|
152 | 153 | |
|
|
153 | 154 | <% content_for :header_tags do %> |
|
|
154 | 155 | <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %> |
|
|
155 | 156 | <%= stylesheet_link_tag 'scm' %> |
|
|
156 | 157 | <% end %> |
|
|
157 | 158 | |
|
|
158 | 159 | <%= context_menu issues_context_menu_path %> |
| @@ -1,88 +1,91 | |||
|
|
1 | 1 | <%= breadcrumb link_to(l(:label_board_plural), project_boards_path(@project)), |
|
|
2 | 2 | link_to(h(@board.name), project_board_path(@project, @board)) %> |
|
|
3 | 3 | |
|
|
4 | 4 | <div class="contextual"> |
|
|
5 | 5 | <%= watcher_tag(@topic, User.current) %> |
|
|
6 |
<%= link_to |
|
|
|
6 | <%= link_to( | |
|
|
7 | 7 | l(:button_quote), |
|
|
8 |
{ |
|
|
|
9 | :class => 'icon icon-comment' | |
|
|
10 | ) unless @topic.locked? %> | |
|
|
8 | {:action => 'quote', :id => @topic}, | |
|
|
9 | :remote => true, | |
|
|
10 | :method => 'get', | |
|
|
11 | :class => 'icon icon-comment', | |
|
|
12 | :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %> | |
|
|
11 | 13 | <%= link_to( |
|
|
12 | 14 | l(:button_edit), |
|
|
13 | 15 | {:action => 'edit', :id => @topic}, |
|
|
14 | 16 | :class => 'icon icon-edit' |
|
|
15 | 17 | ) if @message.editable_by?(User.current) %> |
|
|
16 | 18 | <%= link_to( |
|
|
17 | 19 | l(:button_delete), |
|
|
18 | 20 | {:action => 'destroy', :id => @topic}, |
|
|
19 | 21 | :method => :post, |
|
|
20 | 22 | :data => {:confirm => l(:text_are_you_sure)}, |
|
|
21 | 23 | :class => 'icon icon-del' |
|
|
22 | 24 | ) if @message.destroyable_by?(User.current) %> |
|
|
23 | 25 | </div> |
|
|
24 | 26 | |
|
|
25 | 27 | <h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2> |
|
|
26 | 28 | |
|
|
27 | 29 | <div class="message"> |
|
|
28 | 30 | <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p> |
|
|
29 | 31 | <div class="wiki"> |
|
|
30 | 32 | <%= textilizable(@topic, :content) %> |
|
|
31 | 33 | </div> |
|
|
32 | 34 | <%= link_to_attachments @topic, :author => false %> |
|
|
33 | 35 | </div> |
|
|
34 | 36 | <br /> |
|
|
35 | 37 | |
|
|
36 | 38 | <% unless @replies.empty? %> |
|
|
37 | 39 | <h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3> |
|
|
38 | 40 | <% @replies.each do |message| %> |
|
|
39 | 41 | <div class="message reply" id="<%= "message-#{message.id}" %>"> |
|
|
40 | 42 | <div class="contextual"> |
|
|
41 |
<%= link_to |
|
|
|
43 | <%= link_to( | |
|
|
42 | 44 | image_tag('comment.png'), |
|
|
43 |
{ |
|
|
|
44 |
: |
|
|
|
45 | ) unless @topic.locked? %> | |
|
|
45 | {:action => 'quote', :id => message}, | |
|
|
46 | :remote => true, | |
|
|
47 | :method => 'get', | |
|
|
48 | :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %> | |
|
|
46 | 49 | <%= link_to( |
|
|
47 | 50 | image_tag('edit.png'), |
|
|
48 | 51 | {:action => 'edit', :id => message}, |
|
|
49 | 52 | :title => l(:button_edit) |
|
|
50 | 53 | ) if message.editable_by?(User.current) %> |
|
|
51 | 54 | <%= link_to( |
|
|
52 | 55 | image_tag('delete.png'), |
|
|
53 | 56 | {:action => 'destroy', :id => message}, |
|
|
54 | 57 | :method => :post, |
|
|
55 | 58 | :data => {:confirm => l(:text_are_you_sure)}, |
|
|
56 | 59 | :title => l(:button_delete) |
|
|
57 | 60 | ) if message.destroyable_by?(User.current) %> |
|
|
58 | 61 | </div> |
|
|
59 | 62 | <h4> |
|
|
60 | 63 | <%= avatar(message.author, :size => "24") %> |
|
|
61 | 64 | <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %> |
|
|
62 | 65 | - |
|
|
63 | 66 | <%= authoring message.created_on, message.author %> |
|
|
64 | 67 | </h4> |
|
|
65 | 68 | <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div> |
|
|
66 | 69 | <%= link_to_attachments message, :author => false %> |
|
|
67 | 70 | </div> |
|
|
68 | 71 | <% end %> |
|
|
69 | 72 | <p class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></p> |
|
|
70 | 73 | <% end %> |
|
|
71 | 74 | |
|
|
72 | 75 | <% if !@topic.locked? && authorize_for('messages', 'reply') %> |
|
|
73 | 76 | <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p> |
|
|
74 | 77 | <div id="reply" style="display:none;"> |
|
|
75 | 78 | <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %> |
|
|
76 | 79 | <%= render :partial => 'form', :locals => {:f => f, :replying => true} %> |
|
|
77 | 80 | <%= submit_tag l(:button_submit) %> |
|
|
78 | 81 | <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %> |
|
|
79 | 82 | <% end %> |
|
|
80 | 83 | <div id="preview" class="wiki"></div> |
|
|
81 | 84 | </div> |
|
|
82 | 85 | <% end %> |
|
|
83 | 86 | |
|
|
84 | 87 | <% content_for :header_tags do %> |
|
|
85 | 88 | <%= stylesheet_link_tag 'scm' %> |
|
|
86 | 89 | <% end %> |
|
|
87 | 90 | |
|
|
88 | 91 | <% html_title @topic.subject %> |
General Comments 0
You need to be logged in to leave comments.
Login now