diff --git a/core/modules/help/help-rtl.css b/core/modules/help/help-rtl.css index 8e40a8c..ce103d2 100644 --- a/core/modules/help/help-rtl.css +++ b/core/modules/help/help-rtl.css @@ -1,10 +1,10 @@ .help-items { float: right; - padding-right: 0; padding-left: 3%; + padding-right: 0; } .help-items-last { - padding-right: 0; padding-left: 0; + padding-right: 0; } diff --git a/core/modules/help/help.admin.inc b/core/modules/help/help.admin.inc index 0a8e147..97f314e 100644 --- a/core/modules/help/help.admin.inc +++ b/core/modules/help/help.admin.inc @@ -11,7 +11,7 @@ * @see help_menu() */ function help_main() { - // Add CSS + // Add CSS. drupal_add_css(drupal_get_path('module', 'help') . '/help.css'); $output = '

' . t('Help topics') . '

' . t('Help is available on the following items:') . '

' . help_links_as_list(); return $output; @@ -47,7 +47,13 @@ function help_page($name) { foreach ($admin_tasks as $task) { $links[] = l($task['title'], $task['link_path'], $task['localized_options']); } - $output .= theme('item_list', array('items' => $links, 'title' => t('@module administration pages', array('@module' => $info[$name]['name'])))); + $output .= theme('item_list', array( + 'items' => $links, + 'title' => t('@module administration pages', array( + '@module' => $info[$name]['name'], + )), + ) + ); } } return $output; @@ -87,4 +93,3 @@ function help_links_as_list() { return $output; } - diff --git a/core/modules/help/help.api.php b/core/modules/help/help.api.php index f7d9c08..8b75a78 100644 --- a/core/modules/help/help.api.php +++ b/core/modules/help/help.api.php @@ -48,11 +48,11 @@ */ function hook_help($path, $arg) { switch ($path) { - // Main module help for the block module + // Main module help for the block module. case 'admin/help#block': return '

' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., 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/structure/block'))) . '

'; - // Help for another path in the block module + // Help for another path in the block module. case 'admin/structure/block': return '

' . 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. 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 Save blocks button at the bottom of the page.') . '

'; } diff --git a/core/modules/help/help.css b/core/modules/help/help.css index 9228170..56762d3 100644 --- a/core/modules/help/help.css +++ b/core/modules/help/help.css @@ -1,8 +1,8 @@ .help-items { float: left; /* LTR */ - width: 22%; padding-right: 3%; /* LTR */ + width: 22%; } .help-items-last { padding-right: 0; /* LTR */ diff --git a/core/modules/help/help.module b/core/modules/help/help.module index a74bf52..f090b18 100644 --- a/core/modules/help/help.module +++ b/core/modules/help/help.module @@ -50,12 +50,21 @@ function help_help($path, $arg) { $output .= '
  • ' . t('Start posting content Finally, you can add new content for your website.', array('@content' => url('node/add'))) . '
    • '; } $output .= ''; - $output .= '

    ' . t('For more information, refer to the specific topics listed in the next section or to the online Drupal handbooks. You may also post at the Drupal forum or view the wide range of other support options available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/documentation', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '

    '; + $output .= '

    ' . t('For more information, refer to the specific topics listed in the next section or to the online Drupal handbooks. You may also post at the Drupal forum or view the wide range of other support options available.', array( + '@help' => url('admin/help'), + '@handbook' => 'http://drupal.org/documentation', + '@forum' => 'http://drupal.org/forum', + '@support' => 'http://drupal.org/support', + )) . '

    '; return $output; case 'admin/help#help': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Help module provides Help reference pages and context-sensitive advice to guide you through the use and configuration of modules. It is a starting point for the online Drupal handbooks. The handbooks contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the online handbook entry for the Help module.', array('@help' => 'http://drupal.org/documentation/modules/help/', '@handbook' => 'http://drupal.org/documentation', '@help-page' => url('admin/help'))) . '

    '; + $output .= '

    ' . t('The Help module provides Help reference pages and context-sensitive advice to guide you through the use and configuration of modules. It is a starting point for the online Drupal handbooks. The handbooks contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the online handbook entry for the Help module.', array( + '@help' => 'http://drupal.org/documentation/modules/help/', + '@handbook' => 'http://drupal.org/documentation', + '@help-page' => url('admin/help'), + )) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Providing a help reference') . '
    '; diff --git a/core/modules/help/lib/Drupal/help/Tests/HelpTest.php b/core/modules/help/lib/Drupal/help/Tests/HelpTest.php index 8404d85..3f7c09f 100644 --- a/core/modules/help/lib/Drupal/help/Tests/HelpTest.php +++ b/core/modules/help/lib/Drupal/help/Tests/HelpTest.php @@ -27,12 +27,12 @@ class HelpTest extends WebTestBase { /** * The admin user that will be created. */ - protected $big_user; + protected $bigUser; /** * The anonymous user that will be created. */ - protected $any_user; + protected $anyUser; public static function getInfo() { return array( @@ -48,8 +48,12 @@ class HelpTest extends WebTestBase { $this->getModuleList(); // Create users. - $this->big_user = $this->drupalCreateUser(array('access administration pages', 'view the administration theme', 'administer permissions')); - $this->any_user = $this->drupalCreateUser(array()); + $this->bigUser = $this->drupalCreateUser(array( + 'access administration pages', + 'view the administration theme', + 'administer permissions', + )); + $this->anyUser = $this->drupalCreateUser(array()); } /** @@ -57,27 +61,27 @@ class HelpTest extends WebTestBase { */ function testHelp() { // Login the admin user. - $this->drupalLogin($this->big_user); + $this->drupalLogin($this->bigUser); $this->verifyHelp(); // Login the regular user. - $this->drupalLogin($this->any_user); + $this->drupalLogin($this->anyUser); $this->verifyHelp(403); // Check for css on admin/help. - $this->drupalLogin($this->big_user); + $this->drupalLogin($this->bigUser); $this->drupalGet('admin/help'); - $this->assertRaw(drupal_get_path('module', 'help') . '/help.css', t('The help.css file is present in the HTML.')); + $this->assertRaw(drupal_get_path('module', 'help') . '/help.css', 'The help.css file is present in the HTML.'); // Verify that introductory help text exists, goes for 100% module coverage. - $this->assertRaw(t('For more information, refer to the specific topics listed in the next section or to the online Drupal handbooks.', array('@drupal' => 'http://drupal.org/documentation')), 'Help intro text correctly appears.'); + $this->assertRaw('For more information, refer to the specific topics listed in the next section or to the online Drupal handbooks.', 'Help intro text correctly appears.'); // Verify that help topics text appears. - $this->assertRaw('

    ' . t('Help topics') . '

    ' . t('Help is available on the following items:') . '

    ', t('Help topics text correctly appears.')); + $this->assertRaw('

    Help topics

    Help is available on the following items:

    ', 'Help topics text correctly appears.'); // Make sure links are properly added for modules implementing hook_help(). foreach ($this->getModuleList() as $module => $name) { - $this->assertLink($name, 0, t('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name))); + $this->assertLink($name, 0, 'Link properly added to ' . $name . ' (admin/help/' . $module . ')'); } } @@ -93,9 +97,9 @@ class HelpTest extends WebTestBase { $this->drupalGet('admin/help/' . $module); $this->assertResponse($response); if ($response == 200) { - $this->assertTitle($name . ' | Drupal', t('[' . $module . '] Title was displayed')); - $this->assertRaw('

    ' . t($name) . '

    ', t('[' . $module . '] Heading was displayed')); - } + $this->assertTitle($name . ' | Drupal', '[' . $module . '] Title was displayed'); + $this->assertRaw('

    ' . t($name) . '

    ', '[' . $module . '] Heading was displayed'); + } } } diff --git a/core/modules/help/lib/Drupal/help/Tests/NoHelpTest.php b/core/modules/help/lib/Drupal/help/Tests/NoHelpTest.php index 933c20f..90aace8 100644 --- a/core/modules/help/lib/Drupal/help/Tests/NoHelpTest.php +++ b/core/modules/help/lib/Drupal/help/Tests/NoHelpTest.php @@ -26,7 +26,7 @@ class NoHelpTest extends WebTestBase { /** * The user who will be created. */ - protected $big_user; + protected $bigUser; public static function getInfo() { return array( @@ -38,16 +38,16 @@ class NoHelpTest extends WebTestBase { function setUp() { parent::setUp(); - $this->big_user = $this->drupalCreateUser(array('access administration pages')); + $this->bigUser = $this->drupalCreateUser(array('access administration pages')); } /** * Ensures modules not implementing help do not appear on admin/help. */ function testMainPageNoHelp() { - $this->drupalLogin($this->big_user); + $this->drupalLogin($this->bigUser); $this->drupalGet('admin/help'); - $this->assertNoText('Hook menu tests', t('Making sure the test module menu_test does not display a help link in admin/help')); + $this->assertNoText('Hook menu tests', 'Making sure the test module menu_test does not display a help link in admin/help'); } }