From a2be668d986c9df6f2954d501bbf80ed8748ca81 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 1 Dec 2010 23:56:31 +0000 Subject: screen.css is a better name for our main css file git-svn-id: http://code.elgg.org/elgg/trunk@7489 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/views.php | 10 +++++----- mod/blog/start.php | 2 +- mod/bookmarks/start.php | 2 +- mod/captcha/start.php | 2 +- mod/categories/start.php | 2 +- mod/ecml/start.php | 2 +- mod/embed/start.php | 2 +- mod/file/start.php | 2 +- mod/groups/start.php | 2 +- mod/members/start.php | 2 +- mod/messageboard/start.php | 2 +- mod/messages/start.php | 2 +- mod/notifications/start.php | 2 +- mod/pages/start.php | 2 +- mod/profile/start.php | 2 +- mod/reportedcontent/start.php | 2 +- mod/riverdashboard/start.php | 2 +- mod/search/start.php | 2 +- mod/sitepages/start.php | 2 +- mod/tagcloud/start.php | 2 +- mod/thewire/start.php | 2 +- mod/tinymce/start.php | 2 +- mod/twitter/start.php | 2 +- mod/zaudio/start.php | 2 +- views/default/css/elgg.php | 3 --- views/default/css/screen.php | 3 +++ 26 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 views/default/css/elgg.php create mode 100644 views/default/css/screen.php diff --git a/engine/lib/views.php b/engine/lib/views.php index e0e10bcb7..73a12cc8d 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -1369,8 +1369,8 @@ function elgg_views_register_core_head_elements() { $url = elgg_view_get_simplecache_url('js', 'initialise_elgg'); elgg_register_js($url, 'initialise_elgg'); - $url = elgg_view_get_simplecache_url('css', 'elgg'); - elgg_register_css($url, 'elgg'); + $url = elgg_view_get_simplecache_url('css', 'screen'); + elgg_register_css($url, 'screen'); } /** @@ -1384,9 +1384,9 @@ function elgg_views_register_core_head_elements() { function elgg_views_boot() { global $CONFIG; - elgg_view_register_simplecache('css/elgg'); - elgg_view_register_simplecache('ie/elgg'); - elgg_view_register_simplecache('ie6/elgg'); + elgg_view_register_simplecache('css/screen'); + elgg_view_register_simplecache('css/ie'); + elgg_view_register_simplecache('css/ie6'); elgg_view_register_simplecache('js/friendsPickerv1'); elgg_view_register_simplecache('js/initialise_elgg'); diff --git a/mod/blog/start.php b/mod/blog/start.php index 08b7541b3..62f963b4b 100644 --- a/mod/blog/start.php +++ b/mod/blog/start.php @@ -28,7 +28,7 @@ function blog_init() { // run the setup upon activations or to upgrade old installations. run_function_once('blog_runonce', '1269370108'); - elgg_extend_view('css', 'blog/css'); + elgg_extend_view('css/screen', 'blog/css'); elgg_register_event_handler('pagesetup', 'system', 'blog_page_setup'); register_page_handler('blog', 'blog_page_handler'); diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php index 579b40baa..0528eb3b5 100644 --- a/mod/bookmarks/start.php +++ b/mod/bookmarks/start.php @@ -17,7 +17,7 @@ function bookmarks_init() { register_page_handler('bookmarks', 'bookmarks_page_handler'); // Add our CSS - elgg_extend_view('css', 'bookmarks/css'); + elgg_extend_view('css/screen', 'bookmarks/css'); // Register granular notification for this type if (is_callable('register_notification_object')) { diff --git a/mod/captcha/start.php b/mod/captcha/start.php index 3458e02a5..ec97d96b6 100644 --- a/mod/captcha/start.php +++ b/mod/captcha/start.php @@ -12,7 +12,7 @@ function captcha_init() { register_page_handler('captcha','captcha_page_handler'); // Extend CSS - elgg_extend_view('css','captcha/css'); + elgg_extend_view('css/screen','captcha/css'); // Number of background images $CONFIG->captcha_num_bg = 5; diff --git a/mod/categories/start.php b/mod/categories/start.php index 40d6c9c4d..e69e482b8 100644 --- a/mod/categories/start.php +++ b/mod/categories/start.php @@ -13,7 +13,7 @@ function categories_init() { global $CONFIG; - elgg_extend_view('css', 'categories/css'); + elgg_extend_view('css/screen', 'categories/css'); elgg_register_action('settings/categories/save', $CONFIG->pluginspath . 'categories/actions/save.php', 'admin'); diff --git a/mod/ecml/start.php b/mod/ecml/start.php index 4000ff98a..4fa13b7c9 100644 --- a/mod/ecml/start.php +++ b/mod/ecml/start.php @@ -34,7 +34,7 @@ function ecml_init() { register_page_handler('ecml_generate', 'ecml_generate_page_handler'); // CSS for admin access - elgg_extend_view('css', 'ecml/admin/css'); + elgg_extend_view('css/screen', 'ecml/admin/css'); // admin action to save permissions elgg_register_action('settings/ecml/save', dirname(__FILE__) . '/actions/save_permissions.php', 'admin'); diff --git a/mod/embed/start.php b/mod/embed/start.php index 4eb5fcec2..5f8b76641 100644 --- a/mod/embed/start.php +++ b/mod/embed/start.php @@ -10,7 +10,7 @@ * */ function embed_init() { - elgg_extend_view('css', 'embed/css'); + elgg_extend_view('css/screen', 'embed/css'); elgg_extend_view('js/initialise_elgg', 'embed/js'); elgg_extend_view('html_head/extend', 'embed/metatags'); elgg_extend_view('input/longtext', 'embed/link', 1); diff --git a/mod/file/start.php b/mod/file/start.php index 9042dd6c3..3b86dcdf0 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -31,7 +31,7 @@ add_menu(elgg_echo('files'), "pg/file/"); // Extend CSS - elgg_extend_view('css', 'file/css'); + elgg_extend_view('css/screen', 'file/css'); // extend group main page elgg_extend_view('groups/tool_latest','file/groupprofile_files'); diff --git a/mod/groups/start.php b/mod/groups/start.php index c09378c98..42f304d94 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -49,7 +49,7 @@ //extend some views elgg_extend_view('profile/icon','groups/icon'); - elgg_extend_view('css','groups/css'); + elgg_extend_view('css/screen','groups/css'); // Access permissions elgg_register_plugin_hook_handler('access:collections:write', 'all', 'groups_write_acl_plugin_hook'); diff --git a/mod/members/start.php b/mod/members/start.php index 6c26efd75..4158f1aa2 100644 --- a/mod/members/start.php +++ b/mod/members/start.php @@ -6,7 +6,7 @@ */ function members_init() { - elgg_extend_view('css','members/css'); + elgg_extend_view('css/screen', 'members/css'); } // @todo - use page handler for members index diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php index d12086bf2..197504d0e 100644 --- a/mod/messageboard/start.php +++ b/mod/messageboard/start.php @@ -14,7 +14,7 @@ function messageboard_init() { // Extend system CSS with our own styles, which are defined in the messageboard/css view - elgg_extend_view('css', 'messageboard/css'); + elgg_extend_view('css/screen', 'messageboard/css'); // Register a page handler, so we can have nice URLs register_page_handler('messageboard', 'messageboard_page_handler'); diff --git a/mod/messages/start.php b/mod/messages/start.php index 4b704a344..3459bb9f8 100644 --- a/mod/messages/start.php +++ b/mod/messages/start.php @@ -18,7 +18,7 @@ function messages_init() { } // Extend system CSS with our own styles, which are defined in the shouts/css view - elgg_extend_view('css/elgg', 'messages/css'); + elgg_extend_view('css/screen', 'messages/css'); // Add icon to the topbar elgg_extend_view('elgg_topbar/extend', 'messages/topbar'); diff --git a/mod/notifications/start.php b/mod/notifications/start.php index a20005618..cea806f2f 100644 --- a/mod/notifications/start.php +++ b/mod/notifications/start.php @@ -10,7 +10,7 @@ function notifications_plugin_init() { global $CONFIG; - elgg_extend_view('css','notifications/css'); + elgg_extend_view('css/screen','notifications/css'); register_page_handler('notifications', 'notifications_page_handler'); diff --git a/mod/pages/start.php b/mod/pages/start.php index 7c278e67b..e8d49fe58 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -27,7 +27,7 @@ function pages_init() { elgg_register_action("pages/delete", $CONFIG->pluginspath . "pages/actions/pages/delete.php"); // Extend some views - elgg_extend_view('css','pages/css'); + elgg_extend_view('css/screen','pages/css'); elgg_extend_view('groups/menu/links', 'pages/menu'); // Add to groups context elgg_extend_view('groups/right_column', 'pages/groupprofile_pages'); // Add to groups context diff --git a/mod/profile/start.php b/mod/profile/start.php index 623d411ef..0ba534585 100644 --- a/mod/profile/start.php +++ b/mod/profile/start.php @@ -41,7 +41,7 @@ function profile_init() { // Add Javascript reference to the page header elgg_extend_view('html_head/extend', 'profile/metatags'); - elgg_extend_view('css', 'profile/css'); + elgg_extend_view('css/screen', 'profile/css'); elgg_extend_view('js/initialise_elgg', 'profile/javascript'); // Now override icons diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php index 37f98ad49..b947927d9 100644 --- a/mod/reportedcontent/start.php +++ b/mod/reportedcontent/start.php @@ -16,7 +16,7 @@ function reportedcontent_init() { register_page_handler('reportedcontent', 'reportedcontent_page_handler'); // Extend CSS - elgg_extend_view('css/elgg', 'reportedcontent/css'); + elgg_extend_view('css/screen', 'reportedcontent/css'); elgg_extend_view('css/admin', 'reportedcontent/admin_css'); // Extend context menu and footer with report content link diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php index 15d563855..8469448a0 100644 --- a/mod/riverdashboard/start.php +++ b/mod/riverdashboard/start.php @@ -13,7 +13,7 @@ function riverdashboard_init() { // Page handler register_page_handler('activity', 'riverdashboard_page_handler'); - elgg_extend_view('css', 'riverdashboard/css'); + elgg_extend_view('css/screen', 'riverdashboard/css'); // add an activity stream ECML keyword // we'll restrict it to use in sitepages's custom_frontpage diff --git a/mod/search/start.php b/mod/search/start.php index 9369e9221..41e67dcdf 100644 --- a/mod/search/start.php +++ b/mod/search/start.php @@ -49,7 +49,7 @@ function search_init() { } // add in CSS for search elements - elgg_extend_view('css', 'search/css'); + elgg_extend_view('css/screen', 'search/css'); // extend view for elgg topbar search box elgg_extend_view('header/extend', 'search/search_box'); diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php index 1f05f1287..a99ec8436 100644 --- a/mod/sitepages/start.php +++ b/mod/sitepages/start.php @@ -22,7 +22,7 @@ function sitepages_init() { require_once(dirname(__FILE__) . '/sitepages_functions.php'); // Extend CSS - elgg_extend_view('css', 'sitepages/css'); + elgg_extend_view('css/screen', 'sitepages/css'); // register our subtype run_function_once('sitepages_runonce'); diff --git a/mod/tagcloud/start.php b/mod/tagcloud/start.php index a6b573d90..444bf352f 100644 --- a/mod/tagcloud/start.php +++ b/mod/tagcloud/start.php @@ -6,7 +6,7 @@ function tagcloud_init() { add_widget_type('tagcloud', elgg_echo('tagcloud:widget:title'), elgg_echo('tagcloud:widget:description')); - elgg_extend_view('css','tagcloud/css'); + elgg_extend_view('css/screen', 'tagcloud/css'); } elgg_register_event_handler('init', 'system', 'tagcloud_init'); diff --git a/mod/thewire/start.php b/mod/thewire/start.php index f3d2f0e75..92c3feca1 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -23,7 +23,7 @@ add_menu(elgg_echo('thewire:title'), "pg/thewire"); // Extend system CSS with our own styles, which are defined in the thewire/css view - elgg_extend_view('css','thewire/css'); + elgg_extend_view('css/screen', 'thewire/css'); //extend views elgg_extend_view('profile/status', 'thewire/profile_status'); diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php index bc54c36a0..ddf285090 100644 --- a/mod/tinymce/start.php +++ b/mod/tinymce/start.php @@ -6,7 +6,7 @@ */ function tinymce_init() { - elgg_extend_view('css', 'tinymce/css'); + elgg_extend_view('css/screen', 'tinymce/css'); elgg_extend_view('embed/custom_insert_js', 'tinymce/embed_custom_insert_js'); } diff --git a/mod/twitter/start.php b/mod/twitter/start.php index fc8c44ae8..2678f626f 100644 --- a/mod/twitter/start.php +++ b/mod/twitter/start.php @@ -10,7 +10,7 @@ function twitter_init() { //extend css if style is required - elgg_extend_view('css','twitter/css'); + elgg_extend_view('css/screen', 'twitter/css'); //add a widget add_widget_type('twitter',"Twitter","This is your twitter feed"); diff --git a/mod/zaudio/start.php b/mod/zaudio/start.php index c440456b7..304e86102 100644 --- a/mod/zaudio/start.php +++ b/mod/zaudio/start.php @@ -11,5 +11,5 @@ elgg_register_event_handler('init', 'system', 'zaudio_init'); function zaudio_init() { - elgg_extend_view('css/elgg', 'zaudio/css'); + elgg_extend_view('css/screen', 'zaudio/css'); } diff --git a/views/default/css/elgg.php b/views/default/css/elgg.php deleted file mode 100644 index 57b118c2b..000000000 --- a/views/default/css/elgg.php +++ /dev/null @@ -1,3 +0,0 @@ -