Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

activity display toggle so site admins can choose avatars or the smal…

…l icons

git-svn-id: https://code.elgg.org/elgg/trunk@3461 36083f99-b078-4883-b0ff-0f9b5a30f544
  • Loading branch information...
commit b405f7f30fb3cee2d00b20972a7da910a7947e04 1 parent 358e114
dave authored
Showing with 38 additions and 7 deletions.
  1. +4 −0 views/default/css.php
  2. +34 −7 views/default/river/item/wrapper.php
View
4 views/default/css.php
@@ -1161,6 +1161,10 @@
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;
View
41 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>
+ </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
+ }
+?>
Please sign in to comment.
Something went wrong with that request. Please try again.