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

diff --git a/engine/lib/views.php b/engine/lib/views.php
index e0e10bcb7a40caa2e085e35a965fad579caa0b24..73a12cc8d7962eb600f0824d80a3fa3a7a362508 100644 (file)
--- 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 08b7541b35664dceeb3a876b2d1af5d9776f2180..62f963b4bbe0d72e0fd1049b39d855958e9cdaea 100644 (file)
--- 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 579b40baaa76d65af2440fd681533b7f3b3d55ff..0528eb3b540188404f17e4a576efdfce317c953f 100644 (file)
--- 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 3458e02a5c1ad7b94e5a23e9627276ff02a47b91..ec97d96b62d33cd04c28e950107c0845a6335f03 100644 (file)
--- 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 40d6c9c4d4af5a7c0a36c402b00ec3d373dc2f76..e69e482b81760799c64654719c2eefaecb7584f4 100644 (file)
--- 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 4000ff98aee87c155ac8bbf2e55a4aeccc1c2503..4fa13b7c943d5b1c3df9399dda9efa2b9f091920 100644 (file)
--- 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 4eb5fcec209594eb55a5035e41f0688c4c43aa34..5f8b766412edbff2cd77138711d4e518edc70a59 100644 (file)
--- 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 9042dd6c353f94bd3c1381e02d6fc0208f669dd2..3b86dcdf04b34ccde54edf958f254a3b43fe53fd 100644 (file)
--- 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 c09378c98daaf5c393f3bc4c81ab97904f1bc20f..42f304d942b5bda482abbd1a20e5215c614c4448 100644 (file)
--- 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 6c26efd75bcd32801c3514afa57e7dbf0d482e64..4158f1aa20f42f42703e8928dabaf1beed4224db 100644 (file)
--- 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 d12086bf253f2c025d9c4d179caa4751a8163285..197504d0e9caed3fdf61391b9d4aeac90b75e949 100644 (file)
--- 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 4b704a344e192507af5386476d17d81b6677b6ff..3459bb9f896825abbd5c96dc735ea4ed5b25de75 100644 (file)
--- 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 a200056181e610f3bfb49fa28110c3cbe7d01d6d..cea806f2f74ef664a5d6dfd62509cc1085ba468d 100644 (file)
--- 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 7c278e67bb75bff130528e45e13281b3776645a4..e8d49fe582677755a37ac97604102366508dc16a 100644 (file)
--- 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 623d411ef948ff2fc2fd8a9a21ed8ab4a8f73e54..0ba534585550c09b381e75531575bc8cc3fc8158 100644 (file)
--- 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 37f98ad4983f3db417df712b4afbb5f015352ace..b947927d945d1245261c22c74203191b7633b104 100644 (file)
--- 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 15d563855d83c26a27d6d1a2a99801400d1aa2a8..8469448a0b5f01ccbc29a983c064d68efd673c78 100644 (file)
--- 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 9369e9221fd37a3108af915c8fe76957498e0fa3..41e67dcdf38a65620482a756eb64074bd1a29964 100644 (file)
--- 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 1f05f1287062b2ea0268ce20fea2ce6bbd5c854c..a99ec843646b03e45e6001eff9dcdf2eecff4c90 100644 (file)
--- 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 a6b573d904c0d42944048fa09ae41c467471aaa3..444bf352fc2aff00c2b19ab6da2462dd9d114d70 100644 (file)
--- 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 f3d2f0e75e4eea3f1b5f973c2495543dab9ccef5..92c3feca1af8f39b7045a476db19a0b4e9dcd2e0 100644 (file)
--- 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 bc54c36a014706674df5d3dea15c067664de6258..ddf2850907f662c6b82497ca1b57f0b99f074a88 100644 (file)
--- 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 fc8c44ae8219e09e614e9357a8f333958aaeddde..2678f626fc22b11f3f2e8df2b691a09c7e488b1c 100644 (file)
--- 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 c440456b7dcc1f6da1603ee729789dd7642685e1..304e86102830114d0597c90aeaef12de99e2cf17 100644 (file)
--- 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/screen.php
similarity index 100%
rename from views/default/css/elgg.php
rename to views/default/css/screen.php