diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-19 18:37:28 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-19 18:37:28 +0000 |
| commit | 4a4c45645fcbfa2c0281aebe1936429a7b2c5bfe (patch) | |
| tree | 7ba3dd29314edabc246d7aef7a04d231cac26775 | |
| parent | 2f9b58a8ee6f4a303979d30ac3931a98768266fe (diff) | |
| download | elgg-4a4c45645fcbfa2c0281aebe1936429a7b2c5bfe.tar.gz elgg-4a4c45645fcbfa2c0281aebe1936429a7b2c5bfe.tar.bz2 | |
Minor improvement to previous - river items now are wrapped in a number of divs that make sense according to what they refer to
git-svn-id: https://code.elgg.org/elgg/trunk@1006 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/river.php | 5 | ||||
| -rw-r--r-- | views/default/river/wrapper.php | 38 |
2 files changed, 29 insertions, 14 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php index fbafa44d7..174b358ab 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -90,7 +90,10 @@ ));
if (!empty($tam)) {
- $tam = elgg_view("river/wrapper",array('entry' => $tam, 'log' => $log));
+ $tam = elgg_view("river/wrapper",array(
+ 'entry' => $tam,
+ 'log' => $log,
+ 'object' => $object));
} if ($tam) diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php index 804f4a198..957cbcc78 100644 --- a/views/default/river/wrapper.php +++ b/views/default/river/wrapper.php @@ -11,23 +11,35 @@ * @link http://elgg.com/
*/
+ if (isset($vars['object']) && $vars['object'] instanceof ElggEntity) {
+
+ $subtype = $vars['object']->subtype;
+ if (empty($subtype)) $subtype = $vars['object']->type;
+ if (empty($subtype)) $subtype = "general";
+
+ }
+
?>
<div class="river_item">
- <p class="river_<?php echo $vars['log']->object_class; ?>_<?php echo $vars['log']->event; ?>">
- <?php
-
- echo $vars['entry'];
+ <div class="river_<?php echo $subtype; ?>">
+ <div class="river_<?php echo $vars['log']->event; ?>">
+ <p class="river_<?php echo $subtype; ?>_<?php echo $vars['log']->event; ?>">
+ <?php
- ?>
- <span class="river_item_time">
- (<?php
-
- echo friendly_time($vars['log']->time_created);
-
- ?>)
- </span>
- </p>
+ echo $vars['entry'];
+
+ ?>
+ <span class="river_item_time">
+ (<?php
+
+ echo friendly_time($vars['log']->time_created);
+
+ ?>)
+ </span>
+ </p>
+ </div>
+ </div>
</div>
\ No newline at end of file |