| @@ -1,55 +1,50 | |||
|
|
1 | <% labelled_tabular_form_for :issue, @issue, | |
|
|
2 | :url => {:action => 'update', :id => @issue}, | |
|
|
3 | :html => {:id => 'issue-form', | |
|
|
4 | :class => nil, | |
|
|
5 | :method => :put, | |
|
|
6 | :multipart => true} do |f| %> | |
|
|
1 | <% labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %> | |
|
|
7 | 2 | <%= error_messages_for 'issue', 'time_entry' %> |
|
|
8 | 3 | <div class="box"> |
|
|
9 | 4 | <% if @edit_allowed || !@allowed_statuses.empty? %> |
|
|
10 | 5 | <fieldset class="tabular"><legend><%= l(:label_change_properties) %> |
|
|
11 | 6 | <% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %> |
|
|
12 | 7 | <small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small> |
|
|
13 | 8 | <% end %> |
|
|
14 | 9 | </legend> |
|
|
15 | 10 | <%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %> |
|
|
16 | 11 | </fieldset> |
|
|
17 | 12 | <% end %> |
|
|
18 | 13 | <% if User.current.allowed_to?(:log_time, @project) %> |
|
|
19 | 14 | <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend> |
|
|
20 | 15 | <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %> |
|
|
21 | 16 | <div class="splitcontentleft"> |
|
|
22 | 17 | <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p> |
|
|
23 | 18 | </div> |
|
|
24 | 19 | <div class="splitcontentright"> |
|
|
25 | 20 | <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p> |
|
|
26 | 21 | </div> |
|
|
27 | 22 | <p><%= time_entry.text_field :comments, :size => 60 %></p> |
|
|
28 | 23 | <% @time_entry.custom_field_values.each do |value| %> |
|
|
29 | 24 | <p><%= custom_field_tag_with_label :time_entry, value %></p> |
|
|
30 | 25 | <% end %> |
|
|
31 | 26 | <% end %> |
|
|
32 | 27 | </fieldset> |
|
|
33 | 28 | <% end %> |
|
|
34 | 29 | |
|
|
35 | 30 | <fieldset><legend><%= l(:field_notes) %></legend> |
|
|
36 | 31 | <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %> |
|
|
37 | 32 | <%= wikitoolbar_for 'notes' %> |
|
|
38 | 33 | <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %> |
|
|
39 | 34 | |
|
|
40 | 35 | <p><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form' %></p> |
|
|
41 | 36 | </fieldset> |
|
|
42 | 37 | </div> |
|
|
43 | 38 | |
|
|
44 | 39 | <%= f.hidden_field :lock_version %> |
|
|
45 | 40 | <%= submit_tag l(:button_submit) %> |
|
|
46 | 41 | <%= link_to_remote l(:label_preview), |
|
|
47 | 42 | { :url => preview_issue_path(:project_id => @project, :id => @issue), |
|
|
48 | 43 | :method => 'post', |
|
|
49 | 44 | :update => 'preview', |
|
|
50 | 45 | :with => 'Form.serialize("issue-form")', |
|
|
51 | 46 | :complete => "Element.scrollTo('preview')" |
|
|
52 | 47 | }, :accesskey => accesskey(:preview) %> |
|
|
53 | 48 | <% end %> |
|
|
54 | 49 | |
|
|
55 | 50 | <div id="preview" class="wiki"></div> |
| @@ -1,27 +1,27 | |||
|
|
1 | 1 | <h2><%=l(:label_issue_new)%></h2> |
|
|
2 | 2 | |
|
|
3 | <% labelled_tabular_form_for :issue, @issue, :url => {:controller => 'issues', :action => 'create', :project_id => @project}, | |
|
|
4 |
:html => {: |
|
|
|
3 | <% labelled_form_for @issue, :url => project_issues_path(@project), | |
|
|
4 | :html => {:id => 'issue-form', :multipart => true} do |f| %> | |
|
|
5 | 5 | <%= error_messages_for 'issue' %> |
|
|
6 | <div class="box"> | |
|
|
6 | <div class="box tabular"> | |
|
|
7 | 7 | <%= render :partial => 'issues/form', :locals => {:f => f} %> |
|
|
8 | 8 | </div> |
|
|
9 | 9 | <%= submit_tag l(:button_create) %> |
|
|
10 | 10 | <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> |
|
|
11 | 11 | <%= link_to_remote l(:label_preview), |
|
|
12 | 12 | { :url => preview_issue_path(:project_id => @project), |
|
|
13 | 13 | :method => 'post', |
|
|
14 | 14 | :update => 'preview', |
|
|
15 | 15 | :with => "Form.serialize('issue-form')", |
|
|
16 | 16 | :complete => "Element.scrollTo('preview')" |
|
|
17 | 17 | }, :accesskey => accesskey(:preview) %> |
|
|
18 | 18 | |
|
|
19 | 19 | <%= javascript_tag "Form.Element.focus('issue_subject');" %> |
|
|
20 | 20 | <% end %> |
|
|
21 | 21 | |
|
|
22 | 22 | <div id="preview" class="wiki"></div> |
|
|
23 | 23 | |
|
|
24 | 24 | <% content_for :header_tags do %> |
|
|
25 | 25 | <%= stylesheet_link_tag 'scm' %> |
|
|
26 | 26 | <%= robot_exclusion_tag %> |
|
|
27 | 27 | <% end %> |
General Comments 0
You need to be logged in to leave comments.
Login now