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

improve logo upload

Browse source
This commit is contained in:
Felix Niklas 2014-11-15 14:27:23 +01:00
parent 8f6abe0cf8
commit aeebeda2e3
3 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -609,7 +609,7 @@ App.Config.set( 'layout_ref/organization_profile', ReferenceOrganizationProfile,
class ReferenceSetupWizard extends App.ControllerWizard class ReferenceSetupWizard extends App.ControllerWizard
elements: elements:
'.fileUpload-preview': 'logoPreview' '.logo-preview': 'logoPreview'
'#agent_email': 'agentEmail' '#agent_email': 'agentEmail'
'#agent_first_name': 'agentFirstName' '#agent_first_name': 'agentFirstName'
'#agent_last_name': 'agentLastName' '#agent_last_name': 'agentLastName'

10
app/assets/javascripts/app/views/layout_ref/setup.jst.eco
View file

@ -55,14 +55,8 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Logo</label> <label>Logo</label>
<div class="horizontal center"> <img class="logo-preview" src="">
<div class="flex fileUpload-placeholder"> <div class="btn btn--success fileUpload">Upload<input type="file" class="js-upload" accept="image/*"></div>
<img class="fileUpload-preview" src="">
</div>
<div class="flex">
<div class="btn btn--success fileUpload"><%- @T('Upload') %><input type="file" class="js-upload" accept="image/*"></div>
</div>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>System Url</label> <label>System Url</label>

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

@ -4195,18 +4195,14 @@ label + .wizard-buttonList {
} }
} }
.setup.wizard .fileUpload-placeholder { .setup.wizard .logo-preview {
border: dotted 1px #eee; display: block;
height: 100px;
} }
.setup.wizard .fileUpload-preview { .setup.wizard .logo-preview:not([src=""]) {
max-height: 100px; max-width: 100%;
max-width: 180px; max-height: 130px;
} margin: 0 auto 15px;
.setup.wizard .fileUpload-preview:not([src=""]) + .fileUpload {
margin-left: 15px;
} }
.import.wizard .wizard-slide { .import.wizard .wizard-slide {