Fixes #3646. Added suport for Repository, Bugtracker and Donations in manifest.

diff --git a/documentation/info/manifest.xml b/documentation/info/manifest.xml
index baa6cc3fa725a98fdbf69ebf26a14ea46a7cea0f..49415848117cd79e5c332fe79fd07b96735f1982 100644 (file)
--- a/documentation/info/manifest.xml
+++ b/documentation/info/manifest.xml
@@ -6,6 +6,9 @@
        <blurb>A concise description.</blurb>
        <description>This is a longer, more interesting description of my plugin, its features, and other important information.</description>
        <website>http://www.elgg.org/</website>
+       <repository>https://github.com/Elgg/Elgg</repository>
+       <bugtracker>http://trac.elgg.org</bugtracker>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>(C) Elgg 2011</copyright>
        <license>GNU General Public License version 2</license>
 

diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
index 7e79c15c8f9a82f3208aafd88b28cf105541f1cf..5eb248c2c8dd7022fb5ce858de668e2c5368d72e 100644 (file)
--- a/engine/classes/ElggPluginManifest.php
+++ b/engine/classes/ElggPluginManifest.php
@@ -276,6 +276,32 @@ class ElggPluginManifest {
                }
        }
 
+       /**
+        * Returns the repository url
+        *
+        * @return sting
+        */
+       public function getRepository() {
+               return $this->parser->getAttribute('repository');
+       }
+
+       /**
+        * Returns the bug tracker page
+        *
+        * @return sting
+        */
+       public function getBugTracker() {
+               return $this->parser->getAttribute('bugtracker');
+       }
+
+       /**
+        * Returns the donations page
+        *
+        * @return sting
+        */
+       public function getDonationsPage() {
+               return $this->parser->getAttribute('donations');
+       }
 
        /**
         * Returns the version of the plugin.

diff --git a/engine/classes/ElggPluginManifestParser18.php b/engine/classes/ElggPluginManifestParser18.php
index 554e28c0284dcf5d45ad1f6447c5a45a547acbe8..3b753f17b416b986340dc2d565ad2e1f66a1d50f 100644 (file)
--- a/engine/classes/ElggPluginManifestParser18.php
+++ b/engine/classes/ElggPluginManifestParser18.php
@@ -13,10 +13,10 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
         * @var array
         */
        protected $validAttributes = array(
-               'name', 'author', 'version', 'blurb', 'description',
-               'website', 'copyright', 'license', 'requires', 'suggests',
-               'screenshot', 'category', 'conflicts', 'provides',
-               'activate_on_install'
+               'name', 'author', 'version', 'blurb', 'description','website',
+               'repository', 'bugtracker', 'donations', 'copyright', 'license',
+               'requires', 'suggests', 'conflicts', 'provides',
+               'screenshot', 'category', 'activate_on_install'
        );
 
        /**
@@ -46,6 +46,9 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
                                case 'website':
                                case 'copyright':
                                case 'license':
+                               case 'repository':
+                               case 'bugtracker':
+                               case 'donations':
                                case 'activate_on_install':
                                        $parsed[$element->name] = $element->content;
                                        break;

diff --git a/engine/tests/api/plugins.php b/engine/tests/api/plugins.php
index 8ecb0a46c2dfde44a3aab74ffe88d5b6eb2d8824..66297266c13138727f5ef37ebffd0b1f372bc14f 100644 (file)
--- a/engine/tests/api/plugins.php
+++ b/engine/tests/api/plugins.php
@@ -68,6 +68,9 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
                        'blurb' => 'A concise description.',
                        'description' => 'A longer, more interesting description.',
                        'website' => 'http://www.elgg.org/',
+                       'repository' => 'https://github.com/Elgg/Elgg',
+                       'bugtracker' => 'http://trac.elgg.org',
+                       'donations' => 'http://elgg.org/supporter.php',
                        'copyright' => '(C) Elgg Foundation 2011',
                        'license' => 'GNU General Public License version 2',
 
@@ -164,6 +167,21 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
                $this->assertEqual($this->manifest18->getWebsite(), 'http://www.elgg.org/');
                $this->assertEqual($this->manifest17->getWebsite(), 'http://www.elgg.org/');
        }
+       
+       public function testElggPluginManifestGetRepository() {
+               $this->assertEqual($this->manifest18->getRepository(), 'https://github.com/Elgg/Elgg');
+               $this->assertEqual($this->manifest17->getRepository(), '');
+       }
+       
+               public function testElggPluginManifestGetBugtracker() {
+               $this->assertEqual($this->manifest18->getBugTracker(), 'http://trac.elgg.org');
+               $this->assertEqual($this->manifest17->getBugTracker(), '');
+       }
+       
+               public function testElggPluginManifestGetDonationsPage() {
+               $this->assertEqual($this->manifest18->getDonationsPage(), 'http://elgg.org/supporter.php');
+               $this->assertEqual($this->manifest17->getDonationsPage(), '');
+       }
 
        public function testElggPluginManifestGetCopyright() {
                $this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');

diff --git a/engine/tests/test_files/plugin_18/manifest.xml b/engine/tests/test_files/plugin_18/manifest.xml
index 9654b6422c65d794c92466d09be3cbe5844b70b8..5d788616a3bc7aa465d9cac35b2b4960093440a8 100644 (file)
--- a/engine/tests/test_files/plugin_18/manifest.xml
+++ b/engine/tests/test_files/plugin_18/manifest.xml
@@ -6,6 +6,9 @@
        <blurb>A concise description.</blurb>
        <description>A longer, more interesting description.</description>
        <website>http://www.elgg.org/</website>
+       <repository>https://github.com/Elgg/Elgg</repository>
+       <bugtracker>http://trac.elgg.org</bugtracker>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>(C) Elgg Foundation 2011</copyright>
        <license>GNU General Public License version 2</license>
 

diff --git a/languages/en.php b/languages/en.php
index 18d0c88d9370666ad93765d7d96719e82cc8b065..23f1c3a192a3a4adaedaf436c1a54f9135fd7c07 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -686,6 +686,9 @@ $english = array(
        'admin:plugins:label:categories' => 'Categories',
        'admin:plugins:label:licence' => "Licence",
        'admin:plugins:label:website' => "URL",
+       'admin:plugins:label:repository' => "Code",
+       'admin:plugins:label:bugtracker' => "Report issue",
+       'admin:plugins:label:donate' => "Donate",
        'admin:plugins:label:moreinfo' => 'more info',
        'admin:plugins:label:version' => 'Version',
        'admin:plugins:label:location' => 'Location',

diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index 29ee1bfc840e53bcbfd8fd3ae0fd2f8ab12651a4..a68c309692548304463f5e9b9df65e49c60011bf 100644 (file)
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -9,6 +9,7 @@
        <blurb>Blog plugin</blurb>
        <description>Adds simple blogging capabilities to your Elgg installation.</description>
        <website>http://elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index b95af87f8eae875b26dc4fc68bf7c58f898a092c..ebe8704a68cd06e00edb577e860ab9898ba596eb 100644 (file)
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -9,6 +9,7 @@
        <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>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index 4a6bd08646546165c16517266934321b0294e26c..dbc84bed04e9ec5bd34f1bd9a6af5010c5ca3300 100644 (file)
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -8,6 +8,7 @@
        <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>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
index 80187efbcc7475504973a4058d8e61c6a0416fdd..3bdcbd333318ffe33ce08944de8b62355d1ec23b 100644 (file)
--- a/mod/custom_index/manifest.xml
+++ b/mod/custom_index/manifest.xml
@@ -6,6 +6,7 @@
        <category>bundled</category>
        <description>A demonstration of how to create a front page plugin.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
index cbbc1044c0303b1597ed956b50b683bf1db0f302..20ed074a7851f1e0a21261ca1bbf1b8517d3f03f 100644 (file)
--- a/mod/dashboard/manifest.xml
+++ b/mod/dashboard/manifest.xml
@@ -6,6 +6,7 @@
        <category>bundled</category>
        <description>A widget-based dashboard for your users</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/developers/manifest.xml b/mod/developers/manifest.xml
index 93a12945d8749bd5bfff7a379c0ead41183ea9ab..58e8e24f0bbdac545f67d2413cadf64ad0d80cb9 100644 (file)
--- a/mod/developers/manifest.xml
+++ b/mod/developers/manifest.xml
@@ -8,6 +8,9 @@
        <blurb>Developer tools for Elgg</blurb>
        <description>A set of tools for writing plugins and themes. It is recommended that you have this plugin at the top of the plugin list.</description>
        <website>http://www.elgg.org/</website>
+       <repository>https://github.com/Elgg/Elgg</repository>
+       <bugtracker>http://trac.elgg.org</bugtracker>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
 

diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index 21e847d226bf6e44ec1f48f2c536d088e0114789..df4a81b02f47e6df70ac1a35207312ca60bc6f1f 100644 (file)
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -8,6 +8,7 @@
        <category>admin</category>
        <description>Elgg diagnostics tool</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index 81ca9194e128d05fabb4b451382fd6bd3b18227e..546471647a46d3af3ce4c3df0af88d5450518003 100644 (file)
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -7,6 +7,7 @@
        <category>enhancement</category>
        <description>Allows users to easily upload and embed media into text areas.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml
index f2aef09f3b3cc24fc960f0a795be55f2b2110637..8c474ddab3296fda9cfff83f63e939873d92739c 100644 (file)
--- a/mod/externalpages/manifest.xml
+++ b/mod/externalpages/manifest.xml
@@ -6,6 +6,7 @@
        <category>bundled</category>
        <description>Create simple web pages for about, contact, privacy, and terms.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 26282a8e31912d4b58f13efdf25137649e480453..7d69f4280814a69813991ca5a9b3ff671a0da307 100644 (file)
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -8,6 +8,7 @@
        <category>widget</category>
        <description>File browser plugin</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 5aafebf380f4a67f9f5ed8929ced2ebbe944c11b..ddf15656acfc5cee7b2d7c8e35719761cfdbaecf 100644 (file)
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -7,6 +7,7 @@
        <category>admin</category>
        <description>Perform some database cleanup tasks</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index fd28360d046deae4dc8c3d4f6d65769836943f3b..574ba1985dd8edf47f93c7ea378a9ef95a5f3dd3 100644 (file)
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -8,6 +8,7 @@
        <category>widget</category>
        <description>Provides group support for elgg</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index 6807e96a490b7fe4ab2447b3621d5aff35be2ea4..e4d8fa145534bf50ffe28923694738e39d188c7e 100644 (file)
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -7,6 +7,7 @@
        <category>security</category>
        <description>Provides security filtering. Running a site with this plugin disabled is extremely insecure. DO NOT DISABLE.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index b36238a05ef22eb153971408b417bb0996c92d0b..220948c30f46548af07ea3a71a99764fe750b41e 100644 (file)
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -7,6 +7,7 @@
        <category>social</category>
        <description>Invite friends via email invites.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/likes/manifest.xml b/mod/likes/manifest.xml
index 62835fcf5fea0908f20a82f200c21c3116a401ad..e0a9b10f24ed94bab87a548bce819e74119f5040 100644 (file)
--- a/mod/likes/manifest.xml
+++ b/mod/likes/manifest.xml
@@ -7,6 +7,7 @@
        <category>social</category>
        <description>Enables users to like content on the site.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/logbrowser/manifest.xml b/mod/logbrowser/manifest.xml
index 4527e2cbb301f214f2052866cc615f1fafa2fa56..17b08803cab25dc6cf3bcaae7f88b3f474aa5be5 100644 (file)
--- a/mod/logbrowser/manifest.xml
+++ b/mod/logbrowser/manifest.xml
@@ -7,6 +7,7 @@
        <category>admin</category>
        <description>Browse the system event log</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index 1aa62e2e78f10ec00f92ec15ad963f1da46d9c07..79b37dbbc9a377a84257b4d97560bfd1a8df0972 100644 (file)
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -7,6 +7,7 @@
        <category>admin</category>
        <description>Rotate the system log at specific intervals</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/members/manifest.xml b/mod/members/manifest.xml
index 8b18c9f911b76ca2a60327760bde20afcc076dc4..40a05892c8a4c59ee57ab86d2d2a723d84756656 100644 (file)
--- a/mod/members/manifest.xml
+++ b/mod/members/manifest.xml
@@ -6,6 +6,7 @@
        <category>bundled</category>
        <description>Lists the members of your site</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 617813725ff883d9939b6748fd64bd037052f064..b4188ab31036f98dab7080aabbe8af98352f5edb 100644 (file)
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -7,6 +7,7 @@
        <category>widget</category>
        <description>This plugin allows users to put a message board on their profile for other users to post comments.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml
index 73a58d9d460523e934208a7af890bea693362398..83f7bba646b27a2c9d4d8bfa4c4f03e51e7ed1ed 100644 (file)
--- a/mod/messages/manifest.xml
+++ b/mod/messages/manifest.xml
@@ -6,8 +6,9 @@
        <category>bundled</category>
        <category>communication</category>
        <description>Elgg internal messages plugin. This plugin lets user send each other messages.</description>
-       <copyright>See COPYRIGHT.txt</copyright>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
+       <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>

diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml
index 205476881816aa1cea27f0121eab6418ec12e18f..d961ce1383b6e854f43645434fa2a03df7360e83 100644 (file)
--- a/mod/notifications/manifest.xml
+++ b/mod/notifications/manifest.xml
@@ -6,6 +6,7 @@
        <category>bundled</category>
        <description>Elgg notifications plugin</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index 991be6a22e2b3d727570ef1d2f0a206f5adc728c..96b9c7280c0930bbef5aa68ad2d63e74f3f3436b 100644 (file)
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -7,6 +7,7 @@
        <category>bundled</category>
        <category>api</category>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index 4cf999f456e0be4ab5941c343f15366aa34a0039..a764171b43a3a65d56028cffb6b49ddbb3e862b1 100644 (file)
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -8,6 +8,7 @@
        <category>widget</category>
        <description>Collaborative editing tool. Enables users to create pages similar to a wiki without having to know wiki syntax.</description>
        <website>http://www.elgg.org</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml
index 86fbc7b7b98ee259c5fcce06b07dc0e1db200f04..b7ad5185e9cdff2809ed107960d797519d01d5b4 100644 (file)
--- a/mod/profile/manifest.xml
+++ b/mod/profile/manifest.xml
@@ -7,6 +7,7 @@
        <category>bundled</category>
        <category>social</category>
        <website>http://elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License Version 2</license>
        <activate_on_install>true</activate_on_install>

diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml
index e96620b01657b00a74f5af1fd69c9da4166eff01..d98ff383bafeac2ee586bfb003fe19de83d789c4 100644 (file)
--- a/mod/reportedcontent/manifest.xml
+++ b/mod/reportedcontent/manifest.xml
@@ -6,6 +6,7 @@
        <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>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml
index 513d3a6b96b21e2be1b629eef1ff059634cc098b..1bc974729832b62b1728688d1d0b6f272f171e43 100644 (file)
--- a/mod/search/manifest.xml
+++ b/mod/search/manifest.xml
@@ -6,6 +6,7 @@
        <category>bundled</category>
        <description>Allow search across entities of the site</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index c0f89f35e4e4aedbab81b2796157270cbd0c101a..fd91d92b8ad12df4ecdebc1925986b55bc390992 100644 (file)
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -7,6 +7,7 @@
        <category>widget</category>
        <description>Widget-based tag clouds.</description>
        <website>http://cashcostello.com/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
index 962ed12f13731b8f956fb87b22a35a782ae6a340..950ecfbedd373edaaa831e81ee33ecb1f61d031c 100644 (file)
--- a/mod/thewire/manifest.xml
+++ b/mod/thewire/manifest.xml
@@ -7,6 +7,7 @@
        <category>content</category>
        <description>Microblogging for Elgg</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index 61bf0c22c85176c24f9abfc52cf9c0e1caa0f94d..fb36c4141d69bd4085b2995a53e3fc0b0dc07904 100644 (file)
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -7,6 +7,7 @@
        <category>enhancement</category>
        <description>TinyMCE plugin.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index 18fa8c9573f6196ef52994c129ebb6dfbf527789..18031deeccf30cc63cd8d43244c3e6ffe8f38963 100644 (file)
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -7,6 +7,7 @@
        <category>widget</category>
        <description>Elgg simple twitter widget</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index 86bba4b5001aa6ab3953b3e67f7e21d3597e5527..88d43aa5e0e1617d1ab9b2287c9218bb242fc00d 100644 (file)
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -7,6 +7,7 @@
        <category>api</category>
        <category>bundled</category>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 800dd2641a84d65b577480c54714bd9585aa89fc..6a15fd0cf1627dd699c7b7077cc6f204d55c14dd 100644 (file)
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -7,6 +7,7 @@
        <category>security</category>
        <description>Simple user account validation via email.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 54f819658c69a4dc32948d3db3d4ae908f32d681..a103052aaa523669fa7641f14a71595632ae803c 100644 (file)
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -8,6 +8,7 @@
        <category>multimedia</category>
        <description>This simple plugin lets users play mp3's in the page.</description>
        <website>http://www.elgg.org/</website>
+       <donations>http://elgg.org/supporter.php</donations>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU General Public License version 2</license>
        <requires>

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 78ec95c267474c2c8e3406c97e1f9fcb1fef0ee0..437b0f00fc60f7a56a0570b857f857994bd1583d 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1460,7 +1460,8 @@ a.elgg-widget-collapsed:before {
        padding: 5px 10px;
        margin: 4px 0;
 }
-ul.elgg-plugin-categories, ul.elgg-plugin-categories > li {
+ul.elgg-plugin-categories, ul.elgg-plugin-categories > li,
+ul.elgg-plugin-resources, ul.elgg-plugin-resources > li {
        display: inline;
 }
 .elgg-plugin-category-bundled {

diff --git a/views/default/object/plugin/full.php b/views/default/object/plugin/full.php
index db0a5241633b6794d419fdfe1471185f7663928e..a96acd4ec947dc08608c9f2d9e57f6170c8d6c71 100644 (file)
--- a/views/default/object/plugin/full.php
+++ b/views/default/object/plugin/full.php
@@ -172,6 +172,26 @@ $website = elgg_view('output/url', array(
        'is_trusted' => true,
 ));
 
+$resources = array(
+       'repository' => $plugin->getManifest()->getRepository(),
+       'bugtracker' => $plugin->getManifest()->getBugTracker(),
+       'donate' => $plugin->getManifest()->getDonationsPage(),
+);
+
+$resources_html = "<ul class=\"elgg-plugin-resources\">";
+foreach ($resources as $id => $href) {
+       if ($href) {
+               $resources_html .= "<li class=\"prm\">";
+               $resources_html .= elgg_view('output/url', array(
+                       'href' => $href,
+                       'text' => elgg_echo("admin:plugins:label:$id"),
+                       'is_trusted' => true,
+               ));
+               $resources_html .= "</li>";
+       }
+}
+$resources_html .= "</ul>";
+
 $copyright = elgg_view('output/text', array('value' => $plugin->getManifest()->getCopyright()));
 $license = elgg_view('output/text', array('value' => $plugin->getManifest()->getLicense()));
 
@@ -242,7 +262,11 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
        
                        <div><?php echo $description; ?></div>
                        <p><?php echo $author . ' - ' . $website; ?></p>
-                       <?php echo $docs; ?>
+                       
+                       <?php
+                               echo $resources_html;
+                               echo $docs;
+                       ?>
        
                        <div class="pts">
                        <?php 
@@ -281,4 +305,4 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
                ?>
                </div>
        </div>
-</div>
\ No newline at end of file
+</div>