update Piwik to version 2.16 (fixes #91)
This commit is contained in:
oliver
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -13,15 +13,15 @@
|
|||
</thead>
|
||||
<tbody id="plugins">
|
||||
{% for name,plugin in pluginsHavingUpdate %}
|
||||
<tr {% if plugin.isActivated %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %}>
|
||||
<tr {% if plugin.isActivated|default(false) %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %}>
|
||||
<td class="name">
|
||||
<a href="javascript:void(0);" data-pluginName="{{ plugin.name|e('html_attr') }}">
|
||||
<a href="javascript:void(0);" data-pluginName="{{ plugin.name|e('html_attr') }}" class="plugin-details">
|
||||
{{ plugin.name }}
|
||||
</a>
|
||||
</td>
|
||||
<td class="vers">
|
||||
{% if plugin.repositoryChangelogUrl %}
|
||||
<a href="javascript:void(0);" title="{{ 'CorePluginsAdmin_Changelog'|translate }}" data-activePluginTab="changelog" data-pluginName="{{ plugin.name|e('html_attr') }}">{{ plugin.currentVersion }} => {{ plugin.latestVersion }}</a>
|
||||
<a href="javascript:void(0);" title="{{ 'CorePluginsAdmin_Changelog'|translate }}" class="plugin-details" data-activePluginTab="changelog" data-pluginName="{{ plugin.name|e('html_attr') }}">{{ plugin.currentVersion }} => {{ plugin.latestVersion }}</a>
|
||||
{% else %}
|
||||
{{ plugin.currentVersion }} => {{ plugin.latestVersion }}
|
||||
{% endif %}
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
{% endmacro %}
|
||||
|
||||
{% macro pluginDeveloper(owner) %}
|
||||
{% if 'piwik' == owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="plugins/Zeitgeist/images/logo-marketplace.png"/>{% else %}{{ owner }}{% endif %}
|
||||
{% if 'piwik' == owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="plugins/Morpheus/images/logo-marketplace.png"/>{% else %}{{ owner }}{% endif %}
|
||||
{% endmacro %}
|
||||
|
||||
{% macro featuredIcon(align='') %}
|
||||
|
|
@ -96,13 +96,13 @@
|
|||
{% macro missingRequirementsPleaseUpdateNotice(plugin) %}
|
||||
{% if plugin.missingRequirements and 0 < plugin.missingRequirements|length %}
|
||||
{% for req in plugin.missingRequirements -%}
|
||||
<p class="missingRequirementsNotice">
|
||||
<div class="alert alert-danger">
|
||||
{% set requirement = req.requirement|capitalize %}
|
||||
{% if 'Php' == requirement %}
|
||||
{% set requirement = 'PHP' %}
|
||||
{% endif %}
|
||||
{{ 'CorePluginsAdmin_MissingRequirementsNotice'|translate(requirement, req.actualVersion, req.requiredVersion) }}
|
||||
</p>
|
||||
</div>
|
||||
{%- endfor %}
|
||||
{% endif %}
|
||||
{% endmacro %}
|
||||
|
|
@ -126,7 +126,6 @@
|
|||
{% endif %}
|
||||
{% endmacro %}
|
||||
|
||||
|
||||
{% macro tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, isTheme, marketplacePluginNames, displayAdminLinks) %}
|
||||
|
||||
<div id="confirmUninstallPlugin" class="ui-confirm">
|
||||
|
|
@ -151,13 +150,13 @@
|
|||
</thead>
|
||||
<tbody id="plugins">
|
||||
{% for name,plugin in pluginsInfo %}
|
||||
{% set isZeitgeist = isTheme and name == 'Zeitgeist' %}
|
||||
{% set isDefaultTheme = isTheme and name == 'Morpheus' %}
|
||||
{% 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" style="white-space:nowrap;">
|
||||
<td class="name">
|
||||
<a name="{{ name|e('html_attr') }}"></a>
|
||||
{% if not plugin.isCorePlugin and name in marketplacePluginNames -%}
|
||||
<a href="javascript:void(0);"
|
||||
<a href="javascript:void(0);" class="plugin-details"
|
||||
data-pluginName="{{ name|e('html_attr') }}"
|
||||
>{{ name }}</a>
|
||||
{%- else %}
|
||||
|
|
@ -167,7 +166,7 @@
|
|||
|
||||
{% if name in pluginNamesHavingSettings %}
|
||||
<br /><br />
|
||||
<a href="{{ linkTo({'module':'CoreAdminHome', 'action': 'pluginSettings'}) }}#{{ name|e('html_attr') }}" class="settingsLink">{{ 'General_Settings'|translate }}</a>
|
||||
<a href="{{ linkTo({'module':'CoreAdminHome', 'action': 'adminPluginSettings'}) }}#{{ name|e('html_attr') }}" class="settingsLink">{{ 'General_Settings'|translate }}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="desc">
|
||||
|
|
@ -185,13 +184,38 @@
|
|||
'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({' ': ' '})|raw }})</a>
|
||||
<a target="_blank" href="{{ plugin.info.homepage }}">({{ 'CorePluginsAdmin_PluginHomepage'|translate|replace({' ': ' '})|raw }})</a>
|
||||
</span>
|
||||
{% endif %}
|
||||
|
||||
{% if plugin.info.donate is defined and plugin.info.donate|length %}
|
||||
<div class="plugin-donation">
|
||||
{{ 'CorePluginsAdmin_LikeThisPlugin'|translate }} <a href="javascript:;" class="plugin-donation-link" data-overlay-id="overlay-{{ name|escape('html_attr') }}">{{ 'CorePluginsAdmin_ConsiderDonating'|translate }}</a>
|
||||
<div id="overlay-{{ name|escape('html_attr') }}" class="donation-overlay ui-confirm" title="{{ 'CorePluginsAdmin_LikeThisPlugin'|translate }}">
|
||||
<p>{{ 'CorePluginsAdmin_CommunityContributedPlugin'|translate }}</p>
|
||||
<p>{{ 'CorePluginsAdmin_ConsiderDonatingCreatorOf'|translate("<b>" ~ name ~ "</b>")|raw }}</p>
|
||||
<div class="donation-links">
|
||||
{% if plugin.info.donate.paypal is defined and plugin.info.donate.paypal %}
|
||||
<a class="donation-link paypal" target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&item_name=Piwik%20Plugin%20{{ name|escape('url') }}&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted&business={{ plugin.info.donate.paypal|escape('url') }}"><img src="plugins/CorePluginsAdmin/images/paypal_donate.jpg" height="30"/></a>
|
||||
{% endif %}
|
||||
{% if plugin.info.donate.flattr is defined and plugin.info.donate.flattr %}
|
||||
<a class="donation-link flattr" target="_blank" href="{{ plugin.info.donate.flattr }}"><img class="alignnone" title="Flattr" alt="" src="plugins/CorePluginsAdmin/images/flattr.png" height="29" /></a>
|
||||
{% endif %}
|
||||
{% if plugin.info.donate.bitcoin is defined and plugin.info.donate.bitcoin %}
|
||||
<div class="donation-link bitcoin">
|
||||
<span>Donate Bitcoins to:</span>
|
||||
<a href="bitcoin:{{ plugin.info.donate.bitcoin|escape('url') }}">{{ plugin.info.donate.bitcoin }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<input role="no" type="button" value="{{ 'General_Close'|translate }}"/>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if plugin.info.license is defined %}
|
||||
<div class="plugin-license">
|
||||
{% if plugin.info.license_homepage is defined %}<a title="{{ 'CorePluginsAdmin_LicenseHomepage'|translate }}" target="_blank" href="{{ plugin.info.license_homepage }}">{% endif %}{{ plugin.info.license }}{% if plugin.info.license_homepage is defined %}</a>{% endif %}
|
||||
{% if plugin.info.license_homepage is defined %}<a title="{{ 'CorePluginsAdmin_LicenseHomepage'|translate }}" rel="noreferrer" target="_blank" href="{{ plugin.info.license_homepage }}">{% endif %}{{ plugin.info.license }}{% if plugin.info.license_homepage is defined %}</a>{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if plugin.info.authors is defined %}
|
||||
|
|
@ -201,7 +225,7 @@
|
|||
{% spaceless %}
|
||||
{% for author in plugin.info.authors if author.name %}
|
||||
{% if author.homepage is defined %}
|
||||
<a title="{{ 'CorePluginsAdmin_AuthorHomepage'|translate }}" href="{{ author.homepage }}" target="_blank">{{ author.name }}</a>
|
||||
<a title="{{ 'CorePluginsAdmin_AuthorHomepage'|translate }}" href="{{ author.homepage }}" rel="noreferrer" target="_blank">{{ author.name }}</a>
|
||||
{% else %}
|
||||
{{ author.name }}
|
||||
{% endif %}
|
||||
|
|
@ -214,8 +238,8 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="status" {% if isZeitgeist %}style="border-left-width:0px;"{% endif %}>
|
||||
{% if not isZeitgeist -%}
|
||||
<td class="status" {% if isDefaultTheme %}style="border-left-width:0px;"{% endif %}>
|
||||
{% if not isDefaultTheme -%}
|
||||
|
||||
{% if plugin.activated %}
|
||||
{{ 'CorePluginsAdmin_Active'|translate }}
|
||||
|
|
@ -228,8 +252,8 @@
|
|||
</td>
|
||||
|
||||
{% if displayAdminLinks %}
|
||||
<td class="togl action-links" {% if isZeitgeist %}style="border-left-width:0px;"{% endif %}>
|
||||
{% if not isZeitgeist -%}
|
||||
<td class="togl action-links" {% if isDefaultTheme %}style="border-left-width:0px;"{% endif %}>
|
||||
{% if not isDefaultTheme -%}
|
||||
|
||||
{% if plugin.invalid is defined or plugin.alwaysActivated %}
|
||||
-
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue