Index: advanced-help-popup.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_help/advanced-help-popup.tpl.php,v retrieving revision 1.2 diff -u -p -r1.2 advanced-help-popup.tpl.php --- advanced-help-popup.tpl.php 28 Apr 2008 18:48:07 -0000 1.2 +++ advanced-help-popup.tpl.php 12 Feb 2010 00:01:17 -0000 @@ -1,10 +1,18 @@ + - <?php print $title; ?> + <?php print $head_title; ?> Index: advanced_help.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_help/advanced_help.info,v retrieving revision 1.2.4.1 diff -u -p -r1.2.4.1 advanced_help.info --- advanced_help.info 13 Jan 2010 23:08:00 -0000 1.2.4.1 +++ advanced_help.info 11 Feb 2010 21:41:29 -0000 @@ -4,4 +4,3 @@ description = Allow advanced help and do core = 7.x files[] = advanced_help.module files[] = advanced_help.install - Index: advanced_help.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_help/advanced_help.install,v retrieving revision 1.4.2.1 diff -u -p -r1.4.2.1 advanced_help.install --- advanced_help.install 13 Jan 2010 23:08:00 -0000 1.4.2.1 +++ advanced_help.install 11 Feb 2010 21:17:02 -0000 @@ -5,16 +5,22 @@ * Contains install and update functions for advanced_help. */ +/** + * Implements hook_install(). + */ function advanced_help_install() { - drupal_set_message('Installing advanced_help.'); + // } +/** + * Implements hook_uninstall(). + */ function advanced_help_uninstall() { variable_del('advanced_help_last_cron'); } /** - * advanced_help's initial schema. + * Implements hook_schema(). */ function advanced_help_schema() { $schema['advanced_help_index'] = array( Index: advanced_help.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_help/advanced_help.module,v retrieving revision 1.41.2.1 diff -u -p -r1.41.2.1 advanced_help.module --- advanced_help.module 13 Jan 2010 23:08:00 -0000 1.41.2.1 +++ advanced_help.module 12 Feb 2010 00:06:12 -0000 @@ -1,8 +1,7 @@ array('module' => NULL, 'topic' => NULL), + 'variables' => array('module' => NULL, 'topic' => NULL, 'type' => 'icon'), ); $hooks['advanced_help_popup'] = array( @@ -217,7 +216,7 @@ function advanced_help_index_page($modul $name = $settings[$module]['name']; } else { - $name = t($module_name); + $name = t($module_name); } $items[] = advanced_help_l($name, "admin/advanced_help/$module"); } @@ -345,7 +344,6 @@ function advanced_help_search_form_submi } } - /** * Small helper function to get a module's proper name. * @@ -432,7 +430,7 @@ function advanced_help_topic_page($modul } /** - * Implementation of hook_permission(). + * Implements hook_permission(). */ function advanced_help_permission() { return array( @@ -445,16 +443,20 @@ function advanced_help_permission() { /** * Display a help icon with a link to view the topic in a popup. * - * @param $module - * The module that owns this help topic. - * @param $topic - * The identifier for the topic - * @param $type - * - 'icon' to display the question mark icon - * - 'title' to display the topic's title - * - any other text to display the text. Be sure to t() it! - */ -function theme_advanced_help_topic($module, $topic, $type = 'icon') { + * @param $variables + * An associative array containing: + * - module: The module that owns this help topic. + * - topic: The identifier for the topic + * - type + * - 'icon' to display the question mark icon + * - 'title' to display the topic's title + * - any other text to display the text. Be sure to t() it! + */ +function theme_advanced_help_topic($variables) { + $module = $variables['module']; + $topic = $variables['topic']; + $type = $variables['type']; + $info = advanced_help_get_topic($module, $topic); if (!$info) { return; @@ -482,7 +484,7 @@ function theme_advanced_help_topic($modu return l($text, "help/$module/$topic", array( 'attributes' => array( 'class' => $class, - 'onclick' => "var w=window.open(this.href, 'advanced_help_window', 'width=". $info['popup width'] .",height=". $info['popup height'] .",scrollbars,resizable'); w.focus(); return false;", + 'onclick' => "var w=window.open(this.href, 'advanced_help_window', 'width=" . $info['popup width'] . ",height=" . $info['popup height'] . ",scrollbars,resizable'); w.focus(); return false;", 'title' => $info['title'] ), 'query' => array('popup' => TRUE), @@ -570,12 +572,12 @@ function advanced_help_view_topic($modul // Change 'path:' to the URL to the base help directory. $output = preg_replace('/href="path:([^"]+)"/', 'href="' . $base_path . $info['path'] . '/$1"', $output); $output = preg_replace('/src="path:([^"]+)"/', 'src="' . $base_path . $info['path'] . '/$1"', $output); - $output = str_replace('&path&', $base_path . $info['path'] .'/', $output); + $output = str_replace('&path&', $base_path . $info['path'] . '/', $output); // Change 'trans_path:' to the URL to the actual help directory. $output = preg_replace('/href="trans_path:([^"]+)"/', 'href="' . $base_path . $file_info['path'] . '/$1"', $output); $output = preg_replace('/src="trans_path:([^"]+)"/', 'src="' . $base_path . $file_info['path'] . '/$1"', $output); - $output = str_replace('&trans_path&', $base_path . $file_info['path'] .'/', $output); + $output = str_replace('&trans_path&', $base_path . $file_info['path'] . '/', $output); // Change 'base_url:' to the URL to the site. $output = preg_replace('/href="base_url:([^"]+)"/', 'href="' . strtr(url('$1'), array('%24' => '$')) . '"', $output); @@ -758,7 +760,7 @@ function _advanced_help_parse_ini() { } /** - * Implementation of hook_search_info(). + * Implements hook_search_info(). * * @return array */ @@ -769,6 +771,9 @@ function advanced_help_search_info() { ); } +/** + * Implements hook_search_execute(). + */ function advanced_help_search_execute($keys = NULL) { $topics = advanced_help_get_topics(); @@ -813,7 +818,7 @@ function advanced_help_search_execute($k } /** - * Implementation of hook_search() + * Implements hook_search_reset(). */ function advanced_help_search_reset() { variable_del('advanced_help_last_cron'); @@ -839,7 +844,7 @@ function advanced_help_get_sids(&$topics } /** - * Implementation of hook_update_index(). + * Implements hook_update_index(). */ function advanced_help_update_index() { global $language; @@ -906,7 +911,7 @@ function advanced_help_update_index() { function template_preprocess_advanced_help_popup(&$variables) { // Add favicon. if (theme_get_setting('toggle_favicon')) { - drupal_add_html_head(''); + drupal_add_html_head(''); } global $theme; Index: help_example/help_example.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_help/help_example/help_example.info,v retrieving revision 1.3 diff -u -p -r1.3 help_example.info --- help_example/help_example.info 10 May 2008 17:32:14 -0000 1.3 +++ help_example/help_example.info 11 Feb 2010 21:44:37 -0000 @@ -1,5 +1,6 @@ ; $Id: help_example.info,v 1.3 2008/05/10 17:32:14 merlinofchaos Exp $ name = Advanced help example description = A example help module to demonstrate the advanced help module. -core = 6.x -dependencies[] = advanced_help \ No newline at end of file +core = 7.x +dependencies[] = advanced_help +files[] = help_example.module Index: help_example/help_example.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_help/help_example/help_example.module,v retrieving revision 1.2 diff -u -p -r1.2 help_example.module --- help_example/help_example.module 19 Apr 2008 16:45:57 -0000 1.2 +++ help_example/help_example.module 11 Feb 2010 21:47:12 -0000 @@ -5,8 +5,9 @@ * * Provide example help for the advanced help module. */ + /** - * Implementation of hook_menu(). + * Implements hook_menu(). */ function help_example_menu() { // View help topic index. @@ -20,7 +21,7 @@ function help_example_menu() { } function help_example_index_page() { - $output = theme('advanced_help_topic', 'help_example', 'about-php'); + $output = theme('advanced_help_topic', array('module' => 'help_example', 'topic' => 'about-php')); $output .= ' ' . t('Click the help icon to view some example help about the PHP programming language (from wikipedia.org). Be sure to run cron to update the index if you want to try out the search features.'); return $output; }