From 0ff935584b8c01e145ef13fe9c84aa7d7d1220ed Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Tue, 5 Jan 2016 00:27:34 +0100
Subject: [PATCH] show an error message if uploaded logo couldn't be processed
---
plugins/CoreAdminHome/javascripts/generalSettings.js | 7 +++++++
plugins/CoreAdminHome/lang/en.json | 1 +
plugins/CoreAdminHome/templates/generalSettings.twig | 3 +++
3 files changed, 11 insertions(+)
diff --git a/plugins/CoreAdminHome/javascripts/generalSettings.js b/plugins/CoreAdminHome/javascripts/generalSettings.js
index 2efa037fd9..50f3e3b05a 100644
--- a/plugins/CoreAdminHome/javascripts/generalSettings.js
+++ b/plugins/CoreAdminHome/javascripts/generalSettings.js
@@ -123,6 +123,13 @@ $(document).ready(function () {
var frameContent = $(uploadFrame.contents()).find('body').html();
frameContent = $.trim(frameContent);
+ if ('0' === frameContent) {
+ $('.uploaderror').show();
+ setTimeout(function(){
+ $('.uploaderror').fadeOut();
+ }, 5000);
+ }
+
if ('1' === frameContent || '0' === frameContent) {
uploadFrame.remove();
}
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json
index 5be7675fb9..cd88aca4f0 100644
--- a/plugins/CoreAdminHome/lang/en.json
+++ b/plugins/CoreAdminHome/lang/en.json
@@ -49,6 +49,7 @@
"JSTrackingIntro5": "If you want to do more than track page views, please check out the %1$sPiwik Javascript Tracking documentation%2$s for the list of available functions. Using these functions you can track goals, custom variables, ecommerce orders, abandoned carts and more.",
"LogoNotWriteableInstruction": "To use your custom logo instead of the default Piwik logo, give write permission to this directory: %1$s Piwik needs write access for your logos stored in the files %2$s.",
"FileUploadDisabled": "Uploading files is not enabled in your PHP configuration. To upload your custom logo please set %s in php.ini and restart your webserver.",
+ "LogoUploadFailed": "The uploaded file couldn't be processed. Please check if the file has a valid format.",
"LogoUpload": "Select a Logo to upload",
"FaviconUpload": "Select a Favicon to upload",
"LogoUploadHelp": "Please upload a file in %s formats with a minimum height of %s pixels.",
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index c3cd7c9500..e70d537472 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -204,6 +204,9 @@
<input type="hidden" name="token_auth" value="{{ token_auth }}"/>
{% if logosWriteable %}
+ <div class="alert alert-warning uploaderror" style="display:none;">
+ {{ 'CoreAdminHome_LogoUploadFailed'|translate }}
+ </div>
<div class="form-group">
<label for="customLogo">{{ 'CoreAdminHome_LogoUpload'|translate }}</label>
<div class="form-help">{{ 'CoreAdminHome_LogoUploadHelp'|translate("JPG / PNG / GIF", 110) }}</div>
--
GitLab