From 4457f3339d16619b14dc308757a1a826df491e95 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 19 Dec 2010 17:38:51 +0000
Subject: changed name from media block to image block

git-svn-id: http://code.elgg.org/elgg/trunk@7682 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/layout/objects/image_block.php | 52 ++++++++++++++++++++++++++++
 views/default/layout/objects/media.php       | 52 ----------------------------
 2 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 views/default/layout/objects/image_block.php
 delete mode 100644 views/default/layout/objects/media.php

(limited to 'views/default/layout/objects')
diff --git a/views/default/layout/objects/image_block.php b/views/default/layout/objects/image_block.php
new file mode 100644
index 000000000..79f8db138
--- /dev/null
+++ b/views/default/layout/objects/image_block.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Elgg image block pattern
+ *
+ * Common pattern where there is an image, icon, media object to the left
+ * and a descriptive block of text to the right.
+ * 
+ * ---------------------------------------------------------------
+ * |          |                                      |    alt    |
+ * |  image   |               body                   |   image   |
+ * |  block   |               block                  |   block   |
+ * |          |                                      | (optional)|
+ * ---------------------------------------------------------------
+ *
+ * @uses $vars['body']        HTML content of the body block
+ * @uses $vars['image']       HTML content of the image block
+ * @uses $vars['image_alt']   HTML content of the alternate image block
+ * @uses $vars['class']       Optional additional class for media element
+ * @uses $vars['id']          Optional id for the media element
+ */
+
+$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, '');
+
+$class = 'elgg-media';
+$additional_class = elgg_get_array_value('class', $vars, '');
+if ($additional_class) {
+	$class = "$class $additional_class";
+}
+
+$id = '';
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+}
+
+
+$body = "<div class=\"elgg-body\">$body</div>";
+
+if ($image_block) {
+	$image_block = "<div class=\"elgg-image\">$image_block</div>";
+}
+
+if ($alt_image_block) {
+	$alt_image_block = "<div class=\"elgg-image elgg-alt\">$alt_image_block</div>";
+}
+
+echo <<<HTML
+<div class="$class clearfix" $id>
+	$image_block$alt_image_block$body
+</div>
+HTML;
diff --git a/views/default/layout/objects/media.php b/views/default/layout/objects/media.php
deleted file mode 100644
index 2b015bd05..000000000
--- a/views/default/layout/objects/media.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Elgg media element
- *
- * Common pattern where there is an image, icon, media object to the left
- * and a descriptive block of text to the right.
- * 
- * ---------------------------------------------------------------
- * |          |                                      |    alt    |
- * | picture  |               body                   |  picture  |
- * |  block   |               block                  |   block   |
- * |          |                                      | (optional)|
- * ---------------------------------------------------------------
- *
- * @uses $vars['body']        HTML content of the body block
- * @uses $vars['pict']        HTML content of the picture block
- * @uses $vars['pict_alt']    HTML content of the alternate picture block
- * @uses $vars['class']       Optional additional class for media element
- * @uses $vars['id']          Optional id for the media element
- */
-
-$body = elgg_get_array_value('body', $vars, '');
-$pict_block = elgg_get_array_value('pict', $vars, '');
-$alt_pict_block = elgg_get_array_value('pict_alt', $vars, '');
-
-$class = 'elgg-media';
-$additional_class = elgg_get_array_value('class', $vars, '');
-if ($additional_class) {
-	$class = "$class $additional_class";
-}
-
-$id = '';
-if (isset($vars['id'])) {
-	$id = "id=\"{$vars['id']}\"";
-}
-
-
-$body = "<div class=\"elgg-body\">$body</div>";
-
-if ($pict_block) {
-	$pict_block = "<div class=\"elgg-pict\">$pict_block</div>";
-}
-
-if ($alt_pict_block) {
-	$alt_pict_block = "<div class=\"elgg-pict-alt\">$alt_pict_block</div>";
-}
-
-echo <<<HTML
-<div class="$class clearfix" $id>
-	$pict_block$alt_pict_block$body
-</div>
-HTML;
-- 
cgit v1.2.3

