Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved logo upload.

Browse source
This commit is contained in:
Martin Edenhofer 2015-07-12 07:32:22 +02:00
parent 3bd59292e7
commit 89e00230f5
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/controllers/_settings/area.js.coffee
View file

@ -157,7 +157,11 @@ class App.SettingsAreaLogo extends App.Controller
maxSiteInMb = 8 maxSiteInMb = 8
if file.size && file.size > 1024 * 1024 * maxSiteInMb 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', '' ) @logoPreview.attr( 'src', '' )
return return
@ -206,4 +210,4 @@ class App.SettingsAreaLogo extends App.Controller
) )
# add resized image # add resized image
App.ImageService.resizeForAvatar( @params.logo, @logoPreview.width(), @logoPreview.height(), store ) App.ImageService.resizeForApp( @params.logo, @logoPreview.width(), @logoPreview.height(), store )

2
app/assets/javascripts/app/controllers/getting_started.js.coffee
View file

@ -369,7 +369,7 @@ class Base extends App.ControllerContent
) )
# add resized image # add resized image
App.ImageService.resizeForAvatar( @params.logo, @logoPreview.width(), @logoPreview.height(), store ) App.ImageService.resizeForApp( @params.logo, @logoPreview.width(), @logoPreview.height(), store )
hideAlerts: => hideAlerts: =>
@$('.form-group').removeClass('has-error') @$('.form-group').removeClass('has-error')

2
app/assets/javascripts/app/lib/app_post/image_service.js.coffee
View file

@ -6,7 +6,7 @@ class App.ImageService
else else
@resize( dataURL, x, y, 2, 'image/jpeg', 0.7, callback ) @resize( dataURL, x, y, 2, 'image/jpeg', 0.7, callback )
@toDataURLForApp: (dataURL, x, y, callback) => @resizeForApp: (dataURL, x, y, callback) =>
if @checkUrl(dataURL) if @checkUrl(dataURL)
callback(dataURL) callback(dataURL)
else else

11
app/assets/stylesheets/zammad.css.scss
View file

@ -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; margin: 0 auto 15px;
height: auto; height: auto;
@ -4845,6 +4845,15 @@ label + .wizard-buttonList {
margin-top: 15px; margin-top: 15px;
} }
.branding .logo-preview:not([src=""]) {
margin: 20px auto 12px;
height: auto;
+ .logo-preview-placeholder {
display: none;
}
}
.branding.login { .branding.login {
padding: 24px 24px 0px; padding: 24px 24px 0px;
} }