diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/css/screen.php | 4 | ||||
| -rw-r--r-- | views/default/river/annotation/generic_comment/create.php | 24 | ||||
| -rw-r--r-- | views/default/river/relationship/friend/create.php | 8 |
3 files changed, 14 insertions, 22 deletions
diff --git a/views/default/css/screen.php b/views/default/css/screen.php index 6b576f7d3..e75fea1ec 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -246,14 +246,14 @@ a.widget-edit-button:hover, a.widget-delete-button:hover { font-style: italic; line-height: 1.2em; } -.elgg-river-excerpt { +.elgg-river-content { border-left: 1px solid #CCCCCC; font-size: 85%; line-height: 1.5em; margin: 8px 0 5px 0; padding-left: 5px; } -.elgg-river-excerpt .usericon { +.elgg-river-content .usericon { float: left; } .elgg-river-layout .input-pulldown { diff --git a/views/default/river/annotation/generic_comment/create.php b/views/default/river/annotation/generic_comment/create.php index 5198a98a8..aabb6a9c6 100644 --- a/views/default/river/annotation/generic_comment/create.php +++ b/views/default/river/annotation/generic_comment/create.php @@ -10,7 +10,11 @@ $title = $object->title; if (!$title) { $title = elgg_echo('untitled'); } -$object_link = "<a href=\"{$object->getURL()}\">$title</a>"; +$params = array( + 'href' => $object->getURL(), + 'text' => $title, +); +$object_link = elgg_view('output/url', $params); $type = $object->getType(); $subtype = $object->getSubtype(); @@ -20,23 +24,7 @@ echo elgg_echo('river:generic_comment', array($type_string, $object_link)); if ($comment) { $excerpt = elgg_get_excerpt($comment->value); - echo '<div class="elgg-river-excerpt">'; + echo '<div class="elgg-river-content">'; echo $excerpt; echo '</div>'; } - -/* -$string = elgg_echo("river:posted:generic", array($url)) . " "; -$string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a>"; -$string .= "</span>"; -if (elgg_get_context() != 'riverdashboard') { - $comment = elgg_get_excerpt($comment, 200); - if ($comment) { - $string .= "<div class='river_content_display'>"; - $string .= $comment; - $string .= "</div>"; - } -} -echo $string; - * - */
\ No newline at end of file diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php index 80c567795..1e6514b4a 100644 --- a/views/default/river/relationship/friend/create.php +++ b/views/default/river/relationship/friend/create.php @@ -5,13 +5,17 @@ $subject = $vars['item']->getSubjectEntity(); $object = $vars['item']->getObjectEntity(); -$object_link = "<a href=\"{$object->getURL()}\">$object->name</a>"; +$params = array( + 'href' => $object->getURL(), + 'text' => $object->name, +); +$object_link = elgg_view('output/url', $params); $subject_icon = elgg_view("profile/icon", array('entity' => $subject, 'size' => 'tiny')); $object_icon = elgg_view("profile/icon", array('entity' => $object, 'size' => 'tiny')); echo elgg_echo("friends:river:add", array($object_link)); -echo '<div class="elgg-river-excerpt">'; +echo '<div class="elgg-river-content clearfix">'; echo $subject_icon; echo '<span class="elgg-icon elgg-icon-following"></span>'; echo $object_icon; |