قرینه از
https://github.com/matomo-org/matomo.git
synced 2025-08-22 06:57:53 +00:00
693643c337
* 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>
55 خطوط
2.5 KiB
Twig
55 خطوط
2.5 KiB
Twig
{% macro errorDiv(id='ajaxError') %}
|
||
<div id="{{ id }}" style="display:none"></div>
|
||
{% endmacro %}
|
||
|
||
{% macro loadingDiv(id='ajaxLoadingDiv') %}
|
||
<div id="{{ id }}" style="display:none;">
|
||
<div class="loadingPiwik">
|
||
<img src="plugins/Morpheus/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }}
|
||
</div>
|
||
<div class="loadingSegment">
|
||
{{ 'SegmentEditor_LoadingSegmentedDataMayTakeSomeTime'|translate }}
|
||
</div>
|
||
</div>
|
||
{% endmacro %}
|
||
|
||
{% macro requestErrorDiv(contactEmail, areAdsForProfessionalServicesEnabled = false, currentModule = '', showMoreHelp = false) %}
|
||
<div id="loadingError">
|
||
<div class="alert alert-danger">
|
||
{% if contactEmail is defined and contactEmail %}
|
||
{{ 'General_ErrorRequest'|translate('<a href="mailto:' ~ contactEmail|e('url') ~ '">', '</a>')|raw }}
|
||
{% else %}
|
||
{{ 'General_ErrorRequest'|translate('', '') }}
|
||
{% endif %}
|
||
|
||
<br /><br />
|
||
{{ 'General_NeedMoreHelp'|translate }}
|
||
|
||
{% if showMoreHelp %}
|
||
<a rel="noreferrer noopener" target="_blank" href="{{ 'https://matomo.org/faq/troubleshooting/faq_19489/'|trackmatomolink }}">{{ 'General_Faq'|translate }}</a> –
|
||
{% endif %}
|
||
<a rel="noreferrer noopener" target="_blank" href="{{ 'https://forum.matomo.org/'|trackmatomolink }}">{{ 'Feedback_CommunityHelp'|translate }}</a>
|
||
|
||
{%- if areAdsForProfessionalServicesEnabled %}
|
||
–
|
||
<a rel="noreferrer noopener" target="_blank" href="{{ 'https://matomo.org/support-plans'|trackmatomolink(null, null, 'AjaxError')}}">{{ 'Feedback_ProfessionalHelp'|translate }}</a>
|
||
{%- endif %}.
|
||
</div>
|
||
</div>
|
||
<div id="loadingRateLimitError" style="display: none">
|
||
<div class="alert alert-danger">
|
||
{{ 'General_ErrorRateLimit'|translate }}
|
||
|
||
<br /><br />
|
||
{{ 'General_NeedMoreHelp'|translate }}
|
||
|
||
<a rel="noreferrer noopener" target="_blank" href="{{ 'https://forum.matomo.org/'|trackmatomolink }}">{{ 'Feedback_CommunityHelp'|translate }}</a>
|
||
|
||
{%- if areAdsForProfessionalServicesEnabled %}
|
||
–
|
||
<a rel="noreferrer noopener" target="_blank" href="{{ 'https://matomo.org/support-plans'|trackmatomolink(null, null, 'AjaxError')}}">{{ 'Feedback_ProfessionalHelp'|translate }}</a>
|
||
{%- endif %}.
|
||
</div>
|
||
</div>
|
||
{% endmacro %}
|