### Eclipse Workspace Patch 1.0 #P drupal-contrib-cvs Index: modules/site_map/site_map.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/site_map/site_map.module,v retrieving revision 1.31 diff -u -r1.31 site_map.module --- modules/site_map/site_map.module 28 May 2007 02:08:11 -0000 1.31 +++ modules/site_map/site_map.module 28 May 2007 09:27:19 -0000 @@ -254,7 +254,7 @@ function _site_map_front_page() { $title = t('Front page'); - $output = l(t("Front page of %sn", array("%sn" => variable_get('site_name', 'Drupal'))), '', NULL, NULL, NULL, FALSE, TRUE) . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', 'rss.xml') . (module_exists('commentrss') ? ' '. theme('site_map_feed_icon', 'crss', 'comment') : '') : ''); + $output = l(t("Front page of %sn", array("%sn" => variable_get('site_name', 'Drupal'))), '', NULL, NULL, NULL, FALSE, TRUE) . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', url('rss.xml')) . (module_exists('commentrss') ? ' '. theme('site_map_feed_icon', url('crss'), 'comment') : '') : ''); $output = theme('box', $title, $output); return $output; @@ -269,13 +269,13 @@ $output = '
'. t("Community blog and recent blog authors at %sn.", array("%sn" => variable_get('site_name', 'Drupal'))) .'
'; $blogs = array(); - $blogs[] .= l(t('All blogs'), 'blog') . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', 'blog/feed') : ''); + $blogs[] .= l(t('All blogs'), 'blog') . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', url('blog/feed')) : ''); $result = db_query_range("SELECT DISTINCT u.uid, u.name FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC", 0, 10); while ($account = db_fetch_object($result)) { - $blogs[] = l(t("!s's blog", array("!s" => $account->name)), "blog/$account->uid") . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', "blog/$account->uid/feed") : ''); + $blogs[] = l(t("!s's blog", array("!s" => $account->name)), "blog/$account->uid") . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', url("blog/$account->uid/feed")) : ''); } $output .= theme('item_list', $blogs); $output = theme('box', $title, $output); @@ -287,7 +287,7 @@ function _site_map_audio() { if (module_exists('audio')) { $title = t('Audio'); - $output = l(t('Audio content'), 'audio') . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', 'audio/feed') : ''); + $output = l(t('Audio content'), 'audio') . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', url('audio/feed')) : ''); $output = theme('box', $title, $output); } @@ -297,7 +297,7 @@ function _site_map_video() { if (module_exists('video')) { $title = t('Video'); - $output = l(t('Video content'), 'video') . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', 'video/feed') : ''); + $output = l(t('Video content'), 'video') . (variable_get('site_map_show_rss_links', 1) ? ' '. theme('site_map_feed_icon', url('video/feed')) : ''); $output = theme('box', $title, $output); } @@ -387,7 +387,7 @@ else { $title = $name ? check_plain($name) : ''; } - $title .= (module_exists('commentrss') ? ' '. theme('site_map_feed_icon', "crss/vocab/$vid", 'comment') : ''); + $title .= (module_exists('commentrss') ? ' '. theme('site_map_feed_icon', url("crss/vocab/$vid"), 'comment') : ''); $last_depth = -1; $rss_depth = variable_get('site_map_rss_depth', 'all'); @@ -435,8 +435,8 @@ $output .= " ($term->count)"; } if (variable_get('site_map_show_rss_links', 1)) { - $output .= ' '. theme('site_map_feed_icon', "taxonomy/term/$term->tid/$rss_depth/feed"); - $output .= (module_exists('commentrss') ? ' '. theme('site_map_feed_icon', "crss/term/$term->tid", 'comment') : ''); + $output .= ' '. theme('site_map_feed_icon', url("taxonomy/term/$term->tid/$rss_depth/feed")); + $output .= (module_exists('commentrss') ? ' '. theme('site_map_feed_icon', url("crss/term/$term->tid"), 'comment') : ''); } Index: modules/site_map/site_map.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/site_map/site_map.css,v retrieving revision 1.2 diff -u -r1.2 site_map.css --- modules/site_map/site_map.css 23 Jun 2006 18:14:11 -0000 1.2 +++ modules/site_map/site_map.css 28 May 2007 09:27:18 -0000 @@ -1,6 +1,3 @@ .site-map .rss { - background: #ff5200; - padding: 0 2px; - color: #fff; - font-size: 9px; + padding: 0 0.1em; }