aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/default/css.php4
-rw-r--r--views/default/river/item/wrapper.php41
2 files changed, 38 insertions, 7 deletions
diff --git a/views/default/css.php b/views/default/css.php
index a6f705a69..2554073ec 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1161,6 +1161,10 @@ p.user_menu_friends_of {
font-size:90%;
color:#666666;
}
+.river_item .river_item_useravatar {
+ float:left;
+ margin:0 5px 0 0;
+}
/* IE6 fix */
* html .river_item p {
padding:3px 0 3px 20px;
diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php
index 2b146c3c5..c8d18e9dd 100644
--- a/views/default/river/item/wrapper.php
+++ b/views/default/river/item/wrapper.php
@@ -11,6 +11,12 @@
* @link http://elgg.com/
*/
+ //get the site admins choice avatars or action icons
+ $avatar_icon = get_plugin_setting("avatar_icon","riverdashboard");
+ if(!$avatar_icon)
+ $avatar_icon = "icon";
+
+ if($avatar_icon == "icon"){
?>
@@ -21,15 +27,11 @@
<div class="river_<?php echo $vars['item']->type; ?>_<?php if($vars['item']->subtype) echo $vars['item']->subtype . "_"; ?><?php echo $vars['item']->action_type; ?>">
<p>
<?php
-
- echo $vars['body'];
-
+ echo $vars['body'];
?>
<span class="river_item_time">
(<?php
-
- echo friendly_time($vars['item']->posted);
-
+ echo friendly_time($vars['item']->posted);
?>)
</span>
</p>
@@ -37,4 +39,29 @@
</div>
</div>
</div>
- </div> \ No newline at end of file
+ </div>
+
+<?php
+ }else{
+?>
+ <div class="river_item">
+ <span class="river_item_useravatar">
+ <?php
+ echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'tiny'));
+ ?>
+ </span>
+ <p class="river_item_body">
+ <?php
+ echo $vars['body'];
+ ?>
+ <span class="river_item_time">
+ (<?php
+ echo friendly_time($vars['item']->posted);
+ ?>)
+ </span>
+ </p>
+ <div class="clearfloat"></div>
+ </div>
+<?php
+ }
+?> \ No newline at end of file