Index: site_map.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/site_map/site_map.admin.inc,v retrieving revision 1.1.2.7.2.4 diff -u -p -u -p -r1.1.2.7.2.4 site_map.admin.inc --- site_map.admin.inc 7 May 2010 11:16:29 -0000 1.1.2.7.2.4 +++ site_map.admin.inc 21 May 2010 10:33:36 -0000 @@ -21,6 +21,7 @@ function site_map_admin_settings() { '#rows' => 5, '#description' => t('Define a message to be displayed above the site map.'), ); + $form['site_map_message_format'] = filter_form(variable_get('site_map_message_format', FILTER_FORMAT_DEFAULT)); $form['site_map_content'] = array( '#type' => 'fieldset', Index: site_map.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/site_map/site_map.module,v retrieving revision 1.39.2.17.2.7 diff -u -p -u -p -r1.39.2.17.2.7 site_map.module --- site_map.module 7 May 2010 11:22:23 -0000 1.39.2.17.2.7 +++ site_map.module 21 May 2010 10:33:36 -0000 @@ -19,20 +19,29 @@ function site_map_perm() { */ function site_map_theme() { return array( - 'site_map_display' => array( + 'site_map' => array( 'arguments' => array(), + 'template' => 'site-map', ), 'site_map_box' => array( 'arguments' => array('title' => NULL, 'content' => NULL, 'class' => NULL), + 'file' => 'site_map.theme.inc', ), 'site_map_feed_icon' => array( 'arguments' => array('url' => NULL, 'type' => 'node'), + 'file' => 'site_map.theme.inc', ), 'site_map_menu_tree' => array( 'arguments' => array('tree' => NULL), + 'file' => 'site_map.theme.inc', ), 'site_map_menu_item' => array( 'arguments' => array('link' => NULL, 'has_children' => NULL, 'menu' => NULL), + 'file' => 'site_map.theme.inc', + ), + 'site_map_rss_legend' => array( + 'arguments' => array(), + 'file' => 'site_map.theme.inc', ), ); } @@ -95,152 +104,49 @@ function site_map_page() { drupal_add_css(drupal_get_path('module', 'site_map') .'/site_map.css'); } - return theme('site_map_display'); + return theme('site_map'); } /** - * Return a themed site map. + * Process variables for site-map.tpl.php. * - * @return - * A string containing the site map output. + * @see site-map.tpl.php */ -function theme_site_map_display() { - $output = ''; - - $message = filter_xss_admin(variable_get('site_map_message', '')); - $output .= $message ? '

'. $message .'

' : ''; +function template_preprocess_site_map(&$variables) { + $variables['message'] = check_markup(variable_get('site_map_message', ''), variable_get('site_map_message_format', FILTER_FORMAT_DEFAULT)); if ((variable_get('site_map_show_rss_links', 1) != 0) && module_exists('commentrss') && variable_get('commentrss_site', COMMENTRSS_SITE_FRONT_PAGE)) { - $output .= '

'. t('Legend:') .'
'; - $output .= ''. theme('site_map_feed_icon', NULL) .' '. t('Link to a content RSS feed'); - $output .= '
'. theme('site_map_feed_icon', NULL, 'comment') .' '. t('Link to a comment RSS feed'); - $output .= '

'; + $variables['rss_legend'] = theme('site_map_rss_legend'); } if (variable_get('site_map_show_front', 1)) { - $output .= _site_map_front_page(); + $variables['front_page'] = _site_map_front_page(); } if (variable_get('site_map_show_blogs', 1)) { - $output .= _site_map_blogs(); + $variables['blogs'] = _site_map_blogs(); } -/* $output .= _site_map_audio(); */ - -/* $output .= _site_map_video(); */ - // Compile the books trees. - $output .= _site_map_books(); + if (module_exists('books')) { + $variables['books'] = _site_map_books(); + } // Compile the menu trees. - $output .= _site_map_menus(); + $variables['menus'] = _site_map_menus(); if (variable_get('site_map_show_faq', 1)) { - $output .= _site_map_faq(); + $variables['faq'] = _site_map_faq(); } // Compile the vocabulary trees. - $output .= _site_map_taxonomys(); + $variables['taxonomys'] = _site_map_taxonomys(); // Invoke all custom modules and get themed HTML to be integrated into the site map. $additional = module_invoke_all('site_map'); foreach ($additional as $themed_site_map_code) { - $output .= $themed_site_map_code; - } - - $output = '
'. $output .'
'; - - return $output; -} - -/** - * Return a themed sitemap box. - * - * @param $title - * The subject of the box. - * @param $content - * The content of the box. - * @param $class - * Optional extra class for the box. - * @return - * A string containing the box output. - */ -function theme_site_map_box($title, $content, $class = '') { - $output = ''; - if ($title || $content) { - $class = $class ? 'sitemap-box '. $class : 'sitemap-box'; - $output .= '
'; - if ($title) { - $output .= '

'. $title .'

'; - } - if ($content) { - $output .= '
'. $content .'
'; - } - $output .= '
'; - } - - return $output; -} - -/** - * Return a themed feed icon. - * - * @param $url - * The feed URL. - * @param $type - * The type of feed icon. - * @return - * A string containing the linked image. - */ -function theme_site_map_feed_icon($url, $type = 'node') { - $output = ''; - - switch ($type) { - case 'node': - $output = theme('image', (drupal_get_path('module', 'site_map') .'/feed-small.png'), t('Syndicate content'), t('Syndicate content')); - break; - case 'comment': - $output = theme('image', (drupal_get_path('module', 'site_map') .'/feed-small-comment.png'), t('Syndicate comments'), t('Syndicate comments')); - break; - } - - if ($url) { - $output = l($output, $url, array('attributes' => array('class' => 'feed-link'), 'html' => TRUE)); - } - - return $output; -} - -/** - * This is a clone of the core theme_menu_tree() function with the exception of - * the site_map specific class name used in the UL that also allow themers to - * override the function only for the sitemap page. - * - * Generate the HTML output for a menu tree - * - * @ingroup themeable - */ -function theme_site_map_menu_tree($tree) { - return ''; -} - -/** - * This is a one by one clone of the core theme_menu_item() function that allows - * custom theming of the sitemap page items. - * - * Generate the HTML output for a menu item and submenu. - * - * @ingroup themeable - */ -function theme_site_map_menu_item($link, $has_children, $menu = '', $in_active_trail = FALSE, $extra_class = NULL) { - $class = ($menu ? 'expanded' : ($has_children ? 'collapsed' : 'leaf')); - if (!empty($extra_class)) { - $class .= ' '. $extra_class; - } - if ($in_active_trail) { - $class .= ' active-trail'; + $variables['additional'] .= $themed_site_map_code; } - return '
  • '. $link . $menu ."
    • \n"; } function _site_map_front_page() { Index: site_map.theme.inc =================================================================== RCS file: site_map.theme.inc diff -N site_map.theme.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ site_map.theme.inc 21 May 2010 10:33:36 -0000 @@ -0,0 +1,107 @@ +'. t('Legend:') .'
    '; + $output .= ''. theme('site_map_feed_icon', NULL) .' '. t('Link to a content RSS feed'); + $output .= '
    '. theme('site_map_feed_icon', NULL, 'comment') .' '. t('Link to a comment RSS feed'); + $output .= '

    '; + + return $output; +} + +/** + * Return a themed sitemap box. + * + * @param $title + * The subject of the box. + * @param $content + * The content of the box. + * @param $class + * Optional extra class for the box. + * @return + * A string containing the box output. + */ +function theme_site_map_box($title, $content, $class = '') { + $output = ''; + if ($title || $content) { + $class = $class ? 'sitemap-box '. $class : 'sitemap-box'; + $output .= '
    '; + if ($title) { + $output .= '

    '. $title .'

    '; + } + if ($content) { + $output .= '
    '. $content .'
    '; + } + $output .= '
    '; + } + + return $output; +} + +/** + * Return a themed feed icon. + * + * @param $url + * The feed URL. + * @param $type + * The type of feed icon. + * @return + * A string containing the linked image. + */ +function theme_site_map_feed_icon($url, $type = 'node') { + $output = ''; + + switch ($type) { + case 'node': + $output = theme('image', (drupal_get_path('module', 'site_map') .'/feed-small.png'), t('Syndicate content'), t('Syndicate content')); + break; + case 'comment': + $output = theme('image', (drupal_get_path('module', 'site_map') .'/feed-small-comment.png'), t('Syndicate comments'), t('Syndicate comments')); + break; + } + + if ($url) { + $output = l($output, $url, array('attributes' => array('class' => 'feed-link'), 'html' => TRUE)); + } + + return $output; +} + +/** + * This is a clone of the core theme_menu_tree() function with the exception of + * the site_map specific class name used in the UL that also allow themers to + * override the function only for the sitemap page. + * + * Generate the HTML output for a menu tree + * + * @ingroup themeable + */ +function theme_site_map_menu_tree($tree) { + return ''; +} + +/** + * This is a one by one clone of the core theme_menu_item() function that allows + * custom theming of the sitemap page items. + * + * Generate the HTML output for a menu item and submenu. + * + * @ingroup themeable + */ +function theme_site_map_menu_item($link, $has_children, $menu = '', $in_active_trail = FALSE, $extra_class = NULL) { + $class = ($menu ? 'expanded' : ($has_children ? 'collapsed' : 'leaf')); + if (!empty($extra_class)) { + $class .= ' '. $extra_class; + } + if ($in_active_trail) { + $class .= ' active-trail'; + } + return '
  • '. $link . $menu ."
    • \n"; +}