Replace "Delete" block on the block-layout page with "Remove"

Me and stmh will work on this at dublin2016

Maybe something for the sprinters today :)

I'll do this one!

Patch will follow...

Here's a first patch...

We missed one 'delete' action on the edit form. Still working on it

Here's a new patch with no failing tests :)

.

Hi @JeroenT

We met SenneS at the Drupalcon dublin and agreed that he'll review the patch. And as in #4 noted we were first ;-)

1. +++ b/core/modules/block/block.module
   @@ -280,3 +280,12 @@ function block_configurable_language_delete(ConfigurableLanguageInterface $langu
   +function block_entity_operation_alter(array &$operations, \Drupal\Core\Entity\EntityInterface $entity) {
   +  if ($entity instanceof \Drupal\block\BlockInterface && isset($operations['delete'])) {
   +    $operations['delete']['title'] = t('Remove');
   +  }
   +}
   

   This can instead be fixed directly in \Drupal\block\BlockListBuilder::getDefaultOperations(), see the switching of "Edit" to "Configure"

2. +++ b/core/modules/block/src/BlockForm.php
   @@ -292,6 +292,7 @@ protected function buildVisibilityInterface(array $form, FormStateInterface $for
        $actions['submit']['#value'] = $this->t('Save block');
   +    $actions['delete']['#title'] = $this->t('Remove block');
   

   I believe the #title should be #value

3. +++ b/core/modules/block/src/Form/BlockDeleteForm.php
   @@ -7,6 +7,9 @@
   + * Overrides some functions to supply better wording (replace 'delete' with
   + * 'remove').
   

   Unnecessary, please remove.

Either this patch should fail, or there isn't sufficient coverage for the BlockForm change.

Hey tim.plunkett, regarding

1.) yes
\Drupal\block\BlockListBuilder::getDefaultOperations()
Is a lot nicer. Changed that. Thanks for that.

2.) It's not a button but a link. The current value is in #title and not in #value, so i assume it's correct the way we did it.

3.) Removed the additional comment

Why do you think the last patch should let the tests fail?

Thanks for reviewing!

@muschpusch The coding tests fail, maybe this is the reason why the test failed testing.

➜  drupalcon git:(8.3.x) ✗ phpcs --standard=Drupal --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md core/modules/block/src/Form/BlockDeleteForm.php

FILE: .../Sites/drupalcon/core/modules/block/src/Form/BlockDeleteForm.php
----------------------------------------------------------------------
FOUND 2 ERRORS AFFECTING 2 LINES
----------------------------------------------------------------------
 49 | ERROR | [x] Expected 1 blank line after function; 0 found
 50 | ERROR | [x] The closing brace for the class must have an empty
    |       |     line before it
----------------------------------------------------------------------
PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------

Time: 46ms; Memory: 6.25Mb

Thanks msti. Fixed the coding standard warnings.

I tested the patch and it looks good.

1. +++ b/core/modules/block/src/Form/BlockDeleteForm.php
   @@ -17,4 +17,34 @@ public function getCancelUrl() {
   +  /**
   +   * Gets the message to display to the user after removing the block.
   +   *
   +   * @return string
   +   *   The translated string of the deletion message.
   +   */
   

   This should be {@inheritdoc}

2. +++ b/core/modules/block/src/Form/BlockDeleteForm.php
   @@ -17,4 +17,34 @@ public function getCancelUrl() {
   +  }
    }
   

   There should be a blank line before the end of the class.

thanks for the feedback, will provide a new patch.

Attached is a new patch (and an interdiff) fixing the doc-issue. I can't fix the missing blank line before class-end, looks good at my end and code sniffer is also happy.

+++ b/core/modules/block/src/Form/BlockDeleteForm.php
@@ -17,4 +17,32 @@ public function getCancelUrl() {
+  }
+
 }

Seems to be there now!

Thanks

Nice! It's lovely to have a better label for what's actually happening here. :)

Committed and pushed to 8.3.x. Thanks!

Oops. :P