Changeset 1159:887a30463ee0

Timestamp:

06/20/13 13:58:24 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Improve upload multiple
Restore option to enable/disable enhanced interface

Files:

• admin/js/_media.js (modified) (2 diffs)
• admin/media.php (modified) (3 diffs)
• admin/style/jsUpload/style.css (modified) (4 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)

admin/js/_media.js

@@ -1 +1 @@
 $(function() {
-    $('#fileupload')
-     .fileupload({
-         url: $('#fileupload').attr('action'),
-         autoUpload: false
-     });
+    var jqXHR = null;
+    $('#fileupload').fileupload({
+     url: $('#fileupload').attr('action'),
+     autoUpload: false,
+     disabled: true
+    }).bind('fileuploaddone', function(e, data) {
+     if (data.result.files[0].html !==undefined) {
+         $('.media-list').append(data.result.files[0].html);
+     }
+    });
 
-    // Load existing files:
-    $('#fileupload').addClass('fileupload-processing');
-    $.ajax({
-        url: $('#fileupload').fileupload('option', 'url'),
-        dataType: 'json',
-        context: $('#fileupload')[0]
-    }).always(function (result) {
-        $(this).removeClass('fileupload-processing');
-    }).done(function (result) {
-        $(this).fileupload('option', 'done')
-            .call(this, null, {result: result});
-    });
+    if (!$.browser.opera) {
+     var $container = $('#fileupload').parent().parent();
+     var $msg;
+
+     if ($container.hasClass('enhanced_uploader')) {
+         $msg = dotclear.msg.enhanced_uploader_disable;
+         $('#fileupload').fileupload({disabled:false});
+     } else {
+         $msg = dotclear.msg.enhanced_uploader_activate;
+     }
+
+     $('<div><a href="#">' + $msg + '</a></div>').click( function() {
+         if ($container.hasClass('enhanced_uploader')) {
+          $msg = dotclear.msg.enhanced_uploader_activate;
+          $('#upfile').attr('multiple', false);
+
+          // when a user has clicked enhanced_uploader, and has added files
+          // We must remove files in table
+          $('.table-files tr', '#fileupload').remove();
+          $('#fileupload').fileupload({disabled:true});
+         } else {
+          $msg = dotclear.msg.enhanced_uploader_disable;
+          $('#upfile').attr('multiple', true);
+          $('#fileupload').fileupload({disabled:false});
+         }
+         $(this).find('a').text($msg);
+
+         $container.toggleClass('enhanced_uploader');
+     }).appendTo($('#fileupload'));
+    }
 
     // Replace remove links by a POST on hidden form
@@ -23 +46 @@
 
     function fileRemoveAct() {
-     $('a.media-remove').click(function() {
+     $('a.media-remove').live('click', function() {
          var m_name = $(this).parents('ul').find('li:first>a').text();
          if (window.confirm(dotclear.msg.confirm_delete_media.replace('%s',m_name))) {

admin/media.php

@@ -132 +132 @@
 
 # Adding a file
-if ($dir && !empty($_FILES['upfile']))
-{
+if ($dir && !empty($_FILES['upfile'])) {
+  // only one file per request : @see option singleFileUploads in admin/js/jsUpload/jquery.fileupload
   $upfile = array('name' => $_FILES['upfile']['name'][0],
                   'type' => $_FILES['upfile']['type'][0],
@@ -141 +141 @@
                   );
 
-     try {
-    files::uploadStatus($upfile);
-
-    $core->media->uploadFile($upfile['tmp_name'],$upfile['name']);
-
-    if (!empty($_SERVER['HTTP_X_REQUESTED_WITH'])) {
-      header('Content-type: application/json');
-      $message = array();
+  if (!empty($_SERVER['HTTP_X_REQUESTED_WITH'])) {
+    header('Content-type: application/json');
+    $message = array();
+
+    try {
+      files::uploadStatus($upfile);
+      $new_file_id = $core->media->uploadFile($upfile['tmp_name'], $upfile['name']);
+
       $message['files'][] = array('name' => $upfile['name'],
-                                  'size' => $upfile['size']
+                                  'size' => $upfile['size'],
+                                  'html' => mediaItemLine($core->media->getFile($new_file_id), count($dir['files']))
                                   );
-
-      echo json_encode($message);
-      exit();
-    } else {
-        http::redirect($page_url.'&d='.rawurlencode($d).'&upok=1');
-    }
-     } catch (Exception $e) {
-    if (!empty($_SERVER['HTTP_X_REQUESTED_WITH'])) {
-      header('Content-type: application/json');
-      $message = array();
+    } catch (Exception $e) {
       $message['files'][] = array('name' => $upfile['name'],
                                   'error' => $e->getMessage()
                                   );
-      echo json_encode($message);
-      exit();
-    } else {
+    }
+    echo json_encode($message);
+    exit();
+  } else {
+    try {
+      files::uploadStatus($upfile);
+
+      $f_title = (isset($_POST['upfiletitle']) ? $_POST['upfiletitle'] : '');
+      $f_private = (isset($_POST['upfilepriv']) ? $_POST['upfilepriv'] : false);
+
+      $core->media->uploadFile($upfile['tmp_name'], $upfile['name'], $f_title, $f_private);
+      http::redirect($page_url.'&d='.rawurlencode($d).'&upok=1');
+    } catch (Exception $e) {
       $core->error->add($e->getMessage());
     }
-     }
+  }
 }
 
@@ -319 +321 @@
      echo '<div class="two-cols">';
      
-     echo
-  '<div class="col">'.
+     if ($user_ui_enhanceduploader) {
+    echo
+      '<div class="col enhanced_uploader">';
+  } else {
+    echo
+      '<div class="col">';
+  }
+
+  echo
   '<fieldset id="add-file-f"><legend>'.__('Add files').'</legend>'.
   '<p>'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'.
   ' <form id="fileupload" action="'.html::escapeURL($page_url).'" method="POST" enctype="multipart/form-data">'.
   '<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
-    $core->formNonce().'</div>'.
+  $core->formNonce().'</div>';
+
+  echo
   '<div class="fileupload-buttonbar">'.
   '<label class="button-add button" for="upfile">'.__('Add files').
-  '<input type="file" id="upfile" name="upfile[]" multiple="multiple" data-url="'.html::escapeURL($page_url).'" />'.
+  '<span class="one-file"> ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')</span>'.
+    '<input type="file" id="upfile" name="upfile[]"'.($user_ui_enhanceduploader?' multiple="mutiple"':'').' data-url="'.html::escapeURL($page_url).'" />'.
   '</label>'.
-  '</span>'.
+  '</span>';
+
+  echo
+     '<p class="one-file"><label for="upfiletitle">'.__('Title:').form::field(array('upfiletitle','upfiletitle'),35,255).'</label></p>'.
+     '<p class="one-file"><label for="upfilepriv" class="classic">'.form::checkbox(array('upfilepriv','upfilepriv'),1).' '.
+  __('Private').'</label></p>';
+
+     if (!$user_ui_enhanceduploader) {
+          echo
+          '<p class="one-file form-help info">'.__('To send several files at the same time, you can activate the enhanced uploader in').
+          ' <a href="preferences.php?tab=user-options">'.__('My preferences').'</a></p>';
+     }
+
+  echo
   '<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>'.
-    form::hidden(array('d'),$d).'</p>'.
+  '</div>';
+
+
+  echo
+  '<table role="presentation" class="table-files table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>'.
+  '<div>'.form::hidden(array('d'),$d).'</div>'.
   '</fieldset>'.
   '</form>'.

admin/style/jsUpload/style.css

@@ -1 @@
-.button {
+.enhanced_uploader .button {
   display: inline-block;
   *display: inline;
@@ -16 +16 @@
 }
 
-.button-add { 
+.enhanced_uploader .button-add {
   position: relative;
 }
 
-.button:hover {
+.enhanced_uploader .button:hover {
   background: #2373A8;
   border: 1px solid #2C8FD1;
 }
 
-.button-add input {
+.enhanced_uploader .button-add input {
   position: absolute;
   top: 0;
@@ -35 +35 @@
 }
 
-.progress .bar {
+.enhanced_uploader .progress .bar {
   background: transparent url('loader.png') repeat left top;
 }
 
-.upload-status { 
+.enhanced_uploader .upload-status {
   margin-top: 3px;
   width: 13px;
@@ -46 +46 @@
 }
 
-.upload-status.ok { 
+.enhanced_uploader .upload-status.ok {
   background: transparent url('../../images/check-on.png') no-repeat left top;
 }
 
-.upload-status.error { 
+.enhanced_uploader .upload-status.error {
   background: transparent url('../../images/check-off.png') no-repeat left top;
 }
+
+.enhanced_uploader .one-file {
+  display: none;
+}
+
+.table-files {
+  display: none;
+}
+
+.enhanced_uploader .table-files {
+  display: block;
+}
+
+label span.one-file {
+  display: inline;
+}

inc/admin/lib.dc.page.php

@@ -758 +758 @@
           "dotclear.jsUpload = {};\n".
           "dotclear.jsUpload.msg = {};\n".
+          self::jsVar('dotclear.msg.enhanced_uploader_activate',__('Temporarily activate enhanced uploader')).
+          self::jsVar('dotclear.msg.enhanced_uploader_disable',__('Temporarily disable enhanced uploader')).
           self::jsVar('dotclear.jsUpload.msg.limit_exceeded',__('Limit exceeded.')).
           self::jsVar('dotclear.jsUpload.msg.size_limit_exceeded',__('File size exceeds allowed limit.')).