Changeset 1145:11f839c012b9

Timestamp:

06/11/13 21:27:42 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Correction de l'upload sous firefox; ajout de bouton de statut

Files:

• admin/media.php (modified) (2 diffs)
• admin/style/jsUpload/loader.png (added)
• admin/style/jsUpload/style.css (modified) (3 diffs)
• inc/admin/lib.dc.page.php (modified) (3 diffs)

admin/media.php

@@ -149 +149 @@
       header('Content-type: application/json');
       $message = array();
-      $message['files'][] = array('name' => $upfile['name']);
+      $message['files'][] = array('name' => $upfile['name'],
+                                  'size' => $upfile['size']
+                                  );
 
       echo json_encode($message);
@@ -325 +327 @@
     $core->formNonce().'</div>'.
   '<div class="fileupload-buttonbar">'.
-  '<span class="button-add button"><label for="upfile">'.__('Add files').'</label>'.
-  '<input type="file" id="upfile" name="upfile[]" size="20" multiple="multiple" data-url="'.html::escapeURL($page_url).'" />'.
+  '<label class="button-add button" for="upfile">'.__('Add files').
+  '<input type="file" id="upfile" name="upfile[]" multiple="multiple" data-url="'.html::escapeURL($page_url).'" />'.
+  '</label>'.
   '</span>'.
-  '<button type="submit" class="button start"><span>'.__('Send').'</span></button>'.
+  '<input class="button start" type="submit" value="'.__('Send').'"/>'.
   '</div>'.
   '<table role="presentation" class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>'.

admin/style/jsUpload/style.css

@@ -2 +2 @@
   display: inline-block;
   *display: inline;
-  padding: .2em .5em .2em .5em;
   border-radius: .2em;
   background: #2373A8;
@@ -17 +16 @@
 }
 
+.button-add { 
+  position: relative;
+}
+
 .button:hover {
   background: #2373A8;
   border: 1px solid #2C8FD1;
-}
-
-.button-add {
-  padding: .2em .5em .05em .5em;
-}
-
-.button-add label {
-  cursor: pointer;
 }
 
@@ -37 +32 @@
   opacity: 0;
   filter: alpha(opacity=0);
-  transform: translate(-300px, 0) scale(4);
   cursor: pointer;
 }
+
+.progress .bar {
+  background: transparent url('loader.png') repeat left top;
+}
+
+.upload-status { 
+  margin-top: 3px;
+  width: 13px;
+  height: 13px;
+  display: block;
+}
+
+.upload-status.ok { 
+  background: transparent url('../../images/check-on.png') no-repeat left top;
+}
+
+.upload-status.error { 
+  background: transparent url('../../images/check-off.png') no-repeat left top;
+}

inc/admin/lib.dc.page.php

@@ -697 +697 @@
             <p class="name">{%=file.name%}</p>
             {% if (file.error) { %}
-                <div><span class="label label-important">'.__('Error:').'</span> {%=file.error%}</div>
+                <div><span class="label label-error">'.__('Error:').'</span> {%=file.error%}</div>
             {% } %}
         </td>
@@ -708 +708 @@
         <td>
             {% if (!o.files.error && !i && !o.options.autoUpload) { %}
-                <button class="btn btn-primary start">
-                    <i class="icon-upload icon-white"></i>
-                    <span>'.__('Send').'</span>
-                </button>
+                <input type="submit" class="button start" value="'.__('Send').'"/>
             {% } %}
         </td>
@@ -737 +734 @@
             <span class="size">{%=o.formatFileSize(file.size)%}</span>
         </td>
+        <td>
+            {% if (file.error) { %}
+            <span class="upload-status error"></span>
+            {% } else { %}
+            <span class="upload-status ok"></span>
+            {% } %}
+        </td>
     </tr>
 {% } %}