Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/Plugin/MetadataLoader.php2
-rw-r--r--lang/en.json5
-rw-r--r--plugins/AnonymizeIP/AnonymizeIP.php10
-rw-r--r--plugins/CorePluginsAdmin/stylesheets/plugins_admin.less6
-rw-r--r--plugins/CorePluginsAdmin/templates/macros.twig22
-rw-r--r--plugins/DevicesDetection/DevicesDetection.php2
-rw-r--r--plugins/ExampleAPI/plugin.json2
-rw-r--r--plugins/ExampleRssWidget/plugin.json2
-rw-r--r--plugins/ExampleUI/plugin.json2
-rw-r--r--plugins/ExampleVisualization/plugin.json2
-rw-r--r--plugins/SEO/SEO.php2
-rw-r--r--plugins/SegmentEditor/SegmentEditor.php2
-rw-r--r--plugins/UserCountryMap/UserCountryMap.php4
13 files changed, 45 insertions, 18 deletions
diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php
index a0d17115b8..c626c75b11 100644
--- a/core/Plugin/MetadataLoader.php
+++ b/core/Plugin/MetadataLoader.php
@@ -73,7 +73,7 @@ class MetadataLoader
'homepage' => 'http://piwik.org/',
'author' => 'Piwik',
'author_homepage' => 'http://piwik.org/',
- 'license' => 'GPL v3 or later',
+ 'license' => 'GPL v3+',
'license_homepage' => 'http://www.gnu.org/licenses/gpl.html',
'version' => Version::VERSION,
'theme' => false,
diff --git a/lang/en.json b/lang/en.json
index 5f5d401b01..7fb39bcae7 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -730,7 +730,7 @@
"MenuPlatform": "Platform",
"Marketplace": "Marketplace",
"PluginNotCompatibleWith": "%1$s plugin is not compatible with %2$s.",
- "PluginNotWorkingAlternative": "If you enjoyed this plugin, maybe you can find a more recent version in the Marketplace. If not, you may uninstall it. ",
+ "PluginNotWorkingAlternative": "If you've been using this plugin, maybe you can find a more recent version in the Marketplace. If not, you may want to uninstall it.",
"UninstallConfirm": "You are about to uninstall a plugin %s. The plugin will be completely removed from your platform and it won't be recoverable. Are you sure you want to do this?",
"NoZipFileSelected": "Please select a ZIP file.",
"SuccessfullyActicated": "You have successfully activated <strong>%s</strong>.",
@@ -806,7 +806,8 @@
"ByWritingOwnPlugin": "by %swriting your own plugin%s",
"OrByUploadingAPlugin": "or by %suploading a plugin%s",
"ByDesigningOwnTheme": "by %sdesign your own theme%s",
- "OrByUploadingATheme": "or by %suploading a theme%s"
+ "OrByUploadingATheme": "or by %suploading a theme%s",
+ "CorePluginTooltip": "Core plugins have no version since they are distributed with Piwik."
},
"CoreUpdater": {
"PluginDescription": "Piwik updating mechanism",
diff --git a/plugins/AnonymizeIP/AnonymizeIP.php b/plugins/AnonymizeIP/AnonymizeIP.php
index 2458956dbe..8348c931cc 100644
--- a/plugins/AnonymizeIP/AnonymizeIP.php
+++ b/plugins/AnonymizeIP/AnonymizeIP.php
@@ -28,10 +28,12 @@ class AnonymizeIP extends \Piwik\Plugin
public function getInformation()
{
return array(
- 'description' => Piwik::translate('AnonymizeIP_PluginDescription'),
- 'author' => 'Piwik',
- 'author_homepage' => 'http://piwik.org/',
- 'version' => Version::VERSION,
+ 'description' => Piwik::translate('AnonymizeIP_PluginDescription'),
+ 'author' => 'Piwik',
+ 'author_homepage' => 'http://piwik.org/',
+ 'version' => Version::VERSION,
+ 'license' => 'GPL v3+',
+ 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html'
);
}
diff --git a/plugins/CorePluginsAdmin/stylesheets/plugins_admin.less b/plugins/CorePluginsAdmin/stylesheets/plugins_admin.less
index 80b9dd47bb..edcc91200b 100644
--- a/plugins/CorePluginsAdmin/stylesheets/plugins_admin.less
+++ b/plugins/CorePluginsAdmin/stylesheets/plugins_admin.less
@@ -45,4 +45,10 @@ table.entityTable tr td a.uninstall {
color:red;
text-decoration:none;
font-weight:bold;
+}
+
+.plugin-version {
+ font-size:80%;
+ font-style:italic;
+ color:#777;
} \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index 800ac89e05..259a300159 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -103,7 +103,6 @@
<thead>
<tr>
<th>{% if isTheme %}{{ 'CorePluginsAdmin_Theme'|translate }}{% else %}{{ 'General_Plugin'|translate }}{% endif %}</th>
- <th class="num">{{ 'CorePluginsAdmin_Version'|translate }}</th>
<th>{{ 'General_Description'|translate }}</th>
<th class="status">{{ 'CorePluginsAdmin_Status'|translate }}</th>
<th class="action-links">{{ 'General_Action'|translate }}</th>
@@ -111,6 +110,7 @@
</thead>
<tbody id="plugins">
{% for name,plugin in pluginsInfo %}
+ {% set isZeitgeist = isTheme and name == 'Zeitgeist' %}
{% if (plugin.alwaysActivated is defined and not plugin.alwaysActivated) or isTheme %}
<tr {% if plugin.activated %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %} data-filter-status="{% if plugin.activated %}active{% else %}inactive{% endif %}" data-filter-origin="{% if plugin.isCorePlugin %}core{% else %}noncore{% endif %}">
<td class="name">
@@ -121,17 +121,19 @@
{%- else %}
{{ name }}
{% endif %}
+ <span class="plugin-version" {% if plugin.isCorePlugin %}title="{{ 'CorePluginsAdmin_CorePluginTooltip'|translate }}"{% endif %}>({% if plugin.isCorePlugin %}{{ 'CorePluginsAdmin_OriginCore'|translate }}{% else %}v{{ plugin.info.version }}{% endif %})</span>
{% if name in pluginNamesHavingSettings %}
<br /><br />
<a href="{{ linkTo({'module':'CoreAdminHome', 'action': 'pluginSettings'}) }}#{{ name|e('html_attr') }}" class="settingsLink">{{ 'General_Settings'|translate }}</a>
{% endif %}
</td>
- <td class="vers">{{ plugin.info.version }}</td>
<td class="desc">
<div class="plugin-desc-text">
{{ plugin.info.description|raw|nl2br }}
- {% if plugin.info.homepage|default is not empty %}
+ {% if plugin.info.homepage|default is not empty and plugin.info.homepage not in [
+ 'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/'
+ ] %}
<span class="plugin-homepage">
<a href="{{ plugin.info.homepage }}">({{ 'CorePluginsAdmin_PluginHomepage'|translate|replace({' ': '&nbsp;'})|raw }})</a>
</span>
@@ -153,15 +155,21 @@
{% endif %}
</td>
<td class="status">
+ {% if not isZeitgeist -%}
+
{% if plugin.activated %}
{{ 'CorePluginsAdmin_Active'|translate }}
{% else %}
- {{ 'CorePluginsAdmin_Inactive'|translate }} <br/>
- - {% if plugin.uninstallable %}<a data-pluginName="{{ name|escape('html_attr') }}" class="uninstall" href='index.php?module=CorePluginsAdmin&action=uninstall&pluginName={{ name }}&nonce={{ uninstallNonce }}'>{{ 'CorePluginsAdmin_ActionUninstall'|translate }}</a>{% endif %}
+ {{ 'CorePluginsAdmin_Inactive'|translate }}
+ {% if plugin.uninstallable %} <br/> - <a data-pluginName="{{ name|escape('html_attr') }}" class="uninstall" href='index.php?module=CorePluginsAdmin&action=uninstall&pluginName={{ name }}&nonce={{ uninstallNonce }}'>{{ 'CorePluginsAdmin_ActionUninstall'|translate }}</a>{% endif %}
{% endif %}
+
+ {%- endif %}
</td>
- <td class="togl action-links">
+ <td class="togl action-links" {% if isZeitgeist %}style="border-left-width:0px;"{% endif %}>
+ {% if not isZeitgeist -%}
+
{% if plugin.invalid is defined or plugin.alwaysActivated %}
-
{% else %}
@@ -171,6 +179,8 @@
<a href='index.php?module=CorePluginsAdmin&action=activate&pluginName={{ name }}&nonce={{ activateNonce }}'>{{ 'CorePluginsAdmin_Activate'|translate }}</a>
{% endif %}
{% endif %}
+
+ {%- endif %}
</td>
</tr>
{% endif %}
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index a1608e6716..f655d0e976 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -38,6 +38,8 @@ class DevicesDetection extends \Piwik\Plugin
'author' => 'Piwik PRO',
'author_homepage' => 'http://piwik.pro',
'version' => '1.14',
+ 'license' => 'GPL v3+',
+ 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html'
);
}
diff --git a/plugins/ExampleAPI/plugin.json b/plugins/ExampleAPI/plugin.json
index b2b9631a55..9fd6d7cc55 100644
--- a/plugins/ExampleAPI/plugin.json
+++ b/plugins/ExampleAPI/plugin.json
@@ -4,7 +4,7 @@
"version": "1.0",
"keywords": ["example", "api"],
"homepage": "http://piwik.org",
- "license": "GPL-3.0+",
+ "license": "GPL v3+",
"authors": [
{
"name": "Piwik",
diff --git a/plugins/ExampleRssWidget/plugin.json b/plugins/ExampleRssWidget/plugin.json
index deb5ff49ca..cbb36f3848 100644
--- a/plugins/ExampleRssWidget/plugin.json
+++ b/plugins/ExampleRssWidget/plugin.json
@@ -4,7 +4,7 @@
"version": "1.0",
"keywords": ["example", "feed", "widget"],
"homepage": "http://piwik.org",
- "license": "GPL-3.0+",
+ "license": "GPL v3+",
"authors": [
{
"name": "Piwik",
diff --git a/plugins/ExampleUI/plugin.json b/plugins/ExampleUI/plugin.json
index 0e66982e35..6080c51abe 100644
--- a/plugins/ExampleUI/plugin.json
+++ b/plugins/ExampleUI/plugin.json
@@ -4,7 +4,7 @@
"version": "1.0.1",
"keywords": ["example", "framework", "platform", "ui", "visualization"],
"homepage": "http://piwik.org",
- "license": "GPL-3.0+",
+ "license": "GPL v3+",
"authors": [
{
"name": "Piwik",
diff --git a/plugins/ExampleVisualization/plugin.json b/plugins/ExampleVisualization/plugin.json
index a3a5202a33..73a31c9ba5 100644
--- a/plugins/ExampleVisualization/plugin.json
+++ b/plugins/ExampleVisualization/plugin.json
@@ -3,7 +3,7 @@
"version": "0.1.0",
"description": "Example for generating a simple visualization",
"theme": false,
- "license": "GPL-3.0+",
+ "license": "GPL v3+",
"keywords": ["SimpleTable"],
"homepage": "http://piwik.org",
"authors": [
diff --git a/plugins/SEO/SEO.php b/plugins/SEO/SEO.php
index 8be4199ad0..0b30ae159c 100644
--- a/plugins/SEO/SEO.php
+++ b/plugins/SEO/SEO.php
@@ -28,6 +28,8 @@ class SEO extends \Piwik\Plugin
'author' => 'Piwik',
'author_homepage' => 'http://piwik.org/',
'version' => Version::VERSION,
+ 'license' => 'GPL v3+',
+ 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html'
);
}
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index 949475691e..ede1fe9913 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -30,6 +30,8 @@ class SegmentEditor extends \Piwik\Plugin
'author' => 'Piwik',
'author_homepage' => 'http://piwik.org/',
'version' => Version::VERSION,
+ 'license' => 'GPL v3+',
+ 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html'
);
}
diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php
index c295c48a3d..3c9b7ff267 100644
--- a/plugins/UserCountryMap/UserCountryMap.php
+++ b/plugins/UserCountryMap/UserCountryMap.php
@@ -31,7 +31,9 @@ class UserCountryMap extends \Piwik\Plugin
'description' => 'This plugin provides the widgets Visitor Map and Real-time Map. Note: Requires the UserCountry plugin enabled.',
'author' => 'Piwik',
'author_homepage' => 'http://piwik.org/',
- 'version' => Version::VERSION
+ 'version' => Version::VERSION,
+ 'license' => 'GPL v3+',
+ 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html'
);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 23:41:37 +0300