Refs #2104 added some categories to core (bundled) plugins

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

diff --git a/documentation/examples/plugins/manifest.xml b/documentation/examples/plugins/manifest.xml
index 0f7823442401eca144addc467dc6c8625ac162c0..1602a735821adb701343918db51b1cb705743845 100644 (file)
--- a/documentation/examples/plugins/manifest.xml
+++ b/documentation/examples/plugins/manifest.xml
@@ -29,8 +29,8 @@
                <path>graphics/plugin_ss2.png</path>
        </screenshot>
 
-       <category>Admin</category>
-       <category>ServiceAPI</category>
+       <category>admin</category>
+       <category>api</category>
 
        <on_enable>setup_function</on_enable>
        <on_disable>teardown_function</on_disable>

diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index b241d2651ac90e49a18e3c906ded8800ee9ca94b..4d853a9aab265ada9160bee5aa969845c3a1d455 100644 (file)
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -3,6 +3,8 @@
        <name>Blog</name>
        <author>Core developers</author>
        <version>1.8</version>
+       <category>bundled</category>
+       <category>content</category>
        <blurb>Blog plugin</blurb>
        <description>Adds simple blogging capabilities to your Elgg installation.</description>
        <website>http://elgg.org/</website>
@@ -14,5 +16,5 @@
        </requires>
        <admin_interface>simple</admin_interface>
        <activate_on_install>true</activate_on_install>
-               <on_activate>blog_on_activate</on_activate>
+       <on_activate>blog_on_activate</on_activate>
 </plugin_manifest>

diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 62fb61b1e89c4ceb2141489d23002aac161c8653..88921dccec2cc3f1ec16fe69b0b8b95274e0f182 100644 (file)
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -3,6 +3,8 @@
        <name>Bookmarks</name>
        <author>Core developers</author>
        <version>1.8</version>
+       <category>bundled</category>
+       <category>content</category>
        <blurb>Add and comment on bookmarks.</blurb>
        <description>Adds the ability for users to bookmark internal and external sites.  Other users can then comment on the bookmarks.</description>
        <website>http://www.elgg.org/</website>

diff --git a/mod/developers/manifest.xml b/mod/developers/manifest.xml
index f6fb4b38afd40246773b7e6b60445d3e9e0c8990..850e6009c779e6af523acc2c855e9b6d2ce9b871 100644 (file)
--- a/mod/developers/manifest.xml
+++ b/mod/developers/manifest.xml
@@ -3,6 +3,7 @@
        <name>Elgg Developer Tools</name>
        <author>Core developers</author>
        <version>1.0</version>
+       <category>development</category>
        <blurb>Developer tools</blurb>
        <description>A set of tools for writing plugins and themes.</description>
        <website>http://www.elgg.org/</website>
@@ -14,7 +15,6 @@
                <version>2009030802</version>
        </requires>
 
-       <category>Development</category>
        <admin_interface>advanced</admin_interface>
 
 </plugin_manifest>

diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 51222ca9421979b732a4d123cb2bcf631cffb904..966aa11953c856007f9596394419d4286d1e0822 100644 (file)
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -3,6 +3,8 @@
        <name>File</name>
        <author>Core developers</author>
        <version>1.8</version>
+       <category>bundled</category>
+       <category>content</category>
        <description>File browser plugin</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
@@ -12,4 +14,5 @@
                <version>2010030101</version>
        </requires>
        <admin_interface>simple</admin_interface>
+       <activate_on_install>true</activate_on_install>
 </plugin_manifest>

diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index e19ed4de736dbe36d1bacd2e8e5f4c0f7be37dcc..e5e23f546c6d453ab2d5100f7e0d6c79199e3f4d 100644 (file)
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -3,6 +3,8 @@
        <name>Pages</name>
        <author>Core developers</author>
        <version>1.8</version>
+       <category>bundled</category>
+       <category>content</category>
        <description>Elgg Pages</description>
        <website>http://www.elgg.org</website>
        <copyright>See COPYRIGHT.txt</copyright>
@@ -12,4 +14,5 @@
                <version>2010030101</version>
        </requires>
        <admin_interface>simple</admin_interface>
+       <activate_on_install>true</activate_on_install>
 </plugin_manifest>

diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml
index cffd611dfc77b29557ea1d51ee62b636c23f701c..d811e373bd1ef6960183d0b89ab4920dbcfe4aed 100644 (file)
--- a/mod/profile/manifest.xml
+++ b/mod/profile/manifest.xml
@@ -2,7 +2,7 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
        <name>Profile</name>
        <description>The default profile plugin.</description>
-       <author>Elgg.org</author>
+       <author>Core developers</author>
        <version>1.8</version>
        <category>bundled</category>
        <category>social</category>
@@ -11,7 +11,6 @@
        <license>GNU Public License Version 2</license>
        <activate_on_install>true</activate_on_install>
        <admin_interface>advanced</admin_interface>
