diff options
| author | Tim-Hinnerk Heuer <tim@innocraft.com> | 2021-09-04 10:20:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-04 10:20:24 +0300 |
| commit | 5d5e630e06b7941d22fc338ee964e30f06ad74af (patch) | |
| tree | b18d74e10e3467c7604e64b62b81ba471e55e6ce /plugins/Morpheus | |
| parent | 7e0b0e602068a558a84f1e16fde5e7e6cb0b7fa4 (diff) | |
show users more informative information on error (#17900)
* show users more informative information on error
fixes #15135
* add rel="noreferrer noopener" #15135
* show faq section only outside of cloud #15036
* privatise variables
contributing to View::showMoreFaqInfo #15135
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Morpheus')
| -rw-r--r-- | plugins/Morpheus/templates/admin.twig | 2 | ||||
| -rw-r--r-- | plugins/Morpheus/templates/ajaxMacros.twig | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig index 26adf951ff..02167cdde6 100644 --- a/plugins/Morpheus/templates/admin.twig +++ b/plugins/Morpheus/templates/admin.twig @@ -27,7 +27,7 @@ </div> {% import 'ajaxMacros.twig' as ajax %} - {{ ajax.requestErrorDiv(emailSuperUser|default(''), areAdsForProfessionalServicesEnabled, currentModule) }} + {{ ajax.requestErrorDiv(emailSuperUser|default(''), areAdsForProfessionalServicesEnabled, currentModule, showMoreFaqInfo) }} {{ postEvent("Template.beforeContent", "admin", currentModule, currentAction) }} <div class="page"> diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig index da40e5bf91..79eda2d30d 100644 --- a/plugins/Morpheus/templates/ajaxMacros.twig +++ b/plugins/Morpheus/templates/ajaxMacros.twig @@ -13,7 +13,7 @@ </div> {% endmacro %} -{% macro requestErrorDiv(emailSuperUser, areAdsForProfessionalServicesEnabled = false, currentModule = '') %} +{% macro requestErrorDiv(emailSuperUser, areAdsForProfessionalServicesEnabled = false, currentModule = '', showMoreHelp = false) %} <div id="loadingError"> <div class="alert alert-danger"> @@ -26,7 +26,9 @@ <br /><br /> {{ 'General_NeedMoreHelp'|translate }} + {% if showMoreHelp %} <a rel="noreferrer noopener" target="_blank" href="https://matomo.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – + {% endif %} <a rel="noreferrer noopener" target="_blank" href="https://forum.matomo.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> {%- if areAdsForProfessionalServicesEnabled %} |