let site admins toggle between a classic activity stream or the new clustered version

git-svn-id: http://code.elgg.org/elgg/trunk@5826 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/river2.php b/engine/lib/river2.php
index 3d826f517efeabd7703f496e285ba7fd72fd66a3..8e015ea0dbcef03665eaee434ff468a4644756c0 100644 (file)
--- a/engine/lib/river2.php
+++ b/engine/lib/river2.php
@@ -383,10 +383,17 @@ function elgg_view_river_item($item) {
                                ));
                        }
                }
-               return elgg_view('river/item/wrapper',array(
-                       'item' => $item,
-                       'body' => $body
-               ));
+               if (get_plugin_setting('activitytype', 'riverdashboard') == 'classic'){
+                       return elgg_view('river/item/wrapper_classic',array(
+                               'item' => $item,
+                               'body' => $body
+                       ));
+               }else{
+                       return elgg_view('river/item/wrapper',array(
+                               'item' => $item,
+                               'body' => $body
+                       ));
+               }
        }
        return false;
 }

diff --git a/mod/profile/views/default/profile/profile_contents/activity.php b/mod/profile/views/default/profile/profile_contents/activity.php
index 0184816e0a5188ce764dd7f0968f4f5dbe713518..a9b8cce8cbba9ae4d5ef961052a3a22e56b4f1a7 100755 (executable)
--- a/mod/profile/views/default/profile/profile_contents/activity.php
+++ b/mod/profile/views/default/profile/profile_contents/activity.php
@@ -16,8 +16,11 @@
                echo elgg_view("profile/status", array("entity" => $vars['entity']));
        }
        if(is_plugin_enabled('riverdashboard')) {
-               // users last 10 activites
-               echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,false);
+               //select the correct river
+               if (get_plugin_setting('activitytype', 'riverdashboard') == 'classic')
+                       echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,true);
+               else
+                       echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,false);
        } else {
                echo "Riverdashboard not loaded";
        }

diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index e025850eab3962994d309a682bb18b2c3dbf8faf..758aa4018935e7466d0d99103c2030ba6a8247f4 100644 (file)
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -41,7 +41,12 @@ switch($orient) {
 
 $title = elgg_view_title($title_wording);
 
-$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, true, false)  . "</div>";
+//select the correct river
+if (get_plugin_setting('activitytype', 'riverdashboard') == 'classic')
+       $river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, true, true)  . "</div>";
+else
+       $river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, true, false)  . "</div>";
+
 // Replacing callback calls in the nav with something meaningless
 $river = str_replace('callback=true','replaced=88,334',$river);
                

diff --git a/mod/riverdashboard/languages/en.php b/mod/riverdashboard/languages/en.php
index 1a3c96f2bc369524cd4ca6f257311fe4deedd4cf..558ac7e5d06ccc6133fba222ef2bda13ea1d0d4c 100644 (file)
--- a/mod/riverdashboard/languages/en.php
+++ b/mod/riverdashboard/languages/en.php
@@ -22,6 +22,9 @@ $english = array(
        'river:all' => "All activity",
        'river:mine' => "My activity",
        'river:friends' => "Friends' activity",
+       'river:classic' => 'Classic',
+       'river:clustered' => 'Clustered',
+       'river:type' => 'Would you like the activity stream to be in classic format (chronological) or clustered?',
        'river:widget:description' => "Show your latest activity.",
        'river:widget:title:friends' => "Friends' activity",
        'river:widget:description:friends' => "Show what your friends are up to.",

diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
new file mode 100644 (file)
index 0000000..abbed46
--- /dev/null
+++ b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
@@ -0,0 +1,22 @@
+<?php\r
+/**\r
+ * Elgg river item wrapper.\r
+ * Wraps all river items.\r
+ *\r
+ * @package Elgg\r
+ * @author Curverider\r
+ * @link http://elgg.com/\r
+ */\r
+?>\r
+<div class="river_item riverdashboard">\r
+               <span class="river_item_useravatar">\r
+                       <?php\r
+                               echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));\r
+                       ?>\r
+               </span>\r
+               <div class="river_item_contents clearfloat">\r
+                       <?php\r
+                               echo $vars['body'];\r
+                       ?>\r
+               </div>\r
+</div>
\ No newline at end of file

diff --git a/mod/riverdashboard/views/default/settings/riverdashboard/edit.php b/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
new file mode 100644 (file)
index 0000000..30cfaba
--- /dev/null
+++ b/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
@@ -0,0 +1,9 @@
+<?php\r
+?>\r
+<p>\r
+       <?php echo elgg_echo('river:type'); ?>\r
+       <select name="params[activitytype]">\r
+               <option value="classic" <?php if ($vars['entity']->activitytype == 'classic') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('river:classic'); ?></option>\r
+               <option value="clustered" <?php if ($vars['entity']->activitytype == 'clustered') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('river:clustered'); ?></option>\r
+       </select>\r
+</p>
\ No newline at end of file