diff options
| author | Peter Zhang <peter@innocraft.com> | 2022-07-20 03:40:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 03:40:38 +0300 |
| commit | 0eeb042955f7110ba484333dad71ec174d2d1420 (patch) | |
| tree | 1f9d20ef6ab607c9b295e4ef50eaf22687a1d6f8 /plugins/Morpheus | |
| parent | 7c8227bb111af98f766fc48c2f6141b1115c41ab (diff) | |
Add 429 response Code UI (#19433)
* add template
add template
* Update AjaxHelper.ts
update error code
* add widget rate limit loader
add widget rate limit loader
* built vue files
* built vue files
* remove file
remove file
* update wording
update wording
* built vue files
* Update WidgetLoader.vue
remove console
* built vue files
* Update lang/en.json
* built vue files
* Update plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts
Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com>
* update text and rate limit
update text and rate limit
* built vue files
* Update en.json
remove api docs for now
* built vue files
Co-authored-by: peterhashair <peterhashair@users.noreply.github.com>
Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com>
Diffstat (limited to 'plugins/Morpheus')
| -rw-r--r-- | plugins/Morpheus/stylesheets/uibase/_loading.less | 4 | ||||
| -rw-r--r-- | plugins/Morpheus/templates/ajaxMacros.twig | 17 |
2 files changed, 20 insertions, 1 deletions
diff --git a/plugins/Morpheus/stylesheets/uibase/_loading.less b/plugins/Morpheus/stylesheets/uibase/_loading.less index 7769e7b002..4e0e1f6fd5 100644 --- a/plugins/Morpheus/stylesheets/uibase/_loading.less +++ b/plugins/Morpheus/stylesheets/uibase/_loading.less @@ -27,3 +27,7 @@ color: @theme-color-brand; font-weight: normal; } + +#loadingRateLimitError { + display: none; +} diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig index 61c01fe25c..9234471767 100644 --- a/plugins/Morpheus/templates/ajaxMacros.twig +++ b/plugins/Morpheus/templates/ajaxMacros.twig @@ -16,7 +16,6 @@ {% 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 %} @@ -38,4 +37,20 @@ {%- 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/">{{ 'Feedback_CommunityHelp'|translate }}</a> + + {%- if areAdsForProfessionalServicesEnabled %} + – + {% set supportUrl = 'https://matomo.org/support-plans/?pk_campaign=Help&pk_medium=AjaxError&pk_content=' ~ currentModule ~ '&pk_source=Matomo_App' %} + <a rel="noreferrer noopener" target="_blank" href="{{ supportUrl|e('html_attr') }}">{{ 'Feedback_ProfessionalHelp'|translate }}</a> + {%- endif %}. + </div> + </div> {% endmacro %} |