Bulk edit view cleanup.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3279 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 44 insertions, 28 deletions

diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml
index db2ba0fa8..b120f23c4 100644
--- a/app/views/issues/bulk_edit.rhtml
+++ b/app/views/issues/bulk_edit.rhtml
@@ -4,52 +4,68 @@
 
 <% form_tag() do %>
 <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
-<div class="box">
+<div class="box tabular">
 <fieldset>
 <legend><%= l(:label_change_properties) %></legend>
+
+<div class="splitcontentleft">
 <p>
-<label><%= l(:field_tracker) %>: 
-<%= select_tag('tracker_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.trackers, :id, :name)) %></label>
+	<label><%= l(:field_tracker) %></label>
+	<%= select_tag('tracker_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.trackers, :id, :name)) %>
+</p>
 <% if @available_statuses.any? %>
-<label><%= l(:field_status) %>: 
-<%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %></label>
+<p>
+	<label><%= l(:field_status) %></label>
+	<%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
+</p>
 <% end %>
+<p>
+	<label><%= l(:field_priority) %></label> 
+	<%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
+</p>
+<p>
+	<label><%= l(:field_assigned_to) %></label> 
+	<%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') +
+                                 content_tag('option', l(:label_nobody), :value => 'none') +
+                                 options_from_collection_for_select(@project.assignable_users, :id, :name)) %>
 </p>
 <p>
-<label><%= l(:field_priority) %>: 
-<%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %></label>
-<label><%= l(:field_category) %>: 
-<%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
+	<label><%= l(:field_category) %></label> 
+	<%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
                                 content_tag('option', l(:label_none), :value => 'none') +
-                                options_from_collection_for_select(@project.issue_categories, :id, :name)) %></label>
+                                options_from_collection_for_select(@project.issue_categories, :id, :name)) %>
 </p>
 <p>
-<label><%= l(:field_assigned_to) %>: 
-<%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') +
-                                 content_tag('option', l(:label_nobody), :value => 'none') +
-                                 options_from_collection_for_select(@project.assignable_users, :id, :name)) %></label>
-<label><%= l(:field_fixed_version) %>: 
-<%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
+	<label><%= l(:field_fixed_version) %></label> 
+	<%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
                                    content_tag('option', l(:label_none), :value => 'none') +
-                                   version_options_for_select(@project.shared_versions.open)) %></label>
+                                   version_options_for_select(@project.shared_versions.open)) %>
 </p>
 
+<% @custom_fields.each do |custom_field| %>
+	<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit(custom_field) %></p>
+<% end %>
+
+<%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
+</div>
+
+<div class="splitcontentright">
 <p>
-<label><%= l(:field_start_date) %>: 
-<%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %></label>
-<label><%= l(:field_due_date) %>: 
-<%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %></label>
+	<label><%= l(:field_start_date) %></label>
+	<%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
+</p>
+<p>
+	<label><%= l(:field_due_date) %></label> 
+	<%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
+</p>
 <% if Issue.use_field_for_done_ratio? %>
-<label><%= l(:field_done_ratio) %>: 
-<%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label>
-<% end %>
+<p>
+	<label><%= l(:field_done_ratio) %></label> 
+	<%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
 </p>
-
-<% @custom_fields.each do |custom_field| %>
-<p><label><%= h(custom_field.name) %> <%= custom_field_tag_for_bulk_edit(custom_field) %></label></p>
 <% end %>
+</div>
 
-<%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
 </fieldset>
 
 <fieldset><legend><%= l(:field_notes) %></legend>