From 556ca4a3f628fb9c6060c11cee8cb3cd332740d2 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 20 Apr 2010 22:06:07 +0000
Subject: Removed toggle for overriding river dashboard.  If the plugin is
 enabled, the dashboard is enabled.

git-svn-id: http://code.elgg.org/elgg/trunk@5821 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/riverdashboard/start.php                                  | 11 ++++-------
 .../views/default/settings/riverdashboard/edit.php            |  9 ---------
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 mod/riverdashboard/views/default/settings/riverdashboard/edit.php

(limited to 'mod')

diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
index c57d88d80..b95c2654d 100644
--- 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
index 1a581f96b..000000000
--- 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
-- 
cgit v1.2.3