Changeset 1163:5bef318c71f5

Timestamp:

06/24/13 15:01:55 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix issue for upload multiple in firefox
Add fake button for multiple upload and deferred event on normal button.
Fix size of different buttons.

Location:

admin

Files:

• js/_media.js (modified) (2 diffs)
• media.php (modified) (1 diff)
• style/jsUpload/style.css (modified) (3 diffs)

admin/js/_media.js

@@ -3 +3 @@
           return;
      }
+
+     $('.button.add').click(function(e) {
+          // Use the native click() of the file input.
+          $('#upfile').click();
+          e.preventDefault();
+     });
 
      $('button.clean').click(function(e) {
@@ -33 +39 @@
      }
 
-     $('<div><a href="#">' + $msg + '</a></div>').click( function() {
+     $('<p class="clear"><a href="#">' + $msg + '</a></p>').click( function() {
           if ($container.hasClass('enhanced_uploader')) {
                $msg = dotclear.msg.enhanced_uploader_activate;

admin/media.php

@@ -347 +347 @@
      echo
      '<span class="max-size">&nbsp;('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')</span>'.
-     '<label class="button add" for="upfile">';
-
-     if ($user_ui_enhanceduploader) {
-          echo '<span class="add-label">'.__('Choose files').'</span>';
-     } else {
-          echo '<span class="add-label">'.__('Choose file').'</span>';
-     }
-     echo 
+     '<label for="upfile">'.
+     '<span class="add-label one-file">'.__('Choose file').'</span>'.
+     '<button class="button add">'.__('Choose files').'</button>'.
      '<input type="file" id="upfile" name="upfile[]"'.($user_ui_enhanceduploader?' multiple="mutiple"':'').' data-url="'.html::escapeURL($page_url).'" />'.
-      '</label>';
+     '</label>';
 
      echo

admin/style/jsUpload/style.css

@@ -16 +16 @@
   padding: .1em .5em 0 .5em;
   font-size: 1em;
-}
-
-.enhanced_uploader .button span {
-  font-size: inherit;
-  padding: 0;
+  float: left;
 }
 
@@ -28 +24 @@
 }
 
-.enhanced_uploader .button.add {
-  position: relative;
-  cursor: pointer;
-  font-size: 1em;
-  padding: 0;
+.enhanced_uploader .cancel, .enhanced_uploader .clean, .enhanced_uploader .start {
+  margin-top: 0;
 }
 
-.enhanced_uploader .button.add input {
-  position: absolute;
+.enhanced_uploader #upfile {
   width: 0;
   height: 0;
-  top: 0;
-  left: 0;
+  visibility: hidden;
   margin: 0;
   opacity: 0;
@@ -47 +38 @@
 }
 
-.enhanced_uploader .add-label, .enhanced_uploader .max-size {
-  float: none;
-}
-
-.button.clean, .button.cancel {
+.button.clean, .button.cancel, .button.add {
   display: none;
 }
 
-.enhanced_uploader .button.cancel {
+.enhanced_uploader .button.clean, .enhanced_uploader .button.cancel, .enhanced_uploader .button.add {
   display: inline-block;
 }