diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-19 18:32:35 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-19 18:32:35 +0000 |
| commit | dd10d397db7725f87cac92ddfb862ae13b2388cb (patch) | |
| tree | 05074747939c2040a24e44a1315ab25b7d39af43 | |
| parent | 33bd12ba604a9345974da3097c3a960b9597003f (diff) | |
| download | elgg-dd10d397db7725f87cac92ddfb862ae13b2388cb.tar.gz elgg-dd10d397db7725f87cac92ddfb862ae13b2388cb.tar.bz2 | |
Modified river functions to use a common wrapper
git-svn-id: https://code.elgg.org/elgg/trunk@1004 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/river.php | 6 | ||||
| -rw-r--r-- | mod/profile/views/default/river/ElggUser/update.php | 4 | ||||
| -rw-r--r-- | views/default/river/wrapper.php | 33 |
3 files changed, 39 insertions, 4 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php index 7461a4f60..fbafa44d7 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -87,7 +87,11 @@ 'performed_by' => $by_user_obj, 'log_entry' => $log, 'object' => $object - )); + ));
+
+ if (!empty($tam)) {
+ $tam = elgg_view("river/wrapper",array('entry' => $tam, 'log' => $log));
+ } if ($tam) { diff --git a/mod/profile/views/default/river/ElggUser/update.php b/mod/profile/views/default/river/ElggUser/update.php index f518ef2c8..c9b710512 100644 --- a/mod/profile/views/default/river/ElggUser/update.php +++ b/mod/profile/views/default/river/ElggUser/update.php @@ -7,6 +7,4 @@ ?>
-<p class="river_profile_update">
- <?php echo $string; ?>
-</p>
\ No newline at end of file +<?php echo $string; ?>
\ No newline at end of file diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php new file mode 100644 index 000000000..804f4a198 --- /dev/null +++ b/views/default/river/wrapper.php @@ -0,0 +1,33 @@ +<?php
+
+ /**
+ * Elgg river item wrapper.
+ * Wraps all river items.
+ *
+ * @package Elgg
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.com/
+ */
+
+?>
+
+<div class="river_item">
+
+ <p class="river_<?php echo $vars['log']->object_class; ?>_<?php echo $vars['log']->event; ?>">
+ <?php
+
+ echo $vars['entry'];
+
+ ?>
+ <span class="river_item_time">
+ (<?php
+
+ echo friendly_time($vars['log']->time_created);
+
+ ?>)
+ </span>
+ </p>
+
+</div>
\ No newline at end of file |