قرینه از
https://github.com/matomo-org/matomo.git
synced 2025-08-22 06:57:53 +00:00

* Add matomo.org link campaign tracking functionality and tests * Added optional override parameters for trackmatomolink, added new config option to disable matomo.org link campaign tracking, updated tests * Added twig functions to format external urls, added missing matomo.org subdomains to allow list * Revert unnecessary extra parameters for externallink twig function in favour of using twig string concatenation * Update all matomo.org links in twig templates * Add an externalLink() function for vue.js to easily add campaign parameters to matomo.org urls in the front end * Update vue.js externalLink() function to support the disable_tracking_matomo_app_links config option * Attempt to keep linter happy * More linter tweaks * Bump stalled tests * built vue files * Remove unnecessary domains from externalLink list, add missing type definition, update and fix privacy setting link * Improve externalLink TypeScript method to use URL object for domain manipulation instead of custom regex * Make externalLink and externalRawLink TypeScript functions variadic * built vue files * Update matomo.org links in vue components with campaign parameters * Move externalRawLink function to piwik helper to make it available for vanilla JS, update matomo.org links in JS * Update matomo.org links in PHP classes to add campaign parameters * Increment version * Update submodule references * Fix for infinite loop when processing URLs in config settings * Update mtm_medium to include 'App.' prefix, linter pacification changes for externalLink * Fix link formatting in GeoIp2 vue component, update system tests * built vue files * Update advertising test, fix missing import in Tour * UI test fixes for tracking code twig templates and license key formatting * built vue files * Bump stalled tests * Fix missing use statements, remove incorrect custom params from link * built vue files * Change update version back to 5.0.0-rc5 * Update plugins/MultiSites/vue/src/Dashboard/Dashboard.vue Co-authored-by: Michal Kleiner <michal@innocraft.com> * Update plugins/MultiSites/vue/src/Dashboard/Dashboard.vue Co-authored-by: Michal Kleiner <michal@innocraft.com> * Update plugins/MultiSites/vue/src/Dashboard/Dashboard.vue Co-authored-by: Michal Kleiner <michal@innocraft.com> * Update plugins/Morpheus/javascripts/piwikHelper.js Co-authored-by: Michal Kleiner <michal@innocraft.com> * built vue files * Add check for _pk_externalRawLink before calling, Fix inconsistent source string * Fix linter complaint * built vue files * Bump stalled tests * Update submodule references to 5.x-dev branches * Update visitorgenerator submodule reference to 5.x-dev branche --------- Co-authored-by: bx80 <bx80@users.noreply.github.com> Co-authored-by: Michal Kleiner <michal@innocraft.com>
86 خطوط
3.1 KiB
Twig
86 خطوط
3.1 KiB
Twig
{% extends '@CoreUpdater/layout.twig' %}
|
|
{% set helpMessage %}
|
|
{{ 'CoreUpdater_HelpMessageContent'|translate(externallink('https://matomo.org/faq/'),'</a>','</li><li>')|raw }}
|
|
{% endset %}
|
|
|
|
{% block content %}
|
|
|
|
{% if coreError %}
|
|
<div class="header">
|
|
<h1>{{ 'CoreUpdater_UpdateErrorTitle'|translate }}</h1>
|
|
</div>
|
|
<div class="content">
|
|
<div class="alert alert-danger">
|
|
{{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
|
|
{% for message in errorMessages %}
|
|
<br/><strong>{{ message|striptags }}</strong>
|
|
{% endfor %}
|
|
</div>
|
|
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}</p>
|
|
<ul>
|
|
<li>{{ helpMessage }}</li>
|
|
</ul>
|
|
<p>{{ 'CoreUpdater_ErrorDIYHelp'|translate }}</p>
|
|
<ul>
|
|
<li>{{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}</li>
|
|
<li>{{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}</li>
|
|
<li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='{{ 'https://matomo.org/faq/how-to-update/faq_179'|trackmatomolink }}' rel='noreferrer noopener' target='_blank'>(see FAQ)</a></li>
|
|
<li>{{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}</li>
|
|
<li>{{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}</li>
|
|
</ul>
|
|
</div>
|
|
{% else %}
|
|
|
|
{% if errorMessages|length == 0 and warningMessages|length == 0 %}
|
|
<div class="header">
|
|
<h1>{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}</h1>
|
|
</div>
|
|
{% endif %}
|
|
|
|
<div class="content">
|
|
|
|
{% if warningMessages|length > 0 %}
|
|
<div class="alert alert-warning">
|
|
<p>{{ 'CoreUpdater_WarningMessages'|translate }}</p>
|
|
{% for message in warningMessages %}
|
|
<br/><strong>{{ message|striptags }}</strong>
|
|
{% endfor %}
|
|
</div>
|
|
{% endif %}
|
|
|
|
{% if errorMessages|length > 0 %}
|
|
<div class="alert alert-warning">
|
|
<p>{{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p>
|
|
{% for message in errorMessages %}
|
|
<br/><strong>{{ message|striptags }}</strong>
|
|
{% endfor %}
|
|
</div>
|
|
{% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %}
|
|
{% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %}
|
|
<div class="alert alert-danger">
|
|
{{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
|
|
</div>
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
{% if errorMessages|length > 0 or warningMessages|length > 0 %}
|
|
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate }}</p>
|
|
<ul>
|
|
<li>{{ helpMessage }}</li>
|
|
</ul>
|
|
{% else %}
|
|
<div id="donate-form-container">
|
|
{% include "@CoreHome/_donate.twig" %}
|
|
</div>
|
|
{% endif %}
|
|
|
|
</div>
|
|
|
|
<div class="footer">
|
|
<a href="index.php">{{ 'General_ContinueToPiwik'|translate }}</a>
|
|
</div>
|
|
|
|
{% endif %}
|
|
|
|
{% endblock %}
|