From 4d80bc33b8924038bd1ca57d548828afe661bb42 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 2 Dec 2010 03:10:57 +0000 Subject: Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change git-svn-id: http://code.elgg.org/elgg/trunk@7493 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/river/item/list.php | 6 ++-- .../views/default/river/item/wrapper.php | 42 +++++++++++----------- .../views/default/river/item/wrapper_classic.php | 6 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'mod/riverdashboard/views/default/river/item') diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php index a0f547e45..fdd5b24df 100644 --- a/mod/riverdashboard/views/default/river/item/list.php +++ b/mod/riverdashboard/views/default/river/item/list.php @@ -5,7 +5,7 @@ if (isset($vars['items']) && is_array($vars['items'])) { $i = 0; if (!empty($vars['items'])) { foreach($vars['items'] as $item) { - echo elgg_view_river_item($item); + echo elgg_view_river-item($item); $i++; if ($i >= $vars['limit']) { break; @@ -29,7 +29,7 @@ if ($vars['pagination'] !== false) { $nexturl=$baseurl . '?' . $urladdition; } - $nav .= '« ' . elgg_echo('previous') . ' '; + $nav .= '« ' . elgg_echo('previous') . ' '; } if ($vars['offset'] > 0) { @@ -44,7 +44,7 @@ if ($vars['pagination'] !== false) { $prevurl=$baseurl . '?' . $urladdition; } - $nav .= '' . elgg_echo('next') . ' » '; + $nav .= '' . elgg_echo('next') . ' » '; } if (!empty($nav)) { diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index 0413775d6..8e93b25b5 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper.php +++ b/mod/riverdashboard/views/default/river/item/wrapper.php @@ -41,12 +41,12 @@ if ($comment_count < 3) { } ?> -
- +
+ $user, 'size' => 'small')); ?> -
+
"; - echo "" . elgg_echo('comments') . ''; + echo "
"; + echo "" . elgg_echo('comments') . ''; if ($likes_count != 0) { echo elgg_view('likes/forms/display', array('entity' => $object)); } - echo "
"; // close river_comments_tabs + echo "
"; // close river-comments-tabs - echo "
"; + echo "
"; if ($likes_count != 0) { //show the users who liked the object // this is loaded via ajax to avoid pounding the server with avatar requests. - echo ""; + echo ""; } echo "
"; // display appropriate comment link if ($more_comments_count > 0) { - echo "" . + echo "" . elgg_echo('riverdashboard:n_more_comments', array($more_comments_count)) . ''; - echo "" . elgg_echo('riverdashboard:show_less') . ''; + echo "" . elgg_echo('riverdashboard:show_less') . ''; } echo "
"; foreach ($comments as $comment) { @@ -95,27 +95,27 @@ if ($comments){ $alt = 'penultimate'; } //display comment - echo "
"; - echo ""; + echo "
"; + echo ""; echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny')); echo ""; //truncate comment to 150 characters and strip tags $contents = elgg_get_excerpt($comment->value, 150); - echo "
"; + echo "
"; echo "" . $comment_owner->name . ' ' . parse_urls($contents) . ''; - echo "" . elgg_view_friendly_time($comment->time_created) . ""; + echo "" . elgg_view_friendly_time($comment->time_created) . ""; echo "
"; $counter++; } - // close comments_list, comments_container and river_comments - echo '
' . elgg_make_river_comment($object) . '
'; + // close comments_list, comments_container and river-comments + echo '
' . elgg_make_river-comment($object) . '
'; } else { // tab bar nav - for users that liked object if ($vars['item']->type != 'user' && $likes_count != 0) { - echo "
"; + echo "
"; } if ($likes_count != 0) { @@ -123,15 +123,15 @@ if ($comments){ } if ($vars['item']->type != 'user' && $likes_count != 0) { - echo "
"; // close river_comments_tabs + echo "
"; // close river-comments-tabs } if ($vars['item']->type != 'user') { - echo "
"; + echo "
"; } if ($likes_count != 0) { //show the users who liked the object - echo ""; diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php index 60568642a..58fe938f4 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper_classic.php +++ b/mod/riverdashboard/views/default/river/item/wrapper_classic.php @@ -6,13 +6,13 @@ * @package Elgg */ ?> -
- +
+ get_entity($vars['item']->subject_guid), 'size' => 'small')); ?> -
+
-- cgit v1.2.3