##// END OF EJS Templates
Content of projects/add_issue.rhtml and issues/edit.rhtml moved to a shared partial....
Jean-Philippe Lang -
r800:75c4c4f6b3fa
parent child
Show More
@@ -0,0 +1,48
1 <%= error_messages_for 'issue' %>
2 <div class="box">
3
4 <div class="splitcontentleft">
5 <% if @issue.new_record? %>
6 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
7 <% else %>
8 <p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
9 <% end %>
10
11 <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
12 <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
13 <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
14 <%= prompt_to_remote(l(:label_issue_category_new),
15 l(:label_issue_category_new), 'category[name]',
16 {:controller => 'projects', :action => 'add_issue_category', :id => @project},
17 :class => 'small') if authorize_for('projects', 'add_issue_category') %></p>
18 </div>
19
20 <div class="splitcontentright">
21 <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
22 <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
23 <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p>
24 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
25 </div>
26
27 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
28 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), :class => 'wiki-edit' %></p>
29 <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
30 <% for @custom_value in @custom_values %>
31 <p><%= custom_field_tag_with_label @custom_value %></p>
32 <% end %>
33
34 <% if @issue.new_record? %>
35 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
36 <%= image_to_function "add.png", "addFileField();return false" %></label>
37 <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
38 <% end %>
39 </div>
40
41 <%= wikitoolbar_for 'issue_description' %>
42
43 <% content_for :header_tags do %>
44 <%= javascript_include_tag 'calendar/calendar' %>
45 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
46 <%= javascript_include_tag 'calendar/calendar-setup' %>
47 <%= stylesheet_link_tag 'calendar' %>
48 <% end %>
@@ -1,48 +1,7
1 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
1 <h2><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h2>
2 2
3 3 <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'edit'} do |f| %>
4 <%= error_messages_for 'issue' %>
5 <div class="box">
6 <!--[form:issue]-->
7 <div class="splitcontentleft">
8 <p><label><%=l(:field_status)%></label> <%= @issue.status.name %></p>
9 <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
10 <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
11 <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
12 <%= prompt_to_remote(l(:label_issue_category_new),
13 l(:label_issue_category_new), 'category[name]',
14 {:controller => 'projects', :action => 'add_issue_category', :id => @project},
15 :class => 'small') if authorize_for('projects', 'add_issue_category') %></p>
16 </div>
17
18 <div class="splitcontentright">
19 <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
20 <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
21 <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p>
22 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
23 </div>
24
25 <div class="clear">
26 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
27 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => [[10, @issue.description.length / 50].max, 100].min, :class => 'wiki-edit' %></p>
28
29 <% for @custom_value in @custom_values %>
30 <p><%= custom_field_tag_with_label @custom_value %></p>
4 <%= render :partial => 'form', :locals => {:f => f} %>
5 <%= f.hidden_field :lock_version %>
6 <%= submit_tag l(:button_save) %>
31 7 <% end %>
32
33 <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
34 </div>
35 <!--[eoform:issue]-->
36 </div>
37 <%= f.hidden_field :lock_version %>
38 <%= submit_tag l(:button_save) %>
39 <% end %>
40
41 <%= wikitoolbar_for 'issue_description' %>
42
43 <% content_for :header_tags do %>
44 <%= javascript_include_tag 'calendar/calendar' %>
45 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
46 <%= javascript_include_tag 'calendar/calendar-setup' %>
47 <%= stylesheet_link_tag 'calendar' %>
48 <% end %> No newline at end of file
@@ -1,52 +1,7
1 1 <h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
2 2
3 3 <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'add_issue'}, :html => {:multipart => true} do |f| %>
4 <%= error_messages_for 'issue' %>
5 <div class="box">
6 <!--[form:issue]-->
7 <%= hidden_field_tag 'tracker_id', @tracker.id %>
8
9 <div class="splitcontentleft">
10 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
11 <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
12 <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
13 <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
14 <%= prompt_to_remote(l(:label_issue_category_new),
15 l(:label_issue_category_new), 'category[name]',
16 {:controller => 'projects', :action => 'add_issue_category', :id => @project},
17 :class => 'small') if authorize_for('projects', 'add_issue_category') %></p>
18 </div>
19 <div class="splitcontentright">
20 <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
21 <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
22 <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p>
23 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
24 </div>
25
26 <div style="clear: left;">
27 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
28 <p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true, :class => 'wiki-edit' %></p>
29
30 <% for @custom_value in @custom_values %>
31 <p><%= custom_field_tag_with_label @custom_value %></p>
32 <% end %>
33
34 <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
35
36 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
37 <%= image_to_function "add.png", "addFileField();return false" %></label>
38 <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
39 </div>
40 <!--[eoform:issue]-->
41 </div>
42 <%= submit_tag l(:button_create) %>
4 <%= hidden_field_tag 'tracker_id', @tracker.id %>
5 <%= render :partial => 'issues/form', :locals => {:f => f} %>
6 <%= submit_tag l(:button_create) %>
43 7 <% end %>
44
45 <%= wikitoolbar_for 'issue_description' %>
46
47 <% content_for :header_tags do %>
48 <%= javascript_include_tag 'calendar/calendar' %>
49 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
50 <%= javascript_include_tag 'calendar/calendar-setup' %>
51 <%= stylesheet_link_tag 'calendar' %>
52 <% end %> No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now