diff --git a/core/modules/block/block.module b/core/modules/block/block.module index b78729f..2918769 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -60,8 +60,9 @@ function block_help($path, $arg) { $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 .= '
' . t('Custom blocks') . '
'; + $output .= '
' . t('Custom blocks allows you to create different block types, with different fields and display settings. See Custom blocks.', array('@custom-blocks' => url('admin/help/custom_block'))); + //$output .= '
' . t('Users with the Administer blocks permission can add custom blocks, which are then listed on the Blocks administration page.', 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 318796d..37395ec 100644 --- a/core/modules/block/custom_block/custom_block.module +++ b/core/modules/block/custom_block/custom_block.module @@ -14,15 +14,22 @@ function custom_block_help($path, $arg) { switch ($path) { case 'admin/help#custom_block': - return t('Allows the creation of custom blocks through the user interface.'); - - case 'admin/structure/custom-blocks': - $output = '

' . t('This page lists user-created blocks. These blocks are derived from block types. A block type can consist of different fields and display settings. From the block types tab you can manage these fields as well as create new block types.') . '

'; + $output = ''; + $output .= '

' . t('About') . '

'; + $output .= '

' . t('The Custom Block module allows you to create blocks of content, which can be placed in regions throughout the website (See Blocks for more information on creating blocks). The Custom Blocks administration page lets you view the custom block content on your site. Once created, custom blocks behave just like default and module-generated blocks.', array('@custom-blocks' => url('admin/structure/custom-blocks'), '@blocks' => url('admin/help/block'))) . '

'; + $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/types': - $output = '

' . t('This page lists block types. A block type can consist of different fields and display settings. From here you can manage these fields as well as create new block types.') . '

'; - 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; } }