diff options
| -rw-r--r-- | includes/locale.inc | 3 | ||||
| -rw-r--r-- | modules/block/block.module | 8 | ||||
| -rw-r--r-- | modules/forum/forum.module | 5 | ||||
| -rw-r--r-- | modules/help/help.module | 8 | ||||
| -rw-r--r-- | modules/locale/locale.module | 4 | ||||
| -rw-r--r-- | modules/profile/profile.module | 2 | ||||
| -rw-r--r-- | modules/search/search.module | 8 | ||||
| -rw-r--r-- | modules/tracker/tracker.module | 7 |
8 files changed, 17 insertions, 28 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index 44c94d3a1..36c3092ac 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -1283,6 +1283,9 @@ function _locale_export_remove_plural($entry) { * List languages in search result table */ function _locale_string_language_list($translation) { + // Add CSS + drupal_add_css(drupal_get_path('module', 'locale') .'/locale.css'); + $languages = locale_supported_languages(FALSE, TRUE); unset($languages['name']['en']); $output = ''; diff --git a/modules/block/block.module b/modules/block/block.module index 6dd3a473d..5da53f55d 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -97,11 +97,6 @@ function block_menu($may_cache) { } } } - else { - // Add the CSS for this module - // We put this in !$may_cache so it's only added once per request - drupal_add_css(drupal_get_path('module', 'block') .'/block.css'); - } return $items; } @@ -209,6 +204,9 @@ function _block_rehash() { function block_admin_display($theme = NULL) { global $theme_key, $custom_theme; + // Add CSS + drupal_add_css(drupal_get_path('module', 'block') .'/block.css'); + // If non-default theme configuration has been selected, set the custom theme. if ($theme) { $custom_theme = $theme; diff --git a/modules/forum/forum.module b/modules/forum/forum.module index e12a5b6ca..ed6b971fa 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -92,11 +92,6 @@ function forum_menu($may_cache) { 'type' => MENU_CALLBACK); } } - else { - // Add the CSS for this module - // We put this in !$may_cache so it's only added once per request - drupal_add_css(drupal_get_path('module', 'forum') .'/forum.css'); - } return $items; } diff --git a/modules/help/help.module b/modules/help/help.module index a6df2c8da..61800cd56 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -28,11 +28,6 @@ function help_menu($may_cache) { 'access' => $admin_access); } } - else { - // Add the CSS for this module - // We put this in !$may_cache so it's only added once per request - drupal_add_css(drupal_get_path('module', 'help') .'/help.css'); - } return $items; } @@ -41,6 +36,9 @@ function help_menu($may_cache) { * Menu callback; prints a page listing a glossary of Drupal terminology. */ function help_main() { + // Add CSS + drupal_add_css(drupal_get_path('module', 'help') .'/help.css'); + $output = t(' <h2>Help topics</h2> <p>Help is available on the following items:</p> diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 19acfc5b0..fd13bdf29 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -101,10 +101,6 @@ function locale_menu($may_cache) { 'type' => MENU_CALLBACK); } else { - // Add the CSS for this module - // We put this in !$may_cache so it's only added once per request - drupal_add_css(drupal_get_path('module', 'locale') .'/locale.css'); - if (is_numeric(arg(5))) { // String related callbacks $items[] = array('path' => 'admin/settings/locale/string/edit/'. arg(5), diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 1f048b90b..d3145c931 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -414,6 +414,8 @@ function profile_admin_overview() { * Menu callback; display a list of user information. */ function profile_browse() { + // Add CSS + drupal_add_css(drupal_get_path('module', 'profile') .'/profile.css'); $name = arg(1); list(,,$value) = explode('/', $_GET['q'], 3); diff --git a/modules/search/search.module b/modules/search/search.module index 27d5a59f8..255fc9839 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -180,11 +180,6 @@ function search_menu($may_cache) { } } } - else { - // Add the CSS for this module - // We put this in !$may_cache so it's only added once per request - drupal_add_css(drupal_get_path('module', 'search') .'/search.css'); - } return $items; } @@ -1080,6 +1075,9 @@ function theme_search_block_form($form) { * Perform a standard search on the given keys, and return the formatted results. */ function search_data($keys = NULL, $type = 'node') { + // Add CSS + drupal_add_css(drupal_get_path('module', 'search') .'/search.css'); + if (isset($keys)) { if (module_hook($type, 'search')) { $results = module_invoke($type, 'search', 'search', $keys); diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index e359d3ef6..28b732a69 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -39,10 +39,6 @@ function tracker_menu($may_cache) { } } else { - // Add the CSS for this module - // We put this in !$may_cache so it's only added once per request - drupal_add_css(drupal_get_path('module', 'tracker') .'/tracker.css'); - if (arg(0) == 'user' && is_numeric(arg(1))) { $items[] = array('path' => 'user/'. arg(1) .'/track', 'title' => t('Track'), 'callback' => 'tracker_track_user', 'access' => user_access('access content'), @@ -77,6 +73,9 @@ function tracker_track_user() { * Menu callback. Prints a listing of active nodes on the site. */ function tracker_page($uid = 0) { + // Add CSS + drupal_add_css(drupal_get_path('module', 'tracker') .'/tracker.css'); + if ($uid) { $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC'; $sql = db_rewrite_sql($sql); |