aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-10 11:21:47 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-10 11:21:47 +0000
commit0b79cec13a58e40ad14201427eedc7a49a6fb7cf (patch)
treef082f3958d100f4f2996a585d64f7596842bb96d
parente3561e5956ef087ae54f9c40df0534f2b4ec9151 (diff)
downloadelgg-0b79cec13a58e40ad14201427eedc7a49a6fb7cf.tar.gz
elgg-0b79cec13a58e40ad14201427eedc7a49a6fb7cf.tar.bz2
changed name of icon block to picture block in media object to avoid conflicts with elgg sprites
git-svn-id: http://code.elgg.org/elgg/trunk@7592 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/views.php10
-rw-r--r--views/default/css/elements/page_layout.php2
-rw-r--r--views/default/layout/objects/media.php26
3 files changed, 13 insertions, 25 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index abc1f9221..7c542b289 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -983,15 +983,15 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '',
*
* This is a shortcut for {@elgg_view layout/objects/media}.
*
- * @param string $icon The icon and other information
- * @param string $body Description content
- * @param string $vars Additional parameters for the view
+ * @param string $picture The icon and other information
+ * @param string $body Description content
+ * @param string $vars Additional parameters for the view
*
* @return string
* @since 1.8.0
*/
-function elgg_view_media($icon, $body, $vars = array()) {
- $vars['icon'] = $icon;
+function elgg_view_media($picture, $body, $vars = array()) {
+ $vars['pict'] = $picture;
$vars['body'] = $body;
return elgg_view('layout/objects/media', $vars);
}
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index 75f351781..a1a3a48f0 100644
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -57,7 +57,7 @@
padding: 3px 0;
}
-.elgg-media .elgg-icon {
+.elgg-media .elgg-pict {
float: left;
margin-right: 5px;
}
diff --git a/views/default/layout/objects/media.php b/views/default/layout/objects/media.php
index 232acc8f1..6fee91932 100644
--- a/views/default/layout/objects/media.php
+++ b/views/default/layout/objects/media.php
@@ -4,21 +4,19 @@
*
* ---------------------------------------------------
* | | |
- * | icon | body |
+ * | picture | body |
* | block | block |
* | | |
* ---------------------------------------------------
*
* @uses $vars['body'] HTML content of the body block
- * @uses $vars['icon'] HTML content of the icon block
+ * @uses $vars['pict'] HTML content of the picture block
* @uses $vars['class'] Optional additional class for media element
* @uses $vars['id'] Optional id for the media element
- * @uses $vars['body_class'] Optional additional class for body block
- * @uses $vars['icon_class'] Optional additional class for icon block
*/
$body = elgg_get_array_value('body', $vars, '');
-$icon_block = elgg_get_array_value('icon', $vars, '');
+$pict_block = elgg_get_array_value('pict', $vars, '');
$class = 'elgg-media';
$additional_class = elgg_get_array_value('class', $vars, '');
@@ -32,24 +30,14 @@ if (isset($vars['id'])) {
}
-$body_class = 'elgg-body';
-$additional_class = elgg_get_array_value('body_class', $vars, '');
-if ($additional_class) {
- $body_class = "$body_class $additional_class";
-}
-$body = "<div class=\"$body_class\">$body</div>";
+$body = "<div class=\"elgg-body\">$body</div>";
-$icon_class = 'elgg-icon';
-$additional_class = elgg_get_array_value('icon_class', $vars, '');
-if ($additional_class) {
- $icon_class = "$icon_class $additional_class";
-}
-if ($icon_block) {
- $icon_block = "<div class=\"$icon_class\">$icon_block</div>";
+if ($pict_block) {
+ $pict_block = "<div class=\"elgg-pict\">$pict_block</div>";
}
echo <<<HTML
<div class="$class clearfix" $id>
- $icon_block$body
+ $pict_block$body
</div>
HTML;