Merged 18_new_admin branch to trunk.

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

4 files changed, 41 insertions, 44 deletions

diff --git a/mod/categories/views/default/categories/css.php b/mod/categories/views/default/categories/css.php
index d2cf5a8a8..6dfe60047 100644
--- a/mod/categories/views/default/categories/css.php
+++ b/mod/categories/views/default/categories/css.php
@@ -1,11 +1,11 @@
 <?php
-	/**
-	 * Categories CSS extender
-	 * 
-	 * @package Elgg File Repository
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
+/**
+ * Categories CSS extender
+ *
+ * @package Categories
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 ?>
 
 .categories .input-checkboxes {
@@ -25,13 +25,13 @@
 }
 #two_column_left_sidebar_maincontent .contentWrapper .categories {
 	border:1px solid #CCCCCC;
-	-webkit-border-radius: 4px; 
+	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	padding:5px;
-	margin:0 0 15px 0;	
+	margin:0 0 15px 0;
 }
 #two_column_left_sidebar_maincontent .contentWrapper .categories p {
-	margin:0;	
+	margin:0;
 }
 #two_column_left_sidebar_maincontent .contentWrapper .blog_post .categories {
 	border:none;
@@ -41,10 +41,10 @@
 
 #two_column_left_sidebar .blog_categories {
 	background:white;
-	-webkit-border-radius: 8px; 
+	-webkit-border-radius: 8px;
 	-moz-border-radius: 8px;
-    padding:10px;
-    margin:0 10px 10px 10px;
+	padding:10px;
+	margin:0 10px 10px 10px;
 }
 #two_column_left_sidebar .blog_categories h2 {
 	background:none;
diff --git a/mod/categories/views/default/categories/settings.php b/mod/categories/views/default/categories/settings.php
deleted file mode 100644
index 7f38b6579..000000000
--- a/mod/categories/views/default/categories/settings.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-echo elgg_view_title(elgg_echo('categories:settings'));
-
-?>
-
-<div class="contentWrapper">
-	<p>
-		<?php echo elgg_echo('categories:explanation'); ?>
-	</p>
-
-
-	<?php
-
-	echo elgg_view('input/form', array(
-							'action' => $vars['url'] . 'action/categories/save',
-							'method' => 'post',
-							'body' => elgg_view('categories/settingsform',$vars)
-							)
-					);
-
-	?>
-
-</div>
\ No newline at end of file
diff --git a/mod/categories/views/default/categories/settingsform.php b/mod/categories/views/default/categories/settingsform.php
deleted file mode 100644
index 044f01dcd..000000000
--- a/mod/categories/views/default/categories/settingsform.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-	echo elgg_view('input/tags',array('value' => $vars['categories'],
-									  'internalname' => 'categories'));
-
-?>
-	<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
\ No newline at end of file
diff --git a/mod/categories/views/default/settings/categories/edit.php b/mod/categories/views/default/settings/categories/edit.php
new file mode 100644
index 000000000..3742fd1e6
--- /dev/null
+++ b/mod/categories/views/default/settings/categories/edit.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg categories plugin settings page
+ *
+ * @package ElggCategories
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+// Get site and categories
+$site = $CONFIG->site;
+$categories = $site->categories;
+
+if (empty($categories)) {
+	$categories = array();
+}
+
+?>
+<div class="contentWrapper">
+	<p>
+		<?php echo elgg_echo('categories:explanation'); ?>
+	</p>
+	<?php
+		echo elgg_view('input/tags', array('value' => $categories, 'internalname' => 'categories'));
+	?>
+</div>
\ No newline at end of file