1
0
قرینه از https://github.com/matomo-org/matomo.git synced 2025-08-22 15:07:44 +00:00
Files
matomo/plugins/CoreUpdater/templates/updateHttpError.twig
Ben Burgess 693643c337 Add campaign tracking parameters for all links within Matomo that link to matomo.org (#21375)
* 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>
2023-10-24 11:49:38 +13:00

31 خطوط
774 B
Twig

{% extends '@CoreUpdater/layout.twig' %}
{% block content %}
<div class="header">
<h1>{{ 'CoreUpdater_UpdateErrorTitle'|translate }}</h1>
</div>
<div class="content">
{% for message in feedbackMessages %}
<p>&#10003; {{ message }}</p>
{% endfor %}
<div class="alert alert-danger">
<strong>{{ 'CoreUpdater_UpdateErrorTitle'|translate }}:</strong>
{{ error }}
</div>
<p>
{{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />",externallink("https://matomo.org/docs/update/"),"</a>")|raw }}
</p>
</div>
<div class="footer">
<a href="index.php">{{ 'General_ContinueToPiwik'|translate }}</a>
</div>
{% endblock %}