commit ae6a51d29e6fad6cbf43cb61307329a0dd7e5d90 Author: Lee Rowlands Date: Mon Aug 12 08:46:43 2013 +1000 Reverts changes to block diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 75cf58c..5be7c27 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -59,6 +59,10 @@ function block_help($path, $arg) { $output .= '
' . t('When working with blocks, remember that all themes do not implement the same regions, or display regions in the same way. Blocks are positioned on a per-theme basis. Users with the Administer blocks permission can disable blocks. Disabled blocks are listed on the Blocks administration page, but are not displayed in any region.', array('@block' => 'http://drupal.org/documentation/modules/block', '@blocks' => url('admin/structure/block'))) . '
'; $output .= '
' . t('Controlling visibility') . '
'; $output .= '
' . t('Blocks can be configured to be visible only on certain pages, only to users of certain roles, or only on pages displaying certain content types. Some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.', array('@content-type' => url('admin/structure/types'), '@user' => url('user'))) . '
'; + if (module_exists('custom_block')) { + $output .= '
' . t('Creating custom blocks') . '
'; + $output .= '
' . t('Users with the Administer blocks permission can add custom blocks, which are then listed on the Blocks administration page. Once created, custom blocks behave just like default and module-generated blocks.', array('@blocks' => url('admin/structure/block'), '@block-add' => url('admin/structure/block/list/' . config('system.theme')->get('default') . '/add/custom_blocks'))) . '
'; + } $output .= ''; return $output; } diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module index 4b3dad973..63d0a59 100644 --- a/core/modules/block/custom_block/custom_block.module +++ b/core/modules/block/custom_block/custom_block.module @@ -14,24 +14,6 @@ */ function custom_block_help($path, $arg) { switch ($path) { - case 'admin/help#custom_block': - $output = ''; - $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Custom Block module allows you to create boxes of content, which can be placed in regions throughout the website. The Custom Blocks administration page lets you view the custom block content on your site.', array('@blocks' => url('admin/structure/custom-blocks'))) . '

'; - $output .= '

' . t('Uses') . '

'; - $output .= '
'; - $output .= '
' . t('Creating custom block types') . '
'; - $output .= '
' . t('You can create different custom block types, each with different fields and display settings from the Custom block types administration pages.', array('@types' => url('admin/structure/custom-blocks/types'))) . '
'; - $output .= '
' . t('Creating custom blocks') . '
'; - $output .= '
' . t('Users with the Administer blocks permission can add custom blocks, which are then listed on the Blocks administration page. Once created, custom blocks behave just like default and module-generated blocks.', array('@blocks' => url('admin/structure/block'), '@block-add' => url('admin/structure/block/list/' . config('system.theme')->get('default') . '/add/custom_blocks'))) . '
'; - $output .= '
'; - return $output; - - case 'admin/structure/custom-blocks': - case 'admin/structure/custom-blocks/list': - $output = '

This page provides a list of all custom-block content on your site. From here you can add, edit or delete custom block content.

'; - return $output; - case 'admin/structure/custom-blocks/types': $output = '

This page provides a list of all custom-block types on your site. Each custom-block type can consists of different fields and display settings. From here you can manage the fields on each custom-block type as well as create new custom-block types.

'; return $output; diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php index e7b9c25..ed44d75 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php @@ -70,7 +70,7 @@ public function buildRow(EntityInterface $entity) { * {@inheritdoc} */ public function render() { - // @todo Remove this once https://drupal.org/node/1981644 is in. + // @todo Remove this once https://drupal.org/node/2032535 is in. drupal_set_title(t('Custom block types')); return parent::render(); }