-
        <requires>
                <type>elgg_version</type>
                <version>2011010401</version>

diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml
index a219fce7fadd6e0c6e84e20dc14976efc9c6d296..c51134608d31748a75f7c92e251ffcad0a82101e 100644 (file)
--- a/mod/reportedcontent/manifest.xml
+++ b/mod/reportedcontent/manifest.xml
@@ -2,7 +2,8 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
        <name>Reported Content</name>
        <author>Core developers</author>
-       <version>1.7</version>
+       <version>1.8</version>
+       <category>bundled</category>
        <description>Adds the option for users to report content and for admins to check it out.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>

diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml
index 68a534037fab253a6ba65983e11a5929b92c9f8f..053e22178e5d8c5f07632b3172d1ab0ed9a7d4c1 100644 (file)
--- a/mod/search/manifest.xml
+++ b/mod/search/manifest.xml
@@ -3,6 +3,7 @@
        <name>Search</name>
        <author>The MITRE Corporation, Core developers</author>
        <version>1.8</version>
+       <category>bundled</category>
        <description>Allow search across entities of the site</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>

diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index b059f6a98e17c63fe1cdfceeb55f7dbe4b9a0748..8ca4d10ea58e5b8e19d24d30a91a0f8b68c0fff8 100644 (file)
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -3,6 +3,7 @@
        <name>Tag Cloud</name>
        <author>Cash Costello</author>
        <version>1.0</version>
+       <category>bundled</category>
        <description>Widget-based tag clouds.</description>
        <website>http://cashcostello.com/</website>
        <copyright>See COPYRIGHT.txt</copyright>
@@ -11,5 +12,5 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>     
+       <admin_interface>advanced</admin_interface>
 </plugin_manifest>

diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
index 87a0443640dc982964ebfcf72d29f50e561a30c8..27dd5732d69b5af930b7e511f742b3790a5e1704 100644 (file)
--- a/mod/thewire/manifest.xml
+++ b/mod/thewire/manifest.xml
@@ -3,6 +3,8 @@
        <name>The Wire</name>
        <author>JHU/APL and core developers</author>
        <version>1.8</version>
+       <category>bundled</category>
+       <category>content</category>
        <description>Microblogging for Elgg</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
@@ -12,4 +14,5 @@
                <version>2010030101</version>
        </requires>
        <admin_interface>simple</admin_interface>
+       <activate_on_install>true</activate_on_install>
 </plugin_manifest>

diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index 1c5cd5a486ade3acb42f14ccb31792c3f63b6a1e..a3df59e3db17b666052d15cbd930bbaeb8647030 100644 (file)
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -3,6 +3,8 @@
        <name>TinyMCE</name>
        <author>Core developers</author>
        <version>1.8</version>
+       <category>bundled</category>
+       <category>extension</category>
        <description>TinyMCE plugin.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>

diff --git a/mod/twitterservice/manifest.xml b/mod/twitterservice/manifest.xml
index 0b9311caef023211f142c065f0e7a96717794969..b3336dbda8a88d5a2ed73d8b47f145da1cf83c7b 100644 (file)
--- a/mod/twitterservice/manifest.xml
+++ b/mod/twitterservice/manifest.xml
@@ -5,7 +5,7 @@
        <version>1.8</version>
        <description>Allows users to authenticate their Elgg account with Twitter.</description>
        <category>service</category>
-       <category>official</category>
+       <category>bundled</category>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU Public License version 2</license>

diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 65052bb1721559cacbc6d851d5fbcefd1ef77e81..5fffb0d2b5fc638009a650b2a6a5f76949597e69 100644 (file)
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -2,7 +2,8 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
        <name>User Validation by Email</name>
        <author>Core developers</author>
-       <version>1.7</version>
+       <version>1.8</version>
+       <category>bundled</category>
        <description>Simple user account validation via email.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>

diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 8401ffef1a5b48738d4075b0a7b94c4c25c3a012..0384df7436fc6ceb12c3b8c66cc1f3ec0c0d2e8e 100644 (file)
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -3,6 +3,8 @@
        <name>Zaudio</name>
        <author>Core developers</author>
        <version>1.8</version>
+       <category>bundled</category>
+       <category>extension</category>
        <description>This simple plugin lets users play mp3's in the page.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>

diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 229c21f963cedee80af51eef603ac89c44ae0304..ce465113fd5af573af223af21ad94b41fabcdd98 100644 (file)
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -53,7 +53,10 @@ $category_button = elgg_view('input/submit', array(
 ));
 
 $category_form = elgg_view('input/form', array(
-       'body' => $category_dropdown . $category_button
+       'body' => $category_dropdown . $category_button,
+       'method' => 'get',
+       'action' => 'pg/admin/plugins/advanced',
+       'disable_security' => true,
 ));
 
 // @todo Until "en/deactivate all" means "All plugins on this page" hide when not looking at all.