From f26d7d47986222c0f3a4038f7bc8d73c37f8ca4e Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 21 Feb 2011 02:59:33 +0000
Subject: Fixes #2934 switching to css/elgg for css view since using a print
 viewtype is a good idea and screen would become a confusing idea

git-svn-id: http://code.elgg.org/elgg/trunk@8383 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/admin.php                               |  2 +-
 engine/lib/views.php                               |  4 +-
 mod/bookmarks/start.php                            |  2 +-
 mod/categories/start.php                           |  2 +-
 mod/custom_index/start.php                         |  2 +-
 .../views/default/page/shells/theme_preview.php    |  4 +-
 mod/embed/start.php                                |  2 +-
 mod/file/start.php                                 |  2 +-
 mod/groups/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/search/start.php                               |  2 +-
 mod/tinymce/start.php                              |  2 +-
 mod/twitter/start.php                              |  2 +-
 mod/zaudio/start.php                               |  2 +-
 views/default/css.php                              |  2 +-
 views/default/css/elements/layout_objects.php      |  3 ++
 views/default/css/elgg.php                         | 56 ++++++++++++++++++++++
 views/default/css/screen.php                       | 56 ----------------------
 views/default/page/shells/default.php              |  2 +-
 23 files changed, 81 insertions(+), 78 deletions(-)
 create mode 100644 views/default/css/elgg.php
 delete mode 100644 views/default/css/screen.php

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index e5d78336f..f53001b71 100644
--- 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 e871ec0a1..f019fee5f 100644
--- 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 3585999b3..001a68eb7 100644
--- 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 1b8645eef..bc272274f 100644
--- 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 3c395e87b..471a03999 100644
--- 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 bf18dd16c..0fe7e4732 100644
--- 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 1297f4cc3..cda9f4db4 100644
--- 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 765ef6b01..c2f445d5d 100644
--- 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 b3fe9560a..8490f1c87 100644
--- 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 da85a09ef..9868cce49 100644
--- 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 e2e997ff1..1c12dbf63 100644
--- 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 5c9b4bdc7..82f3a2ba9 100644
--- 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 e17f955c5..8ef304cc2 100644
--- 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 eba1b13a1..2ef80a7e3 100644
--- 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 b979e2f79..0c4bc7257 100644
--- 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 26b075f71..9a33f03a3 100644
--- 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 85dde75bd..ca30f0c38 100644
--- 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 304e86102..c440456b7 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/screen', 'zaudio/css');
+	elgg_extend_view('css/elgg', 'zaudio/css');
 }
diff --git a/views/default/css.php b/views/default/css.php
index f02549c3d..e67c79c36 100644
--- 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 7968874c2..dc21d2e73 100644
--- 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/css/elgg.php b/views/default/css/elgg.php
new file mode 100644
index 000000000..300038eb9
--- /dev/null
+++ b/views/default/css/elgg.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Elgg primary CSS view
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+
+// check if there is a theme overriding the old css view and use it, if it exists
+$old_css_view = elgg_get_view_location('css');
+if ($old_css_view != elgg_get_config('viewpath')) {
+	echo elgg_view('css', $vars);
+	return true;
+}
+
+
+/*******************************************************************************
+
+Base CSS
+ * CSS reset
+ * helpers
+ * grid
+
+*******************************************************************************/
+echo elgg_view('css/elements/reset', $vars);
+echo elgg_view('css/elements/helpers', $vars);
+echo elgg_view('css/elements/grid', $vars);
+
+
+/*******************************************************************************
+
+Skin CSS
+ * typography     - fonts, line spacing
+ * chrome         - general skin
+ * forms          - form elements, buttons
+ * navigation     - menus, breadcrumbs, pagination
+ * icons          - icons, sprites, graphics
+ * modules        - modules, widgets
+ * layout_objects - lists, content blocks, notifications, avatars
+ * page_layout    - page layout
+ * misc           - to be removed/redone
+
+*******************************************************************************/
+echo elgg_view('css/elements/typography', $vars);
+echo elgg_view('css/elements/chrome', $vars);
+echo elgg_view('css/elements/forms', $vars);
+echo elgg_view('css/elements/icons', $vars);
+echo elgg_view('css/elements/navigation', $vars);
+echo elgg_view('css/elements/modules', $vars);
+echo elgg_view('css/elements/layout_objects', $vars);
+echo elgg_view('css/elements/page_layout', $vars);
+echo elgg_view('css/elements/misc', $vars);
+
+
+// in case plugins are still extending the old 'css' view, display it
+echo elgg_view('css', $vars);
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
deleted file mode 100644
index 300038eb9..000000000
--- a/views/default/css/screen.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Elgg primary CSS view
- *
- * @package Elgg.Core
- * @subpackage UI
- */
-
-// check if there is a theme overriding the old css view and use it, if it exists
-$old_css_view = elgg_get_view_location('css');
-if ($old_css_view != elgg_get_config('viewpath')) {
-	echo elgg_view('css', $vars);
-	return true;
-}
-
-
-/*******************************************************************************
-
-Base CSS
- * CSS reset
- * helpers
- * grid
-
-*******************************************************************************/
-echo elgg_view('css/elements/reset', $vars);
-echo elgg_view('css/elements/helpers', $vars);
-echo elgg_view('css/elements/grid', $vars);
-
-
-/*******************************************************************************
-
-Skin CSS
- * typography     - fonts, line spacing
- * chrome         - general skin
- * forms          - form elements, buttons
- * navigation     - menus, breadcrumbs, pagination
- * icons          - icons, sprites, graphics
- * modules        - modules, widgets
- * layout_objects - lists, content blocks, notifications, avatars
- * page_layout    - page layout
- * misc           - to be removed/redone
-
-*******************************************************************************/
-echo elgg_view('css/elements/typography', $vars);
-echo elgg_view('css/elements/chrome', $vars);
-echo elgg_view('css/elements/forms', $vars);
-echo elgg_view('css/elements/icons', $vars);
-echo elgg_view('css/elements/navigation', $vars);
-echo elgg_view('css/elements/modules', $vars);
-echo elgg_view('css/elements/layout_objects', $vars);
-echo elgg_view('css/elements/page_layout', $vars);
-echo elgg_view('css/elements/misc', $vars);
-
-
-// in case plugins are still extending the old 'css' view, display it
-echo elgg_view('css', $vars);
diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php
index 775eb4acc..ba11fd69b 100644
--- 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;
 }
-- 
cgit v1.2.3