jro_apps/redmine Commit - r1151:d461363d27b9

1

<% labelled_tabular_form_for :issue, @issue,

1

<% labelled_tabular_form_for :issue, @issue,

2

:url => {:action => 'edit', :id => @issue},

2

:url => {:action => 'edit', :id => @issue},

3

:html => {:id => 'issue-form',

3

:html => {:id => 'issue-form',

4

:multipart => true} do |f| %>

4

:multipart => true} do |f| %>

5

<%= error_messages_for 'issue' %>

5

<%= error_messages_for 'issue' %>

6

6

7

<% if @edit_allowed || !@allowed_statuses.empty? %>

7

<% if @edit_allowed || !@allowed_statuses.empty? %>

8

8

9

9

10

<% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %>

10

<% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %>

11

<small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small>

11

<small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small>

12

<% end %>

12

<% end %>

13

</legend>

13

</legend>

14

<%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %>

14

<%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %>

15

</fieldset>

15

</fieldset>

16

<% end %>

16

<% end %>

17

<% if authorize_for('timelog', 'edit') %>

18

19

<% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>

20

21

<p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>

22

</div>

23

24

25

26

</div>

27

<% end %>

28

</fieldset>

29

<% end %>

17

30

18

31

19

<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>

32

<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>

20

<%= wikitoolbar_for 'notes' %>

33

<%= wikitoolbar_for 'notes' %>

21

34

22

35

23

<%= image_to_function 'add.png', 'addFileField();return false;' %></label>

36

<%= image_to_function 'add.png', 'addFileField();return false;' %></label>

24

<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>

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>

25

</fieldset>

38

</fieldset>

26

</div>

39

</div>

27

40

28

<%= f.hidden_field :lock_version %>

41

<%= f.hidden_field :lock_version %>

29

<%= submit_tag l(:button_submit) %>

42

<%= submit_tag l(:button_submit) %>

30

<%= link_to_remote l(:label_preview),

43

<%= link_to_remote l(:label_preview),

31

{ :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },

44

{ :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },

32

:method => 'post',

45

:method => 'post',

33

:update => 'preview',

46

:update => 'preview',

34

:with => 'Form.serialize("issue-form")',

47

:with => 'Form.serialize("issue-form")',

35

:complete => "Element.scrollTo('preview')"

48

:complete => "Element.scrollTo('preview')"

36

}, :accesskey => accesskey(:preview) %>

49

}, :accesskey => accesskey(:preview) %>

37

<% end %>

50

<% end %>

38

51

39

52

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             <% labelled_tabular_form_for :issue, @issue,
                                          :url => {:action => 'edit', :id => @issue},
                                          :html => {:id => 'issue-form',
                                                    :multipart => true} do |f| %>
                 <%= error_messages_for 'issue' %>
                 <div class="box">
                 <% if @edit_allowed || !@allowed_statuses.empty? %>
                     <fieldset>
                     <legend><%= l(:label_change_properties) %>
                     <% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %>
                     <small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small>
                     <% end %>
                     </legend>
                     <%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %>
                     </fieldset>
                 <% end %>
+                <% if authorize_for('timelog', 'edit') %>
+                <fieldset><legend><%= l(:button_log_time) %></legend>
+                    <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
+                    <div class="splitcontentleft">
+                    <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
+                    </div>
+                    <div class="splitcontentright">
+                    <p><%= time_entry.text_field :comments, :size => 40 %></p>
+                    <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
+                    </div>
+                    <% end %>
+                </fieldset>
+                <% end %>
                 <fieldset><legend><%= l(:field_notes) %></legend>
                 <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
                 <%= wikitoolbar_for 'notes' %>
                 <p id="attachments_p"><label><%=l(:label_attachment_new)%>
                 <%= image_to_function 'add.png', 'addFileField();return false;' %></label>
                 <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
                 </fieldset>
                 </div>
                 <%= f.hidden_field :lock_version %>
                 <%= submit_tag l(:button_submit) %>
                 <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => 'Form.serialize("issue-form")',
                                      :complete => "Element.scrollTo('preview')"
                                    }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>