redessign of destroy form

app/views/work_packages/bulk/destroy.html.erb

@@ -9,28 +9,33 @@
 
   <div class="box">
 
-    <p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(time_entries.sum(:hours), :precision => 2)) %></strong></p>
-
     <p>
-      <%= fields_for :to_do do |f| %>
+      <strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(time_entries.sum(:hours), :precision => 2)) %></strong>
+    </p>
+
+    <%= fields_for :to_do do |f| %>
+      <p>
 
         <%= f.radio_button 'action', 'destroy' %>
         <%= f.label 'action_destroy', l(:text_destroy_time_entries) %>
 
-        <br>
+      </p>
+      <p>
 
         <%= f.radio_button 'action' , 'nullify' %>
         <%= f.label 'action_nullify', l(:text_assign_time_entries_to_project) %>
 
-        <br>
+      </p>
+      <p>
 
-        <%= f.radio_button 'action', 'reassign', :onchange => 'if (this.checked) { $("reassign_to_id").focus(); }' %>
+        <%= f.radio_button 'action', 'reassign', :onclick => 'if(jQuery("#to_do_action_reassign").prop("checked")) { jQuery("#to_do_reassign_to_id").focus(); }' %>
         <%= f.label 'action_reassign', l(:text_reassign_time_entries) %>
 
-        <%= f.text_field 'reassign_to_id', :value => params[:reassign_to_id], :size => 6, :onfocus => '$("todo_reassign").checked=true;' %>
+        <%= f.label 'reassign_to_id', l(:text_reassign_to) %>
+        <%= f.text_field 'reassign_to_id', :value => params[:reassign_to_id], :size => 6, :onfocus => 'jQuery("#to_do_action_reassign").prop("checked", true);' %>
 
-      <% end %>
-    </p>
+      </p>
+    <% end %>
   </div>
 
   <%= submit_tag l(:button_apply) %>

config/locales/de.yml

@@ -1291,7 +1291,8 @@ de:
   text_powered_by: "Powered by %{link}"
   text_project_destroy_confirmation: "Sind Sie sicher, dass sie das Projekt löschen wollen?"
   text_project_identifier_info: "Kleinbuchstaben (a-z), Ziffern, Binde- und Unterstriche erlaubt, muss mit einem Kleinbuchstaben beginnen.<br />Einmal gespeichert, kann die Kennung nicht mehr geändert werden."
-  text_reassign_time_entries: "Gebuchte Aufwände diesem Ticket zuweisen:"
+  text_reassign_time_entries: "Gebuchte Aufwände neu zuweisen an"
+  text_reassign_to: "Ziel-Arbeitspaket:"
   text_regexp_info: "z. B. ^[A-Z0-9]+$"
   text_repository_usernames_mapping: "Bitte legen Sie die Zuordnung der OpenProject-Benutzer zu den Benutzernamen der Commit-Log-Meldungen des Projektarchivs fest.\nBenutzer mit identischen OpenProject- und Projektarchiv-Benutzernamen oder -E-Mail-Adressen werden automatisch zugeordnet."
   text_rmagick_available: "RMagick verfügbar (optional)"

config/locales/en.yml

@@ -1273,7 +1273,8 @@ en:
   text_powered_by: "Powered by %{link}"
   text_project_destroy_confirmation: "Are you sure you want to delete this project and related data?"
   text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.<br />Once saved, the identifier cannot be changed."
-  text_reassign_time_entries: "Reassign reported hours to this work package:"
+  text_reassign_time_entries: "Reassign reported hours to"
+  text_reassign_to: "work package:"
   text_regexp_info: "eg. ^[A-Z0-9]+$"
   text_repository_usernames_mapping: "Select or update the OpenProject user mapped to each username found in the repository log.\nUsers with the same OpenProject and repository username or email are automatically mapped."
   text_rmagick_available: "RMagick available (optional)"

features/work_packages/destroy.feature

@@ -55,8 +55,8 @@ Feature: Deleting work packages
 
     Then I should be on the bulk destroy page of work packages
 
-    When I choose "Reassign reported hours to this work package:"
-    And I fill in the id of work package "wp2" into "to_do_reassign_to_id"
+    When I choose "Reassign reported hours to"
+    And I fill in the id of work package "wp2" into "work package"
     And I submit the form by the "Apply" button
 
     Then I should be on the work packages index page of the project called "ecookbook"