#199890 by gaele, keith.smith: improve block module help text, include description of drag and drop and better help about the throttle functionality; also comes in smaller chunks which makes it easier to translate and update later

1 files changed, 19 insertions, 23 deletions

diff --git a/modules/block/block.module b/modules/block/block.module
index d758d0237..797f80030 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -67,33 +67,29 @@ define('BLOCK_CACHE_GLOBAL', 0x0008);
 function block_help($path, $arg) {
   switch ($path) {
     case 'admin/help#block':
-      $output = '<p>'. t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. Blocks are usually generated automatically by modules (e.g., Recent Forum Topics), but administrators can also define custom blocks.') .'</p>';
-      $output .= '<p>'. t('The region each block appears in depends on both which theme you are using (some themes allow greater control over block placement than others), and on the settings in the block administration section.') .'</p>';
-      $output .= '<p>'. t('The block administration screen lets you specify the vertical placement of the blocks within a region. You do this by assigning a weight to each block. Lighter blocks (those having a smaller weight) "float up" towards the top of the region; heavier ones "sink".') .'</p>';
-      $output .= t("<p>A block's visibility depends on:</p>
-<ul>
-<li>Its region placement. Blocks with no region assigned to them are never shown.</li>
-<li>Its throttle checkbox when throttle module is enabled. Throttled blocks are hidden during high server loads.</li>
-<li>Its page visibility settings. Blocks can be configured to be visible/hidden on certain pages.</li>
-<li>Its custom visibility settings. Blocks can be configured to be visible only when specific conditions are true.</li>
-<li>Its user visibility settings. Administrators can choose to let users decide whether to show/hide certain blocks.</li>
-<li>Its user-role visibility settings. Administrators can choose to let blocks be visible only for certain user roles.</li>
-<li>Its function. Some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.</li>
-</ul>
-");
-      $output .= '<h3>'. t('Module blocks') .'</h3>';
-      $output .= '<p>'. t('Some modules generate blocks that become available when the modules are enabled. These blocks can be administered via the <a href="@admin-block">blocks administration page</a>.', array('@admin-block' => url('admin/build/block'))) .'</p>';
-      $output .= '<h3>'. t('Administrator defined blocks') .'</h3>';
-      $output .= '<p>'. t('Administrators can also define custom blocks. These blocks consist of a title, a description, and a body which can be as long as you wish. Block content can be in any of the input formats supported for other content.') .'</p>';
+      $output = '<p>'. t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The <a href="@blocks">blocks configuration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/build/block'))) .'</p>';
+      $output .= '<p>'. t('Although blocks are usually generated automatically by modules (like the <em>User login</em> block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available <a href="@input-format">input format</a>.', array('@input-format' => url('admin/settings/filters'))) .'</p>';
+      $output .= '<p>'. t('When working with blocks, remember that:') .'</p>';
+      $output .= '<ul><li>'. t('since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis.') .'</p>';
+      $output .= '<li>'. t('disabled blocks, or blocks not in a region, are never shown.') .'</li>';
+      $output .= '<li>'. t('when throttle module is enabled, throttled blocks (blocks with the <em>Throttle</em> checkbox selected) are hidden during high server loads.') .'</li>';
+      $output .= '<li>'. t('blocks can be configured to be visible only on certain pages.') .'</li>';
+      $output .= '<li>'. t('blocks can be configured to be visible only when specific conditions are true.') .'</li>';
+      $output .= '<li>'. t('blocks can be configured to be visible only for certain user roles.') .'</li>';
+      $output .= '<li>'. t('when allowed by an administrator, specific blocks may be enabled or disabled on a per-user basis using the <em>My account</em> page.') .'</li>';
+      $output .= '<li>'. t('some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.') .'</li></ul>';
       $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@block">Block module</a>.', array('@block' => 'http://drupal.org/handbook/modules/block/')) .'</p>';
       return $output;
     case 'admin/build/block':
-      return t('<p>Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.</p>
-<p>Only enabled blocks are shown. You can position blocks by specifying which area of the page they should appear in (e.g., a sidebar). Highlighted labels on this page show the regions into which blocks can be rendered. You can specify where within a region a block will appear by adjusting its weight.</p>
-<p>If you want certain blocks to disable themselves temporarily during high server loads, check the "Throttle" box. You can configure the auto-throttle on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.</p>
-<p>You can configure the behavior of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.</p>', array('@throttle' => url('admin/settings/throttle')));
+      $throttle = module_exists('throttle');
+      $output = '<p>'. t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. To change the region or order of a block, grab a drag-and-drop handle under the <em>Block</em> column and drag the block to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the <em>Save blocks</em> button at the bottom of the page.') .'</p>';
+      if ($throttle) {
+        $output .= '<p>'. t('To reduce CPU usage, database traffic or bandwidth, blocks may be automatically disabled during high server loads by selecting their <em>Throttle</em> checkbox. Adjust throttle thresholds on the <a href="@throttleconfig">throttle configuration page</a>.', array('@throttleconfig' => url('admin/settings/throttle'))) .'</p>';
+      }
+      $output .= '<p>'. t('Click the <em>configure</em> link next to each block to configure its specific title and visibility settings. Use the <a href="@add-block">add block page</a> to create a custom block.', array('@add-block' => url('admin/build/block/add'))) .'</p>';
+      return $output;
     case 'admin/build/block/add':
-      return '<p>'. t('Here you can create a new block. Once you have created this block you must make it active and give it a place on the page using <a href="@overview">blocks</a>. The description is used in the "block" column on the <a href="@overview">blocks</a> page.', array('@overview' => url('admin/build/block'))) .'</p>';
+      return '<p>'. t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the <a href="@blocks">blocks configuration page</a> to be visible.', array('@blocks' => url('admin/build/block'))) .'</p>';
   }
 }