diff options
| author | robocoder <anthon.pang@gmail.com> | 2010-11-06 01:23:50 +0300 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2010-11-06 01:23:50 +0300 |
| commit | 0a21d2940b2ebd73b4d751d73124c41699c3209c (patch) | |
| tree | 0e17eb9fa35ee6c796ac56a156caa6b694e64aef /plugins | |
| parent | ae5c38cb7c2c2eb5d0fdc61869133cddad09f8df (diff) | |
fixes #1805 - add optional license and license_homepage to Plugin's getInformation(); expand Proxy redirect whitelist of URLs
git-svn-id: http://dev.piwik.org/svn/trunk@3293 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CorePluginsAdmin/templates/manage.tpl | 10 | ||||
| -rw-r--r-- | plugins/ExamplePlugin/ExamplePlugin.php | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/plugins/CorePluginsAdmin/templates/manage.tpl b/plugins/CorePluginsAdmin/templates/manage.tpl index 674318c0b7..e891e80573 100644 --- a/plugins/CorePluginsAdmin/templates/manage.tpl +++ b/plugins/CorePluginsAdmin/templates/manage.tpl @@ -28,9 +28,13 @@ <td class="vers">{$plugin.info.version}</td> <td class="desc"> {$plugin.info.description|nl2br} - <cite>By - {if isset($plugin.info.author_homepage)}<a title="Author Homepage" href="?module=Proxy&action=redirect&url={$plugin.info.author_homepage}">{/if} - {$plugin.info.author}{if isset($plugin.info.author_homepage)}</a>{/if}.</cite> + {if isset($plugin.info.license)} + ({if isset($plugin.info.license_homepage)}<a title="{'CorePluginsAdmin_LicenseHomepage'|translate}" href="?module=Proxy&action=redirect&url={$plugin.info.license_homepage}">{/if}{$plugin.info.license}{if isset($plugin.info.license_homepage)}</a>){/if} + {/if} + {if isset($plugin.info.author)} + <cite>By + {if isset($plugin.info.author_homepage)}<a title="{'CorePluginsAdmin_AuthorHomepage'|translate}" href="?module=Proxy&action=redirect&url={$plugin.info.author_homepage}">{/if}{$plugin.info.author}{if isset($plugin.info.author_homepage)}</a>{/if}.</cite> + {/if} </td> <td class="status"> {if $plugin.alwaysActivated}<span title="{'CorePluginsAdmin_ActivatedHelp'|translate}" class="active">{'CorePluginsAdmin_Active'|translate}</span> diff --git a/plugins/ExamplePlugin/ExamplePlugin.php b/plugins/ExamplePlugin/ExamplePlugin.php index f33dff848b..90a881c797 100644 --- a/plugins/ExamplePlugin/ExamplePlugin.php +++ b/plugins/ExamplePlugin/ExamplePlugin.php @@ -27,8 +27,11 @@ class Piwik_ExamplePlugin extends Piwik_Plugin { return array( 'description' => Piwik_Translate('ExamplePlugin_PluginDescription'), + 'homepage' => 'http://plugins.piwik.org/', 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', + 'license' => 'GPL v3 or later', + 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html', 'version' => '0.1', 'translationAvailable' => true, ); |