Inlude review feedback

app/assets/stylesheets/content/_forms.sass

@@ -66,6 +66,7 @@ $form--field-types: (text-field, text-area, select, check-box, radio-button, ran
 
     .form--section
       padding-top: 0px
+      margin-bottom: 0px
 
       & > *
         padding-left: 1rem

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

@@ -69,6 +69,7 @@ See doc/COPYRIGHT.rdoc for more details.
         <div class="grid-block">
           <div class="form--field">
             <div class="form--text-field-container -xslim">
+              <%= styled_label_tag 'to_do_reassign_to_id', l(:text_reassign_to), class: 'hidden-for-sighted' %>
               <%= f.text_field 'reassign_to_id', :placeholder => WorkPackage.human_attribute_name(:id), :value => params[:reassign_to_id], :size => 6, :onfocus => 'jQuery("#to_do_action_reassign").prop("checked", true);' %>
             </div>
           </div>
@@ -76,9 +77,9 @@ See doc/COPYRIGHT.rdoc for more details.
       </div>
     <% end %>
     <div class="danger-zone--verification">
-      <%= styled_button_tag title: l(:button_apply), class: '-highlight' do
-            concat content_tag :i, '', class: 'button--icon icon-yes'
-            concat content_tag :span, l(:button_apply), class: 'button--text'
+      <%= styled_button_tag title: l(:button_delete), class: '-highlight' do
+            concat content_tag :i, '', class: 'button--icon icon-delete'
+            concat content_tag :span, l(:button_delete), class: 'button--text'
             end %>
   </section>
 

config/locales/en.yml

@@ -1325,7 +1325,7 @@ en:
       confirmation: "If you continue, the project %{identifier} and all related data will be permanently destroyed."
       info: "Deleting the project is an irreversible action."
       project_verification: "Enter the project's name %{name} to verify the deletion."
-      subprojects_confirmation: "Its subproject(s): %{value} will be also deleted."
+      subprojects_confirmation: "Its subproject(s): %{value} will also be deleted."
       title: "Do you really want to delete the project %{name}?"
 
   project_module_activity: "Activity"
@@ -1598,6 +1598,7 @@ en:
   text_powered_by: "Powered by %{link}"
   text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter."
   text_reassign: "Reassign to work package:"
+  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_select_mail_notifications: "Select actions for which email notifications should be sent."

features/work_packages/destroy.feature

@@ -56,8 +56,8 @@ Feature: Deleting work packages
     Then I should be on the bulk destroy page of work packages
 
     When I choose "Reassign"
-    And I fill in the id of work package "wp2" into "to_do[reassign_to_id]"
-    And I submit the form by the "Apply" button
+    And I fill in the id of work package "wp2" into "work package"
+    And I submit the form by the "Delete" button
 
     Then I should be on the work packages index page of the project called "ecookbook"
 

spec/features/projects/delete_projects_spec.rb

@@ -34,15 +34,12 @@ describe 'Delete project', type: :feature, js: true do
   let(:project) { FactoryGirl.create(:project) }
   let(:projects_page) { ProjectsPage.new(project) }
 
-
   before do
     allow(User).to receive(:current).and_return current_user
 
     projects_page.visit_confirm_destroy
   end
 
-
-
   describe 'disable delete w/o confirm' do
     it { expect(page).to have_css('.danger-zone .button[disabled]') }
   end

spec/features/repositories/repository_settings_spec.rb

@@ -70,7 +70,6 @@ describe 'Repository Settings', type: :feature, js: true do
         find('a', text: I18n.t(:button_delete)).click
       end
 
-
       vendor = find('select[name="scm_vendor"]')
       expect(vendor).not_to be_nil
       expect(vendor.value).to be_empty