completed the media to image block switch

git-svn-id: http://code.elgg.org/elgg/trunk@7683 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index ff8bfa4a426ae34353667f176c49d613693c836f..c9f4c2f88fa81fb19a7293e9c9fa5be638fbfc65 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -10,7 +10,6 @@
 echo elgg_view('css/elements/reset', $vars);
 echo elgg_view('css/elements/core', $vars);
 echo elgg_view('css/elements/typography', $vars);
-echo elgg_view('css/elements/layout', $vars);
 echo elgg_view('css/elements/spacing', $vars);
 echo elgg_view('css/elements/navigation', $vars);
 echo elgg_view('css/elements/grid', $vars);

diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index f46ec11d9ef8fab0ef006799e0eaf8af38459322..29fdd598b6fd970e209d5c4c89c5e5b8880d44ac 100644 (file)
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -157,3 +157,68 @@ h2 {
 .elgg_hrb {
        border-bottom: 1px solid #CCCCCC;
 }
+
+/* ***************************************
+       CSS LAYOUT OBJECTS
+*************************************** */
+
+/**
+ * elgg-body fills the space available to it.
+ * It uses hidden text to expand itself. The combination of auto width, overflow
+ * hidden, and the hidden text creates this effect.
+ *
+ * This allows us to float fixed width divs to either side of an .elgg-body div
+ * without having to specify the body div's width.
+ *
+ * @todo check what happens with long <pre> tags or large images
+ */
+.elgg-body {
+       width: auto;
+       word-wrap: break-word;
+       overflow: hidden;
+}
+.elgg-body:after {
+       display: block;
+       visibility: hidden;
+       height: 0 !important;
+       line-height: 0;
+       font-size: xx-large;
+       content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
+}
+
+.elgg_inner {
+}
+
+.elgg-footer {
+}
+
+.elgg-image-block {
+       padding: 3px 0;
+}
+
+.elgg-image-block .elgg-image {
+       float: left;
+       margin-right: 5px;
+}
+.elgg-image-block .elgg-image.elgg-alt {
+       float: right;
+       margin-left: 5px;
+}
+
+.elgg-list {
+    border-top: 1px dotted #CCCCCC;
+       margin: 5px 0;
+       clear: both;
+}
+
+.elgg-list li {
+       border-bottom: 1px dotted #CCCCCC;
+}
+
+.elgg-center {
+       margin: 0 auto;
+}
+
+.elgg-width-classic {
+       width: 990px;
+}

diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
deleted file mode 100644 (file)
index fce5eae..0000000
--- a/views/default/css/elements/layout.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Reusable layout objects and elements
- *
- * @package Elgg.Core
- * @subpackage UI
- */
-?>
-
-/**
- * elgg-body fills the space available to it.
- * It uses hidden text to expand itself. The combination of auto width, overflow
- * hidden, and the hidden text creates this effect.
- *
- * This allows us to float fixed width divs to either side of an .elgg-body div
- * without having to specify the body div's width.
- *
- * @todo check what happens with long <pre> tags or large images
- */
-.elgg-body {
-       width: auto;
-       word-wrap: break-word;
-       overflow: hidden;
-}
-.elgg-body:after {
-       display: block;
-       visibility: hidden;
-       height: 0 !important;
-       line-height: 0;
-       font-size: xx-large;
-       content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
-}
-
-.elgg_inner {
-}
-
-.elgg-footer {
-}
-
-.elgg-media {
-       padding: 3px 0;
-}
-
-.elgg-media .elgg-image {
-       float: left;
-       margin-right: 5px;
-}
-.elgg-media .elgg-image.elgg-alt {
-       float: right;
-       margin-left: 5px;
-}
-
-.elgg-list {
-    border-top: 1px dotted #CCCCCC;
-       margin: 5px 0;
-       clear: both;
-}
-
-.elgg-list li {
-       border-bottom: 1px dotted #CCCCCC;
-}
-
-.elgg-center {
-       margin: 0 auto;
-}
-
-.elgg-width-classic {
-       width: 990px;
-}

diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index cbf4e2b2d168ecccd72494cbcab9af3029fde538..ea17acf9cdf8ef6bf3b712887b5e755e3159fd64 100644 (file)
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -17,7 +17,6 @@ if ($old_css_view != "{$CONFIG->viewpath}") {
 echo elgg_view('css/elements/reset', $vars);
 echo elgg_view('css/elements/core', $vars);
 echo elgg_view('css/elements/typography', $vars);
-echo elgg_view('css/elements/layout', $vars);
 echo elgg_view('css/elements/spacing', $vars);
 echo elgg_view('css/elements/navigation', $vars);
 echo elgg_view('css/elements/grid', $vars);

diff --git a/views/default/layout/objects/image_block.php b/views/default/layout/objects/image_block.php
index 79f8db138acea063f3dc1a02b1414610aa964eea..46c58f864abde5156698aad5fe38ebf106b6ab4c 100644 (file)
--- a/views/default/layout/objects/image_block.php
+++ b/views/default/layout/objects/image_block.php
@@ -20,10 +20,10 @@
  */
 
 $body = elgg_get_array_value('body', $vars, '');
-$image_block = elgg_get_array_value('image', $vars, '');
-$alt_image_block = elgg_get_array_value('image_alt', $vars, '');
+$image = elgg_get_array_value('image', $vars, '');
+$alt_image = elgg_get_array_value('image_alt', $vars, '');
 
-$class = 'elgg-media';
+$class = 'elgg-image-block';
 $additional_class = elgg_get_array_value('class', $vars, '');
 if ($additional_class) {
        $class = "$class $additional_class";
@@ -37,16 +37,16 @@ if (isset($vars['id'])) {
 
 $body = "<div class=\"elgg-body\">$body</div>";
 
-if ($image_block) {
-       $image_block = "<div class=\"elgg-image\">$image_block</div>";
+if ($image) {
+       $image = "<div class=\"elgg-image\">$image</div>";
 }
 
-if ($alt_image_block) {
-       $alt_image_block = "<div class=\"elgg-image elgg-alt\">$alt_image_block</div>";
+if ($alt_image) {
+       $alt_image = "<div class=\"elgg-image elgg-alt\">$alt_image</div>";
 }
 
 echo <<<HTML
 <div class="$class clearfix" $id>
-       $image_block$alt_image_block$body
+       $image$alt_image$body
 </div>
 HTML;