diff options
| -rw-r--r-- | engine/lib/river.php | 2 | ||||
| -rw-r--r-- | engine/lib/views.php | 16 | ||||
| -rw-r--r-- | mod/blog/views/default/object/blog.php | 4 | ||||
| -rw-r--r-- | mod/riverdashboard/start.php | 24 | ||||
| -rw-r--r-- | views/default/annotation/generic_comment.php | 4 | ||||
| -rw-r--r-- | views/default/css/elements/layout.php | 4 | ||||
| -rw-r--r-- | views/default/layout/objects/image_block.php (renamed from views/default/layout/objects/media.php) | 22 |
7 files changed, 27 insertions, 49 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php index 459d351c1..dc9efda4d 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -485,7 +485,7 @@ function elgg_view_river_item($item) { 'pict_alt' => elgg_view('core/river/controls', array('item' => $item)), 'class' => 'elgg-river-item', ); - return elgg_view('layout/objects/media', $vars); + return elgg_view('layout/objects/image_block', $vars); } /** diff --git a/engine/lib/views.php b/engine/lib/views.php index f314a93af..1f02d29d2 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -1012,24 +1012,24 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '', echo elgg_view('layout/objects/module', array('title' => $title, 'body' => $body)); } /** - * Wrapper function for the media display pattern. + * Wrapper function for the image block display pattern. * * Fixed width media on the side (image, icon, flash, etc.). * Descriptive content filling the rest of the column. * - * This is a shortcut for {@elgg_view layout/objects/media}. + * This is a shortcut for {@elgg_view layout/objects/image_block}. * - * @param string $picture The icon and other information + * @param string $image 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($picture, $body, $vars = array()) { - $vars['pict'] = $picture; +function elgg_view_image_block($image, $body, $vars = array()) { + $vars['image'] = $image; $vars['body'] = $body; - return elgg_view('layout/objects/media', $vars); + return elgg_view('layout/objects/image_block', $vars); } /** @@ -1039,10 +1039,10 @@ function elgg_view_media($picture, $body, $vars = array()) { * @param string $info Any information that needs to be displayed. * * @return string The HTML (etc) representing the listing - * @deprecated 1.8 use elgg_view_media() + * @deprecated 1.8 use elgg_view_image_block() */ function elgg_view_listing($icon, $info) { - elgg_deprecated_notice('elgg_view_listing deprecated by elgg_view_media', 1.8); + elgg_deprecated_notice('elgg_view_listing deprecated by elgg_view_image_block', 1.8); return elgg_view('layout/objects/media', array('icon' => $icon, 'body' => $info)); } diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 08e174063..776408cc5 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -92,7 +92,7 @@ if ($full) { </div> HTML; - $blog_info = elgg_view_media($owner_icon, $info); + $blog_info = elgg_view_image_block($owner_icon, $info); echo <<<HTML $header @@ -120,5 +120,5 @@ HTML; </div> HTML; - echo elgg_view_media($owner_icon, $body); + echo elgg_view_image_block($owner_icon, $body); } diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php index 6d1581873..7955b494e 100644 --- a/mod/riverdashboard/start.php +++ b/mod/riverdashboard/start.php @@ -364,27 +364,5 @@ function riverdashboard_view_river_item($item) { 'class' => 'elgg-river-item', 'id' => "river-entity-{$object->guid}", ); - return elgg_view('layout/objects/media', $vars); -/* - if (isset($item->view)) { - $object = get_entity($item->object_guid); - $subject = get_entity($item->subject_guid); - if (!$object || !$subject) { - // probably means an entity is disabled - return false; - } else { - if (elgg_view_exists($item->view)) { - $body = elgg_view($item->view, array( - 'item' => $item - )); - } - } - return elgg_view('river/item/wrapper', array( - 'item' => $item, - 'body' => $body - )); - } - return false; - * - */ + return elgg_view('layout/objects/image_block', $vars); } 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) { </p> HTML; - echo elgg_view_media($commenter_icon, $body); + echo elgg_view_image_block($commenter_icon, $body); } else { // brief view @@ -68,5 +68,5 @@ HTML; </span> 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/media.php b/views/default/layout/objects/image_block.php index 2b015bd05..79f8db138 100644 --- a/views/default/layout/objects/media.php +++ b/views/default/layout/objects/image_block.php @@ -1,27 +1,27 @@ <?php /** - * Elgg media element + * 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 | - * | picture | body | picture | + * | image | body | image | * | 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['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, ''); -$pict_block = elgg_get_array_value('pict', $vars, ''); -$alt_pict_block = elgg_get_array_value('pict_alt', $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, ''); @@ -37,16 +37,16 @@ if (isset($vars['id'])) { $body = "<div class=\"elgg-body\">$body</div>"; -if ($pict_block) { - $pict_block = "<div class=\"elgg-pict\">$pict_block</div>"; +if ($image_block) { + $image_block = "<div class=\"elgg-image\">$image_block</div>"; } -if ($alt_pict_block) { - $alt_pict_block = "<div class=\"elgg-pict-alt\">$alt_pict_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> - $pict_block$alt_pict_block$body + $image_block$alt_image_block$body </div> HTML; |