verdnatura/hedera-web
verdnatura
/
hedera-web
0
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Errores merge solucionados

This commit is contained in:
Juan Ferrer Toribio 2017-07-04 09:13:06 +02:00
parent 13e45afc77
commit 942772ec03
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forms/admin/photos/photos.js
View File

@ -189,12 +189,12 @@ Hedera.Photos = new Class
this.addFiles (this.$('file').files); this.addFiles (this.$('file').files);
} }
,onDragEnter: function (event) ,onDragEnter: function ()
{ {
Vn.Node.addClass (this.$('dropzone'), 'dragover'); Vn.Node.addClass (this.$('dropzone'), 'dragover');
} }
,onDragLeave: function (event) ,onDragLeave: function ()
{ {
Vn.Node.removeClass (this.$('dropzone'), 'dragover'); Vn.Node.removeClass (this.$('dropzone'), 'dragover');
} }

4
forms/admin/photos/ui.xml
View File

@ -3,7 +3,7 @@
<t>Images</t> <t>Images</t>
</h1> </h1>
<div id="main" class="photos"> <div id="main" class="photos">
<div class="box"> <div class="card form">
<div class="form-group"> <div class="form-group">
<label><t>Collection</t></label> <label><t>Collection</t></label>
<htk-combo id="schema"> <htk-combo id="schema">
@ -37,8 +37,6 @@
<t>Upload files</t> <t>Upload files</t>
</button> </button>
</div> </div>
<input id="submit" type="submit" class="thin"/>
</div> </div>
</form>
</div> </div>
</vn> </vn>