]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0030fe2)
Fixes #2934 switching to css/elgg for css view since using a print viewtype is a...
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 21 Feb 2011 02:59:33 +0000 (02:59 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 21 Feb 2011 02:59:33 +0000 (02:59 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8383 36083f99-b078-4883-b0ff-0f9b5a30f544

22 files changed:
engine/lib/admin.php patch | blob | history
engine/lib/views.php patch | blob | history
mod/bookmarks/start.php patch | blob | history
mod/categories/start.php patch | blob | history
mod/custom_index/start.php patch | blob | history
mod/developers/views/default/page/shells/theme_preview.php patch | blob | history
mod/embed/start.php patch | blob | history
mod/file/start.php patch | blob | history
mod/groups/start.php patch | blob | history
mod/messages/start.php patch | blob | history
mod/notifications/start.php patch | blob | history
mod/pages/start.php patch | blob | history
mod/profile/start.php patch | blob | history
mod/reportedcontent/start.php patch | blob | history
mod/search/start.php patch | blob | history
mod/tinymce/start.php patch | blob | history
mod/twitter/start.php patch | blob | history
mod/zaudio/start.php patch | blob | history
views/default/css.php patch | blob | history
views/default/css/elements/layout_objects.php patch | blob | history
views/default/css/elgg.php [moved from views/default/css/screen.php with 100% similarity] patch | blob | history
views/default/page/shells/default.php patch | blob | history

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index e5d78336f4f62cfa7ee0afb50f316cd34deee076..f53001b71507d47f1fed044c082169d2c927596b 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -278,7 +278,7 @@ function admin_settings_page_handler($page) {
        elgg_admin_add_plugin_settings_menu();
        elgg_set_context('admin');
 
-       elgg_unregister_css('screen');
+       elgg_unregister_css('elgg');
 
        $url = elgg_get_simplecache_url('js', 'admin');
        elgg_register_js($url, 'admin');
diff --git a/engine/lib/views.php b/engine/lib/views.php
index e871ec0a1a17a70052844488490e3bdea7638a61..f019fee5ff7ae00b125e661174976e8a1e7a2ec0 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1459,8 +1459,8 @@ function elgg_views_register_core_head_elements() {
        $url = elgg_get_simplecache_url('js', 'elgg');
        elgg_register_js($url, 'elgg');
 
-       $url = elgg_get_simplecache_url('css', 'screen');
-       elgg_register_css($url, 'screen');
+       $url = elgg_get_simplecache_url('css', 'elgg');
+       elgg_register_css($url, 'elgg');
 }
 
 /**
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 3585999b3c9bc7aaaf011e999b3eb462bfd91456..001a68eb72759fcbfe1494741f691caec47e1cf6 100644 (file)
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -35,7 +35,7 @@ function bookmarks_init() {
 
        elgg_register_page_handler('bookmarks', 'bookmarks_page_handler');
 
-       elgg_extend_view('css/screen', 'bookmarks/css');
+       elgg_extend_view('css/elgg', 'bookmarks/css');
        elgg_extend_view('js/elgg', 'bookmarks/js');
        elgg_extend_view('page/links', 'bookmarks/page_links');
 
diff --git a/mod/categories/start.php b/mod/categories/start.php
index 1b8645eef72fb591c834ca5f7b628c42f198f5f5..bc272274f68b44059780d37da4a5cf2cf5dec1a5 100644 (file)
--- a/mod/categories/start.php
+++ b/mod/categories/start.php
@@ -13,7 +13,7 @@ elgg_register_event_handler('init', 'system', 'categories_init');
  */
 function categories_init() {
 
-       elgg_extend_view('css/screen', 'categories/css');
+       elgg_extend_view('css/elgg', 'categories/css');
 
        $action_base = elgg_get_plugins_path() . 'categories/actions';
        elgg_register_action('settings/categories/save', "$action_base/save.php", 'admin');
diff --git a/mod/custom_index/start.php b/mod/custom_index/start.php
index 3c395e87b30944260810fc0e151d1b919d435f20..471a03999e17a418a4db0b6e24da486d1440271f 100644 (file)
--- a/mod/custom_index/start.php
+++ b/mod/custom_index/start.php
@@ -9,7 +9,7 @@ register_elgg_event_handler('init', 'system', 'custom_index_init');
 function custom_index_init() {
 
        // Extend system CSS with our own styles
-       elgg_extend_view('css/screen', 'custom_index/css');
+       elgg_extend_view('css/elgg', 'custom_index/css');
 
        // Replace the default index page
        register_plugin_hook('index', 'system', 'custom_index');
diff --git a/mod/developers/views/default/page/shells/theme_preview.php b/mod/developers/views/default/page/shells/theme_preview.php
index bf18dd16cecba072c24d8eafbd9464ebbdc746ba..0fe7e47322f357c881ec7e522d73bb7ebfcd1ec3 100644 (file)
--- a/mod/developers/views/default/page/shells/theme_preview.php
+++ b/mod/developers/views/default/page/shells/theme_preview.php
@@ -3,7 +3,7 @@
  * Page shell for theme preview
  */
 
-$screen = elgg_get_simplecache_url('css', 'screen');
+$elgg = elgg_get_simplecache_url('css', 'elgg');
 $ie_url = elgg_get_simplecache_url('css', 'ie');
 $ie6_url = elgg_get_simplecache_url('css', 'ie6');
 
@@ -16,7 +16,7 @@ header("Content-type: text/html; charset=UTF-8");
 <head>
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <title><?php echo $vars['title']; ?></title>
-       <link rel="stylesheet" href="<?php echo $screen; ?>" type="text/css" />
+       <link rel="stylesheet" href="<?php echo $elgg; ?>" type="text/css" />
        <style>
                .elgg-page-body { margin: 20px }
                .elgg-page-header:after {content:'.'; display:block; clear:both; height:0; visibility: hidden}
diff --git a/mod/embed/start.php b/mod/embed/start.php
index 1297f4cc34eceae5f4c4d8669bf8dc70cc613d2d..cda9f4db49e69b531837280c9c1c2c34b3915091 100644 (file)
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -12,7 +12,7 @@ elgg_register_event_handler('init', 'system', 'embed_init');
  * Init function
  */
 function embed_init() {
-       elgg_extend_view('css/screen', 'embed/css');
+       elgg_extend_view('css/elgg', 'embed/css');
        elgg_extend_view('js/elgg', 'embed/js');
        elgg_extend_view('footer/analytics', 'embed/lightbox_init');
        elgg_extend_view('input/longtext', 'embed/link', 1);
diff --git a/mod/file/start.php b/mod/file/start.php
index 765ef6b01adf150bb6ff0201a4730f4bc2db5b06..c2f445d5df0ef034879c64d25af1cd5242334416 100644 (file)
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -20,7 +20,7 @@ function file_init() {
        elgg_register_menu_item('site', $item);
 
        // Extend CSS
-       elgg_extend_view('css/screen', 'file/css');
+       elgg_extend_view('css/elgg', 'file/css');
 
        // extend group main page
        elgg_extend_view('groups/tool_latest', 'file/group_module');
diff --git a/mod/groups/start.php b/mod/groups/start.php
index b3fe9560a07d5c3772073e95473539938af8844a..8490f1c87afc803b292fab64e793d5d24e15253a 100644 (file)
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -60,7 +60,7 @@ function groups_init() {
 
        //extend some views
        elgg_extend_view('profile/icon', 'groups/icon');
-       elgg_extend_view('css/screen', 'groups/css');
+       elgg_extend_view('css/elgg', 'groups/css');
 
        // Access permissions
        elgg_register_plugin_hook_handler('access:collections:write', 'all', 'groups_write_acl_plugin_hook');
diff --git a/mod/messages/start.php b/mod/messages/start.php
index da85a09ef1f0a8df4231b4e88ad78e8456cc4ec5..9868cce49ef0879f1194fe119de4841998f2abbb 100644 (file)
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -31,7 +31,7 @@ function messages_init() {
        }
 
        // Extend system CSS with our own styles, which are defined in the shouts/css view
-       elgg_extend_view('css/screen', 'messages/css');
+       elgg_extend_view('css/elgg', '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 e2e997ff155300ab8733fe8a3f2ae448d311176c..1c12dbf6345343479448a079dad4cd80d7db64ab 100644 (file)
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -9,7 +9,7 @@
 
 function notifications_plugin_init() {
 
-       elgg_extend_view('css/screen','notifications/css');
+       elgg_extend_view('css/elgg','notifications/css');
 
        elgg_register_page_handler('notifications', 'notifications_page_handler');
 
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 5c9b4bdc7af34ec963e99b133b86cc82eefd85df..82f3a2ba9634ffcf299242ee6356cd2e23e327a3 100644 (file)
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -34,7 +34,7 @@ function pages_init() {
        elgg_register_action("pages/delete", "$action_base/delete.php");
 
        // Extend some views
-       elgg_extend_view('css/screen', 'pages/css');
+       elgg_extend_view('css/elgg', 'pages/css');
 
        // Register entity type for search
        elgg_register_entity_type('object', 'page');
diff --git a/mod/profile/start.php b/mod/profile/start.php
index e17f955c5f8d58f7bce86fa1dd22f1833353059b..8ef304cc20a2d1bcf395f7a515f4849d4bac3c88 100644 (file)
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -30,7 +30,7 @@ function profile_init() {
        elgg_register_page_handler('profile', 'profile_page_handler');
 
        elgg_extend_view('html_head/extend', 'profile/metatags');
-       elgg_extend_view('css/screen', 'profile/css');
+       elgg_extend_view('css/elgg', 'profile/css');
 
        // allow ECML in parts of the profile
        elgg_register_plugin_hook_handler('get_views', 'ecml', 'profile_ecml_views_hook');
diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index eba1b13a1d4cbc90f572b3db5754689eb1d59271..2ef80a7e377cd80ad9158bbe136980f96d41f250 100644 (file)
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -16,7 +16,7 @@ function reportedcontent_init() {
        elgg_register_page_handler('reportedcontent', 'reportedcontent_page_handler');
        
        // Extend CSS
-       elgg_extend_view('css/screen', 'reportedcontent/css');
+       elgg_extend_view('css/elgg', 'reportedcontent/css');
        elgg_extend_view('css/admin', 'reportedcontent/admin_css');
 
        // Extend footer with report content link
diff --git a/mod/search/start.php b/mod/search/start.php
index b979e2f7908171cfc084602969e948920d602c75..0c4bc72570d20d5521b55a137198306c8f0731be 100644 (file)
--- a/mod/search/start.php
+++ b/mod/search/start.php
@@ -46,7 +46,7 @@ function search_init() {
        }
 
        // add in CSS for search elements
-       elgg_extend_view('css/screen', 'search/css');
+       elgg_extend_view('css/elgg', 'search/css');
 
        // extend view for elgg topbar search box
        elgg_extend_view('header/extend', 'search/search_box');
diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php
index 26b075f7112eb503d7e389e196caff8114329fc3..9a33f03a33e2bed9e92ee1e1c358d29c01202579 100644 (file)
--- a/mod/tinymce/start.php
+++ b/mod/tinymce/start.php
@@ -6,7 +6,7 @@
  */
 
 function tinymce_init() {
-       elgg_extend_view('css/screen', 'tinymce/css');
+       elgg_extend_view('css/elgg', 'tinymce/css');
        elgg_extend_view('css/admin', '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 85dde75bdecebfe0a2336dd2a6eea7e01386fef4..ca30f0c38647b45b256966b16d76280616192754 100644 (file)
--- a/mod/twitter/start.php
+++ b/mod/twitter/start.php
@@ -9,6 +9,6 @@
 register_elgg_event_handler('init', 'system', 'twitter_init');
 
 function twitter_init() {
-       elgg_extend_view('css/screen', 'twitter/css');
+       elgg_extend_view('css/elgg', 'twitter/css');
        add_widget_type('twitter', elgg_echo('twitter:title'), elgg_echo('twitter:info'));
 }
diff --git a/mod/zaudio/start.php b/mod/zaudio/start.php
index 304e86102830114d0597c90aeaef12de99e2cf17..c440456b7dcc1f6da1603ee729789dd7642685e1 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/screen', 'zaudio/css');
+       elgg_extend_view('css/elgg', 'zaudio/css');
 }
diff --git a/views/default/css.php b/views/default/css.php
index f02549c3d827a34e7057d1034d487b1c822afdb2..e67c79c36973bbd8e158807d008bd959b94290e8 100644 (file)
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -2,6 +2,6 @@
 /**
  *
  * This is a deprecated CSS view used in Elgg 1.0-1.7.
- * Please use the view 'css/screen' now.
+ * Please use the view 'css/elgg' now.
  *
  */
diff --git a/views/default/css/elements/layout_objects.php b/views/default/css/elements/layout_objects.php
index 7968874c227b7f8d11a035bab81a975597d7746c..dc21d2e73ec806a4ba67d6a2dd487d22432abba3 100644 (file)
--- a/views/default/css/elements/layout_objects.php
+++ b/views/default/css/elements/layout_objects.php
@@ -93,6 +93,9 @@
 .elgg-gallery td {
        padding: 5px;
 }
+.elgg-gallery-fluid li {
+       float: left;
+}
 
 /* ***************************************
        Tables
diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php
index 775eb4acc7e096dde5362c082ff1036f925041f6..ba11fd69b0c23b934ffe4a73f70c59882a22afb3 100644 (file)
--- a/views/default/page/shells/default.php
+++ b/views/default/page/shells/default.php
@@ -16,7 +16,7 @@
 if (elgg_get_context() == 'admin') {
        elgg_deprecated_notice("admin plugins should route through pg/admin.", 1.8);
        elgg_admin_add_plugin_settings_menu();
-       elgg_unregister_css('screen');
+       elgg_unregister_css('elgg');
        echo elgg_view('page/shells/admin', $vars);
        return true;
 }
Social Networking Engine