From 942772ec039396505068dece3be40be3252474eb Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Tue, 4 Jul 2017 09:13:06 +0200
Subject: [PATCH] Errores merge solucionados

---
 forms/admin/photos/photos.js | 4 ++--
 forms/admin/photos/ui.xml    | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/forms/admin/photos/photos.js b/forms/admin/photos/photos.js
index 6cde6ddd..bbe23baa 100644
--- a/forms/admin/photos/photos.js
+++ b/forms/admin/photos/photos.js
@@ -189,12 +189,12 @@ Hedera.Photos = new Class
 		this.addFiles (this.$('file').files);
 	}
 
-	,onDragEnter: function (event)
+	,onDragEnter: function ()
 	{
 		Vn.Node.addClass (this.$('dropzone'), 'dragover');
 	}
 
-	,onDragLeave: function (event)
+	,onDragLeave: function ()
 	{
 		Vn.Node.removeClass (this.$('dropzone'), 'dragover');
 	}
diff --git a/forms/admin/photos/ui.xml b/forms/admin/photos/ui.xml
index e4000aaf..728c6fab 100755
--- a/forms/admin/photos/ui.xml
+++ b/forms/admin/photos/ui.xml
@@ -3,7 +3,7 @@
 	<t>Images</t>
 </h1>
 <div id="main" class="photos">
-	<div class="box">
+	<div class="card form">
 		<div class="form-group">
 			<label><t>Collection</t></label>
 			<htk-combo id="schema">
@@ -37,8 +37,6 @@
 				<t>Upload files</t>
 			</button>
 		</div>
-		<input id="submit" type="submit" class="thin"/>
 	</div>
-	</form>
 </div>
 </vn>