diff options
-rw-r--r-- | documentation/examples/plugins/manifest.xml | 4 | ||||
-rw-r--r-- | mod/blog/manifest.xml | 4 | ||||
-rw-r--r-- | mod/bookmarks/manifest.xml | 2 | ||||
-rw-r--r-- | mod/developers/manifest.xml | 2 | ||||
-rw-r--r-- | mod/file/manifest.xml | 3 | ||||
-rw-r--r-- | mod/pages/manifest.xml | 3 | ||||
-rw-r--r-- | mod/profile/manifest.xml | 3 | ||||
-rw-r--r-- | mod/reportedcontent/manifest.xml | 3 | ||||
-rw-r--r-- | mod/search/manifest.xml | 1 | ||||
-rw-r--r-- | mod/tagcloud/manifest.xml | 3 | ||||
-rw-r--r-- | mod/thewire/manifest.xml | 3 | ||||
-rw-r--r-- | mod/tinymce/manifest.xml | 2 | ||||
-rw-r--r-- | mod/twitterservice/manifest.xml | 2 | ||||
-rw-r--r-- | mod/uservalidationbyemail/manifest.xml | 3 | ||||
-rw-r--r-- | mod/zaudio/manifest.xml | 2 | ||||
-rw-r--r-- | views/default/admin/plugins/advanced.php | 5 |
16 files changed, 34 insertions, 11 deletions
diff --git a/documentation/examples/plugins/manifest.xml b/documentation/examples/plugins/manifest.xml index 0f7823442..1602a7358 100644 --- 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 b241d2651..4d853a9aa 100644 --- 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 62fb61b1e..88921dcce 100644 --- 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 f6fb4b38a..850e6009c 100644 --- 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 51222ca94..966aa1195 100644 --- 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 e19ed4de7..e5e23f546 100644 --- 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 cffd611df..d811e373b 100644 --- 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 a219fce7f..c51134608 100644 --- 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 68a534037..053e22178 100644 --- 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 b059f6a98..8ca4d10ea 100644 --- 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 87a044364..27dd5732d 100644 --- 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 1c5cd5a48..a3df59e3d 100644 --- 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 0b9311cae..b3336dbda 100644 --- 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 65052bb17..5fffb0d2b 100644 --- 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 8401ffef1..0384df743 100644 --- 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 229c21f96..ce465113f 100644 --- 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. |