From 4457f3339d16619b14dc308757a1a826df491e95 Mon Sep 17 00:00:00 2001 From: cash 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/annotation/generic_comment.php | 4 +-- views/default/css/elements/layout.php | 4 +-- views/default/layout/objects/image_block.php | 52 ++++++++++++++++++++++++++++ views/default/layout/objects/media.php | 52 ---------------------------- 4 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 views/default/layout/objects/image_block.php delete mode 100644 views/default/layout/objects/media.php (limited to 'views') diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index c6fea8b41..a7ab0a956 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -53,7 +53,7 @@ if ($full_view) {

HTML; - echo elgg_view_media($commenter_icon, $body); + echo elgg_view_image_block($commenter_icon, $body); } else { // brief view @@ -68,5 +68,5 @@ HTML; HTML; - echo elgg_view_media($commenter_icon, $body); + echo elgg_view_image_block($commenter_icon, $body); } diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php index 945a4a951..fce5eaed9 100644 --- a/views/default/css/elements/layout.php +++ b/views/default/css/elements/layout.php @@ -41,11 +41,11 @@ padding: 3px 0; } -.elgg-media .elgg-pict { +.elgg-media .elgg-image { float: left; margin-right: 5px; } -.elgg-media .elgg-pict-alt { +.elgg-media .elgg-image.elgg-alt { float: right; margin-left: 5px; } 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 @@ +$body"; + +if ($image_block) { + $image_block = "
$image_block
"; +} + +if ($alt_image_block) { + $alt_image_block = "
$alt_image_block
"; +} + +echo << + $image_block$alt_image_block$body + +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 @@ -$body"; - -if ($pict_block) { - $pict_block = "
$pict_block
"; -} - -if ($alt_pict_block) { - $alt_pict_block = "
$alt_pict_block
"; -} - -echo << - $pict_block$alt_pict_block$body - -HTML; -- cgit v1.2.3