Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-07-21 17:27:44 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-07-21 17:27:44 +0400
commitac360489b9b9800424b84de7b5d11ad6b7101be2 (patch)
treed0c0cfc0a619284be88132c977bce002c44434a8 /plugins/Morpheus
parent4bdf5d17c8ceb3a979164c854ffad8ae7a5e41cb (diff)
refs #5406 added a more detailed error message, some ui tweaks and display a link to email sysadmin if possible
Diffstat (limited to 'plugins/Morpheus')
-rw-r--r--plugins/Morpheus/stylesheets/uibase/_loading.less1
-rw-r--r--plugins/Morpheus/templates/admin.twig2
-rw-r--r--plugins/Morpheus/templates/ajaxMacros.twig8
3 files changed, 7 insertions, 4 deletions
diff --git a/plugins/Morpheus/stylesheets/uibase/_loading.less b/plugins/Morpheus/stylesheets/uibase/_loading.less
index e8b189d0d0..e68d0f0a69 100644
--- a/plugins/Morpheus/stylesheets/uibase/_loading.less
+++ b/plugins/Morpheus/stylesheets/uibase/_loading.less
@@ -20,7 +20,6 @@
font-size: 1.1em;
color: #F88D22;
padding: 0.5em;
- margin-left: 30%;
display: none;
padding-top: 40px;
} \ No newline at end of file
diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig
index b07d8343ef..4ceff8273a 100644
--- a/plugins/Morpheus/templates/admin.twig
+++ b/plugins/Morpheus/templates/admin.twig
@@ -30,7 +30,7 @@
{% include "@CoreHome/_topScreen.twig" %}
{% import 'ajaxMacros.twig' as ajax %}
- {{ ajax.requestErrorDiv }}
+ {{ ajax.requestErrorDiv(emailSuperUser) }}
{{ postEvent("Template.beforeContent", "admin", currentModule) }}
<div id="container">
diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig
index eddeeab10e..4d06fd4e30 100644
--- a/plugins/Morpheus/templates/ajaxMacros.twig
+++ b/plugins/Morpheus/templates/ajaxMacros.twig
@@ -13,6 +13,10 @@
</div>
{% endmacro %}
-{% macro requestErrorDiv() %}
-<div id="loadingError">{{ 'General_ErrorRequest'|translate }}</div>
+{% macro requestErrorDiv(emailSuperUser) %}
+ {% if emailSuperUser is defined and emailSuperUser %}
+ <div id="loadingError">{{ 'General_ErrorRequest'|translate('<a href="mailto:' ~ emailSuperUser ~ '">', '</a>')|raw }}</div>
+ {% else %}
+ <div id="loadingError">{{ 'General_ErrorRequest'|translate('', '') }}</div>
+ {% endif %}
{% endmacro %} \ No newline at end of file