Merge branch 'catalog' of https://github.com/thelia/thelia into catalog

2013-09-23 18:37:33 +02:00
parent 67bf7bb989 9ee8b2b75f
commit 8d61a9222e
8 changed files with 374 additions and 57 deletions
--- a/templates/admin/default/includes/image-upload-form.html
+++ b/templates/admin/default/includes/image-upload-form.html
@@ -10,7 +10,7 @@ Parameters:
 <div class="image-manager" >
    <form action="{url path="/admin/image/type/$imageType/$parentId/save-ajax"}" class="dropzone" id="images-dropzone" enctype="multipart/form-data">
        <div class="fallback">
-            <input name="file" type="file" multiple />
+            <input name="file" type="file" />
            <button type="submit" class="btn btn-info btn-upload"><span class="glyphicon glyphicon-send"></span> {intl l="Send files"}</button>
        </div>