From 89e00230f5b01a86c0fcc430cafde5cb7de9bebe Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sun, 12 Jul 2015 07:32:22 +0200
Subject: [PATCH] Improved logo upload.

---
 .../app/controllers/_settings/area.js.coffee          |  8 ++++++--
 .../app/controllers/getting_started.js.coffee         |  2 +-
 .../app/lib/app_post/image_service.js.coffee          |  2 +-
 app/assets/stylesheets/zammad.css.scss                | 11 ++++++++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_settings/area.js.coffee b/app/assets/javascripts/app/controllers/_settings/area.js.coffee
index 892e5b973..4138c118b 100644
--- a/app/assets/javascripts/app/controllers/_settings/area.js.coffee
+++ b/app/assets/javascripts/app/controllers/_settings/area.js.coffee
@@ -157,7 +157,11 @@ class App.SettingsAreaLogo extends App.Controller
 
     maxSiteInMb = 8
     if file.size && file.size > 1024 * 1024 * maxSiteInMb
-      #@showAlert( 'logo', App.i18n.translateInline( 'File too big, max. %s MB allowed.', maxSiteInMb ) )
+      App.Event.trigger 'notify', {
+        type:    'error'
+        msg:     App.i18n.translateContent('File too big, max. %s MB allowed.', maxSiteInMb )
+        timeout: 2000
+      }
       @logoPreview.attr( 'src', '' )
       return
 
@@ -206,4 +210,4 @@ class App.SettingsAreaLogo extends App.Controller
       )
 
     # add resized image
-    App.ImageService.resizeForAvatar( @params.logo, @logoPreview.width(), @logoPreview.height(), store )
+    App.ImageService.resizeForApp( @params.logo, @logoPreview.width(), @logoPreview.height(), store )
diff --git a/app/assets/javascripts/app/controllers/getting_started.js.coffee b/app/assets/javascripts/app/controllers/getting_started.js.coffee
index 7c82b8821..8d76bdcc0 100644
--- a/app/assets/javascripts/app/controllers/getting_started.js.coffee
+++ b/app/assets/javascripts/app/controllers/getting_started.js.coffee
@@ -369,7 +369,7 @@ class Base extends App.ControllerContent
       )
 
     # add resized image
-    App.ImageService.resizeForAvatar( @params.logo, @logoPreview.width(), @logoPreview.height(), store )
+    App.ImageService.resizeForApp( @params.logo, @logoPreview.width(), @logoPreview.height(), store )
 
   hideAlerts: =>
     @$('.form-group').removeClass('has-error')
diff --git a/app/assets/javascripts/app/lib/app_post/image_service.js.coffee b/app/assets/javascripts/app/lib/app_post/image_service.js.coffee
index a53140c77..b0a685049 100644
--- a/app/assets/javascripts/app/lib/app_post/image_service.js.coffee
+++ b/app/assets/javascripts/app/lib/app_post/image_service.js.coffee
@@ -6,7 +6,7 @@ class App.ImageService
     else
       @resize( dataURL, x, y, 2, 'image/jpeg', 0.7, callback )
 
-  @toDataURLForApp: (dataURL, x, y, callback) =>
+  @resizeForApp: (dataURL, x, y, callback) =>
     if @checkUrl(dataURL)
       callback(dataURL)
     else
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index d2ab736a8..0f29598aa 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -4832,7 +4832,7 @@ label + .wizard-buttonList {
   }
 }
 
-.setup.wizard .logo-preview:not([src=""]), .branding .logo-preview:not([src=""]) {
+.setup.wizard .logo-preview:not([src=""]) {
   margin: 0 auto 15px;
   height: auto;
 
@@ -4845,6 +4845,15 @@ label + .wizard-buttonList {
   margin-top: 15px;
 }
 
+.branding .logo-preview:not([src=""]) {
+  margin: 20px auto 12px;
+  height: auto;
+
+  + .logo-preview-placeholder {
+    display: none;
+  }
+}
+
 .branding.login {
   padding: 24px 24px 0px;
 }