Removed toggle for overriding river dashboard. If the plugin is enabled, the dashboa...

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

diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
index c57d88d80233b581d06799b65d3ba6a42d764892..b95c2654d5191928c39cc2d46e87eaf885ba83e0 100644 (file)
--- a/mod/riverdashboard/start.php
+++ b/mod/riverdashboard/start.php
@@ -8,12 +8,9 @@
 function riverdashboard_init() {
        global $CONFIG;
        // Register and optionally replace the dashboard
-       if (get_plugin_setting('useasdashboard', 'riverdashboard') == 'yes') {
-               register_page_handler('dashboard','riverdashboard_page_handler');
-       } else {
-               // Activity main menu
-               add_menu(elgg_echo('activity'), $CONFIG->wwwroot . "mod/riverdashboard/");
-       }
+       register_page_handler('dashboard','riverdashboard_page_handler');
+       add_menu(elgg_echo('activity'), $CONFIG->wwwroot . "mod/riverdashboard/");
+
        // Page handler
        register_page_handler('riverdashboard','riverdashboard_page_handler');
        elgg_extend_view('css','riverdashboard/css');
@@ -75,4 +72,4 @@ function riverdashboard_ecml_keywords_hook($hook, $type, $value, $params) {
        return $value;
 }
 
-register_elgg_event_handler('init', 'system', 'riverdashboard_init');
\ No newline at end of file
+register_elgg_event_handler('init', 'system', 'riverdashboard_init');

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 1a581f9..0000000
--- a/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-?>
-<p>
-       <?php echo elgg_echo('riverdashboard:useasdashboard'); ?>
-       <select name="params[useasdashboard]">
-               <option value="yes" <?php if ($vars['entity']->useasdashboard == 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:yes'); ?></option>
-               <option value="no" <?php if ($vars['entity']->useasdashboard != 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:no'); ?></option>
-       </select>
-</p>
\ No newline at end of file