| @@ -1,50 +1,50 | |||
|
|
1 | 1 | <% labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %> |
|
|
2 | 2 | <%= error_messages_for 'issue', 'time_entry' %> |
|
|
3 |
|
|
|
|
3 | <%= render :partial => 'conflict' if @conflict %> | |
|
|
4 | 4 | <div class="box"> |
|
|
5 | 5 | <% if @edit_allowed || !@allowed_statuses.empty? %> |
|
|
6 | 6 | <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend> |
|
|
7 |
|
|
|
|
7 | <div id="all_attributes"> | |
|
|
8 | 8 | <%= render :partial => 'form', :locals => {:f => f} %> |
|
|
9 | </div> | |
|
|
9 | </div> | |
|
|
10 | 10 | </fieldset> |
|
|
11 | 11 | <% end %> |
|
|
12 | 12 | <% if User.current.allowed_to?(:log_time, @project) %> |
|
|
13 | 13 | <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend> |
|
|
14 | 14 | <% labelled_fields_for :time_entry, @time_entry do |time_entry| %> |
|
|
15 | 15 | <div class="splitcontentleft"> |
|
|
16 | 16 | <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p> |
|
|
17 | 17 | </div> |
|
|
18 | 18 | <div class="splitcontentright"> |
|
|
19 | 19 | <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p> |
|
|
20 | 20 | </div> |
|
|
21 | 21 | <p><%= time_entry.text_field :comments, :size => 60 %></p> |
|
|
22 | 22 | <% @time_entry.custom_field_values.each do |value| %> |
|
|
23 | 23 | <p><%= custom_field_tag_with_label :time_entry, value %></p> |
|
|
24 | 24 | <% end %> |
|
|
25 | 25 | <% end %> |
|
|
26 | 26 | </fieldset> |
|
|
27 | 27 | <% end %> |
|
|
28 | 28 | |
|
|
29 | 29 | <fieldset><legend><%= l(:field_notes) %></legend> |
|
|
30 | 30 | <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %> |
|
|
31 | 31 | <%= wikitoolbar_for 'notes' %> |
|
|
32 | 32 | <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %> |
|
|
33 | 33 | |
|
|
34 | 34 | <p><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form' %></p> |
|
|
35 | 35 | </fieldset> |
|
|
36 | 36 | </div> |
|
|
37 | 37 | |
|
|
38 | 38 | <%= f.hidden_field :lock_version %> |
|
|
39 | 39 | <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %> |
|
|
40 | 40 | <%= submit_tag l(:button_submit) %> |
|
|
41 | 41 | <%= link_to_remote l(:label_preview), |
|
|
42 | 42 | { :url => preview_issue_path(:project_id => @project, :id => @issue), |
|
|
43 | 43 | :method => 'post', |
|
|
44 | 44 | :update => 'preview', |
|
|
45 | 45 | :with => 'Form.serialize("issue-form")', |
|
|
46 | 46 | :complete => "Element.scrollTo('preview')" |
|
|
47 | 47 | }, :accesskey => accesskey(:preview) %> |
|
|
48 | 48 | <% end %> |
|
|
49 | 49 | |
|
|
50 | 50 | <div id="preview" class="wiki"></div> |
General Comments 0
You need to be logged in to leave comments.
Login now