aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/blog/views/default/object/blog.php4
-rw-r--r--views/default/annotation/generic_comment.php2
-rw-r--r--views/default/css/screen.php2
-rw-r--r--views/default/layout_elements/media.php20
4 files changed, 14 insertions, 14 deletions
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 7e6be0b21..75df11b62 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -93,7 +93,7 @@ if ($full) {
HTML;
$params = array(
- 'img' => $owner_icon,
+ 'icon' => $owner_icon,
'body' => $info,
);
$blog_info = elgg_view('layout_elements/media', $params);
@@ -125,7 +125,7 @@ HTML;
HTML;
$params = array(
- 'img' => $owner_icon,
+ 'icon' => $owner_icon,
'body' => $body,
);
echo elgg_view('layout_elements/media', $params);
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 7b26756a3..3fc55e84a 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -43,7 +43,7 @@ if ($full_view) {
HTML;
$params = array(
- 'img' => $commenter_icon,
+ 'icon' => $commenter_icon,
'body' => $body,
);
echo elgg_view('layout_elements/media', $params);
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 0026d8038..d12591fe2 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -343,7 +343,7 @@ h2 {
padding: 3px 0;
}
-.elgg-media .elgg-img {
+.elgg-media .elgg-icon {
float: left;
margin-right: 5px;
}
diff --git a/views/default/layout_elements/media.php b/views/default/layout_elements/media.php
index 8599d6c8a..5f4e51d57 100644
--- a/views/default/layout_elements/media.php
+++ b/views/default/layout_elements/media.php
@@ -4,20 +4,20 @@
*
* ---------------------------------------------------
* | | |
- * | image | body |
+ * | icon | body |
* | block | block |
* | | |
* ---------------------------------------------------
*
* @uses $vars['body'] HTML content of the body block
- * @uses $vars['img'] HTML content of the image block
+ * @uses $vars['icon'] HTML content of the icon block
* @uses $vars['class'] Optional additional class for media element
* @uses $vars['body_class'] Optional additional class for body block
- * @uses $vars['img_class'] Optional additional class for image block
+ * @uses $vars['icon_class'] Optional additional class for icon block
*/
$body = elgg_get_array_value('body', $vars, '');
-$image_block = elgg_get_array_value('img', $vars, '');
+$icon_block = elgg_get_array_value('icon', $vars, '');
$class = 'elgg-media';
$additional_class = elgg_get_array_value('class', $vars, '');
@@ -32,17 +32,17 @@ if ($additional_class) {
}
$body = "<div class=\"$body_class\">$body</div>";
-$img_class = 'elgg-img';
-$additional_class = elgg_get_array_value('img_class', $vars, '');
+$icon_class = 'elgg-icon';
+$additional_class = elgg_get_array_value('icon_class', $vars, '');
if ($additional_class) {
- $img_class = "$img_class $additional_class";
+ $icon_class = "$icon_class $additional_class";
}
-if ($image_block) {
- $image_block = "<div class=\"$img_class\">$image_block</div>";
+if ($icon_block) {
+ $icon_block = "<div class=\"$icon_class\">$icon_block</div>";
}
echo <<<HTML
<div class="$class clearfix">
- $image_block$body
+ $icon_block$body
</div>
HTML;