Changeset 1160:ce52e19259b9 for admin/media.php

Timestamp:

06/21/13 21:47:02 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Add cancel button (for list and for each item)
Fix issue when adding with ajax new uploaded media

File:

• admin/media.php (modified) (6 diffs)

admin/media.php

@@ -151 +151 @@
       $message['files'][] = array('name' => $upfile['name'],
                                   'size' => $upfile['size'],
-                                  'html' => mediaItemLine($core->media->getFile($new_file_id), count($dir['files']))
+                                  'html' => mediaItemLine($core->media->getFile($new_file_id), 1)
                                   );
     } catch (Exception $e) {
@@ -284 +284 @@
 
 $items = array_values(array_merge($dir['dirs'],$dir['files']));
+echo '<div class="media-list">';
 if (count($items) == 0)
 {
@@ -303 +304 @@
      '</form>'.
      
-     '<div class="media-list">'.
      '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
      
@@ -312 +312 @@
      
      echo
-     '<p class="clear">'.__('Page(s)').' : '.$pager->getLinks().'</p>'.
-     '</div>';
-}
-
+     '<p class="clear">'.__('Page(s)').' : '.$pager->getLinks().'</p>';
+}
+echo
+  '<p class="clear"></p>'.
+  '</div>';
 
 if ($core_media_writable)
 {
-     echo '<div class="two-cols">';
-     
-     if ($user_ui_enhanceduploader) {
+  echo '<div class="two-cols">';
+     
+  if ($user_ui_enhanceduploader) {
     echo
       '<div class="col enhanced_uploader">';
@@ -338 +339 @@
   echo
   '<div class="fileupload-buttonbar">'.
-  '<label class="button-add button" for="upfile">'.__('Add files').
+  '<label class="button add" for="upfile"><span>'.__('Add files').'</span>'.
   '<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).'" />'.
@@ -345 +346 @@
 
   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).' '.
+  '<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>';
-     }
+  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
+  '<button type="reset" class="button cancel"><span>'.__('Cancel').'</span></button>'.
   '<input class="button start" type="submit" value="'.__('Send').'"/>'.
   '</div>';
-
 
   echo