From 6a95c27147f04b27ce3ce898f7ae16767c32379b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= Date: Wed, 19 Dec 2007 19:13:29 +0000 Subject: #202425 by keith.smith: standardize reference to block placement page as 'blocks administration page' to avoid any confusion --- modules/aggregator/aggregator.module | 4 ++-- modules/block/block.admin.inc | 4 ++-- modules/block/block.module | 4 ++-- modules/blog/blog.module | 2 +- modules/book/book.module | 2 +- modules/menu/menu.module | 4 ++-- modules/statistics/statistics.module | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'modules') diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 7fddc39a1..02128a2bf 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -13,12 +13,12 @@ function aggregator_help($path, $arg) { switch ($path) { case 'admin/help#aggregator': $output = '

'. t('The aggregator is a powerful on-site syndicator and news reader that gathers fresh content from RSS-, RDF-, and Atom-based feeds made available across the web. Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://blogs.law.harvard.edu/tech/rss', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) .'

'; - $output .= '

'. t('Feeds contain feed items, or individual posts published by the site providing the feed. Feeds may be grouped in categories, generally by topic. Users view feed items in the main aggregator display or by their source. Administrators can add, edit and delete feeds and choose how often to check each feed for newly updated items. The most recent items in either a feed or category can be displayed as a block through the block administration page. A machine-readable OPML file of all feeds is available. A correctly configured cron maintenance task is required to update feeds automatically.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@feededit' => url('admin/content/aggregator'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'), '@cron' => url('admin/reports/status'))) .'

'; + $output .= '

'. t('Feeds contain feed items, or individual posts published by the site providing the feed. Feeds may be grouped in categories, generally by topic. Users view feed items in the main aggregator display or by their source. Administrators can add, edit and delete feeds and choose how often to check each feed for newly updated items. The most recent items in either a feed or category can be displayed as a block through the blocks administration page. A machine-readable OPML file of all feeds is available. A correctly configured cron maintenance task is required to update feeds automatically.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@feededit' => url('admin/content/aggregator'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'), '@cron' => url('admin/reports/status'))) .'

'; $output .= '

'. t('For more information, see the online handbook entry for Aggregator module.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'

'; return $output; case 'admin/content/aggregator': $output = '

'. t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://blogs/law.harvard.edu/tech/rss', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) .'

'; - $output .= '

'. t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks configuration page.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/build/block'))) .'

'; + $output .= '

'. t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/build/block'))) .'

'; return $output; case 'admin/content/aggregator/add/feed': return '

'. t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') .'

'; diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc index 32e64fe38..a3ab2bd09 100644 --- a/modules/block/block.admin.inc +++ b/modules/block/block.admin.inc @@ -23,7 +23,7 @@ function block_admin_display($theme = NULL) { } /** - * Generate main block administration form. + * Generate main blocks administration form. */ function block_admin_display_form(&$form_state, $blocks, $theme = NULL) { global $theme_key, $custom_theme; @@ -89,7 +89,7 @@ function block_admin_display_form(&$form_state, $blocks, $theme = NULL) { } /** - * Process main block administration form submission. + * Process main blocks administration form submission. */ function block_admin_display_form_submit($form, &$form_state) { foreach ($form_state['values'] as $block) { diff --git a/modules/block/block.module b/modules/block/block.module index e3d43dbbb..b1234363e 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -67,7 +67,7 @@ define('BLOCK_CACHE_GLOBAL', 0x0008); function block_help($path, $arg) { switch ($path) { case 'admin/help#block': - $output = '

'. 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 blocks configuration page 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'))) .'

'; + $output = '

'. 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 blocks administration page 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'))) .'

'; $output .= '

'. t('Although blocks are usually generated automatically by modules (like the User login 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 input format.', array('@input-format' => url('admin/settings/filters'))) .'

'; $output .= '

'. t('When working with blocks, remember that:') .'

'; $output .= ''; + $output .= '
  • '. t('a Popular content block that displays the day\'s most viewed content, the all-time most viewed content, and the last content viewed. (Enable the Popular content block on the blocks administration page.)', array('@blocks' => url('admin/build/block'))) .'
    • '; $output .= '

    '. t('Configuring the statistics module') .'

    '; $output .= '