activity type toggle removed as it was poorly thought out and implemented.

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

diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index 61142f300e02c27fdc8f4f731fed9983ad00389b..4f13e323ee144a04ca68814368cae8c06cd463bc 100644 (file)
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -44,12 +44,7 @@ switch($orient) {
 
 $title = elgg_view_title($title_wording);
 
-//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);
-} else {
-       $river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, true, false);
-}
+$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, true, false);
 
 // Replacing callback calls in the nav with something meaningless
 $river = str_replace('callback=true','replaced=88,334',$river);

diff --git a/mod/riverdashboard/views/default/settings/riverdashboard/edit.php b/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
deleted file mode 100644 (file)
index 281ac2f..0000000
--- a/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
+++ /dev/null
@@ -1,8 +0,0 @@
-\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