diff options
| author | Evan Winslow <evan@elgg.org> | 2011-06-08 02:31:30 -0700 |
|---|---|---|
| committer | Evan Winslow <evan@elgg.org> | 2011-06-08 02:31:30 -0700 |
| commit | 1fd8bd6e296e2b1fc960fde1dd204b6c4e3e8aec (patch) | |
| tree | 36da4522942dd749e82e9f33c0213cbedbb3d5f2 /mod/pages | |
| parent | 8ddeb1f6e37dc1647e9bee4f3cfe35adcb2ca004 (diff) | |
| download | elgg-1fd8bd6e296e2b1fc960fde1dd204b6c4e3e8aec.tar.gz elgg-1fd8bd6e296e2b1fc960fde1dd204b6c4e3e8aec.tar.bz2 | |
River revamp for 1.8
Diffstat (limited to 'mod/pages')
| -rw-r--r-- | mod/pages/languages/en.php | 13 | ||||
| -rw-r--r-- | mod/pages/views/default/river/object/page/create.php | 30 |
2 files changed, 10 insertions, 33 deletions
diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php index f590afb9c..1c6d0318c 100644 --- a/mod/pages/languages/en.php +++ b/mod/pages/languages/en.php @@ -38,13 +38,12 @@ $english = array( * River **/ - 'pages:river:create' => 'created the page', - 'pages:river:created' => "%s wrote", - 'pages:river:updated' => "%s updated", - 'pages:river:posted' => "%s posted", - 'pages:river:update' => "a page titled", - 'river:commented:object:page' => 'the page', - 'river:commented:object:page_top' => 'the page', + 'river:create:object:page' => '%s created a page %s', + 'river:create:object:page_top' => '%s created a page %s', + 'river:update:object:page' => '%s updated a page %s', + 'river:update:object:page_top' => '%s updated a page %s', + 'river:comment:object:page' => '%s commented on a page titled %s', + 'river:comment:object:page_top' => '%s commented on a page titled %s', /** * Form fields diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php index 032046063..ca15ddea7 100644 --- a/mod/pages/views/default/river/object/page/create.php +++ b/mod/pages/views/default/river/object/page/create.php @@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity(); $excerpt = strip_tags($object->description); $excerpt = elgg_get_excerpt($excerpt); -$params = array( - 'href' => $object->getURL(), - 'text' => $object->title, -); -$link = elgg_view('output/url', $params); - -$group_string = ''; -$container = $object->getContainerEntity(); -if ($container instanceof ElggGroup) { - $params = array( - 'href' => $container->getURL(), - 'text' => $container->name, - ); - $group_link = elgg_view('output/url', $params); - $group_string = elgg_echo('river:ingroup', array($group_link)); -} - -echo elgg_echo('pages:river:create'); - -echo " $link $group_string"; - -if ($excerpt) { - echo '<div class="elgg-river-content">'; - echo $excerpt; - echo '</div>'; -} +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'message' => $excerpt, +));
\ No newline at end of file |