aboutsummaryrefslogtreecommitdiff
path: root/mod/categories
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-06-18 19:56:33 -0400
committerBrett Profitt <brett.profitt@gmail.com>2011-06-18 19:56:33 -0400
commitec7b94a64aef23b85866ecdac8e8acc712d29bb6 (patch)
treea108205c3fa0b694d8ce0ebaafd259480d6b530a /mod/categories
parentc80ba5aa03264dd64c20ed8ae222e87f9371a44d (diff)
parent2b68a4d217c35a5587c462620789493cf2804ba2 (diff)
downloadelgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.gz
elgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'mod/categories')
-rw-r--r--mod/categories/manifest.xml1
-rw-r--r--mod/categories/views/default/settings/categories/edit.php9
2 files changed, 6 insertions, 4 deletions
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index 43df13d02..15d7192c1 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -4,6 +4,7 @@
<author>Core developers</author>
<version>1.8</version>
<category>bundled</category>
+ <category>enhancement</category>
<blurb>Add site-wide categories</blurb>
<description>Site-wide Categories lets administrators define categories that users across the site can add content to.</description>
<website>http://www.elgg.org/</website>
diff --git a/mod/categories/views/default/settings/categories/edit.php b/mod/categories/views/default/settings/categories/edit.php
index 583292e72..3802da95a 100644
--- a/mod/categories/views/default/settings/categories/edit.php
+++ b/mod/categories/views/default/settings/categories/edit.php
@@ -14,8 +14,9 @@ if (empty($categories)) {
}
?>
-<p>
- <?php echo elgg_echo('categories:explanation'); ?>
-</p>
+<div>
+ <p><?php echo elgg_echo('categories:explanation'); ?></p>
<?php
-echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories'));
+ echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories'));
+?>
+</div> \ No newline at end of file