From ff31226fdeb972aac2f37f0098240cb366a9bb26 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 5 May 2010 19:14:48 +0000
Subject: Merged 18_new_admin branch to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/manifest.xml                      | 16 +++++++++-------
 mod/blog/views/default/blog/forms/edit.php |  6 ++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'mod/blog')

diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index 483e83fab..d88eaa994 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-		<field key="author" value="Curverider" />
-		<field key="version" value="1.8" />
-		<field key="description" value="Elgg blog plugin" />
-		<field key="website" value="http://www.elgg.org/" />
-		<field key="copyright" value="(C) Curverider 2008-2010" />
-		<field key="licence" value="GNU Public License version 2" />
-		<field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.8" />
+	<field key="description" value="Elgg blog plugin" />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index bb900e311..2b3366e48 100644
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -147,6 +147,8 @@ $publish_date_input = elgg_view('input/datetime', array(
 	'value' => $values['publish_date']
 ));
 
+$categories_input = elgg_view('categories', $vars);
+
 // hidden inputs
 //$container_guid_input = elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $values['container_guid']));
 $guid_input = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $values['guid']));
@@ -202,13 +204,13 @@ $body_input
 	$access_input
 </p>
 
-
-
 <p>
 	<label for="blog_status">$status_label</label>
 	$status_input
 </p>
 
+$categories_input
+
 $guid_input
 $container_guid_input
 $forward_input
-- 
cgit v1.2.3