Merge branch 'master' of https://github.com/piwik/piwik

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..02ba88a17e 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|default('')) }}
             {{ 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