jro_apps/redmine Commit - r5298:3991d0885832

Moved the parent issue field above start/due date fields....

Jean-Philippe Lang -

r5298:3991d0885832

parent child

Context file:

r5298:3991d0885832

Collapse all files

app/views/issues/_attributes.rhtml +5 0

             <% fields_for :issue, @issue, :builder => TabularFormBuilder do |f| %>
             <div class="splitcontentleft">
             <% if @issue.new_record? || @allowed_statuses.any? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
             <% end %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p>
             <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
             <% unless @project.issue_categories.empty? %>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
             <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                                  l(:label_issue_category_new),
                                  'category[name]',
                                  {:controller => 'issue_categories', :action => 'new', :project_id => @project},
                                  :title => l(:label_issue_category_new),
                                  :tabindex => 199) if authorize_for('issue_categories', 'new') %></p>
             <% end %>
             <% unless @issue.assignable_versions.empty? %>
             <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %>
             <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                                  l(:label_version_new),
                                  'version[name]',
                                  {:controller => 'versions', :action => 'create', :project_id => @project},
                                  :title => l(:label_version_new),
                                  :tabindex => 200) if authorize_for('versions', 'new') %>
             </p>
             <% end %>
             </div>
             <div class="splitcontentright">
+            <% if User.current.allowed_to?(:manage_subtasks, @project) %>
+            <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p>
+            <div id="parent_issue_candidates" class="autocomplete"></div>
+            <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
+            <% end %>
             <p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %></p>
             <p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %></p>
             <p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %></p>
             <% if @issue.leaf? && Issue.use_field_for_done_ratio? %>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             <% end %>
             </div>
             <div style="clear:both;"> </div>
             <%= render :partial => 'issues/form_custom_fields' %>
             <% end %>

app/views/issues/_form.rhtml 0 -7

             <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
             <div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
             <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
             <%= observe_field :issue_tracker_id, :url => { :action => :new, :project_id => @project, :id => @issue },
                                                  :update => :attributes,
                                                  :with => "Form.serialize('issue-form')" %>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
-            <% if User.current.allowed_to?(:manage_subtasks, @project) %>
-            <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p>
-            <div id="parent_issue_candidates" class="autocomplete"></div>
-            <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
-            <% end %>
             <p><%= f.text_area :description,
                                :cols => 60,
                                :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                                :accesskey => accesskey(:edit),
                                :class => 'wiki-edit' %></p>
             </div>
             <div id="attributes" class="attributes">
             	<%= render :partial => 'issues/attributes' %>
             </div>
             <% if @issue.new_record? %>
             <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
             <% end %>
             <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
             <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
             <% @issue.project.users.sort.each do |user| -%>
             <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
             <% end -%>
             </p>
             <% end %>
             <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
             <%= wikitoolbar_for 'issue_description' %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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