Changeset 3153:942a906c0986

Timestamp:

01/05/16 06:57:46 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

3154:5a75530f30db, 3155:c27a63c514e9

Message:

Media selection mode (single or multiple), first step

Location:

admin

Files:

• js/_media.js (modified) (1 diff)
• media.php (modified) (12 diffs)
• media_item.php (modified) (4 diffs)
• style/default.css (modified) (1 diff)

admin/js/_media.js

@@ -138 +138 @@
      });
 
-     $('#form-medias').submit(function() {
-          var count_checked = $('input[name="medias[]"]:checked', $(this)).length;
-          if (count_checked==0) {
+     $('#form-medias #delete_medias').click(function(e) {
+          var count_checked = $('input[name="medias[]"]:checked', $('#form-medias')).length;
+          if (count_checked == 0) {
+               e.preventDefault();
                return false;
           }
-
           return window.confirm(dotclear.msg.confirm_delete_medias.replace('%d',count_checked));
      });

admin/media.php

@@ -56 +56 @@
 }
 
-# Get query in any
+# Get query if any
 $q = isset($_REQUEST['q']) ? $_REQUEST['q'] : null;
 
@@ -83 +83 @@
 
 $popup = (integer) !empty($_REQUEST['popup']);
-
-$page_url_params = new ArrayObject(array('popup' => $popup,'post_id' => $post_id));
+$select = !empty($_REQUEST['select']) ? (integer)$_REQUEST['select'] : 0;  // 0 : none, 1 : single media, >1 : multiple medias
+
+$page_url_params = new ArrayObject(array('popup' => $popup,'select' => $select,'post_id' => $post_id));
 if ($d) {
      $page_url_params['d'] = $d;
@@ -474 +475 @@
 }
 
-if ($post_id) {
-     echo '<div class="form-note info"><p>'.sprintf(__('Choose a file to attach to entry %s by clicking on %s'),
-          '<a href="'.$core->getPostAdminURL($post_type,$post_id).'">'.html::escapeHTML($post_title).'</a>',
-          '<img src="images/plus.png" alt="'.__('Attach this file to entry').'" />');
+if ($select) {
+     // Select mode (popup or not)
+     echo '<div class="'.($popup ? 'form-note ' : '').'info"><p>';
+     if ($select == 1) {
+          echo sprintf(__('Select a file by clicking on %s'),'<img src="images/plus.png" alt="'.__('Select this file').'" />');
+     } else {
+          echo sprintf(__('Select files and click on <strong>%s</strong> button'),__('Choose selected medias'));
+     }
      if ($core_media_writable) {
           echo ' '.__('or').' '.sprintf('<a href="#fileupload">%s</a>',__('upload a new file'));
      }
      echo '</p></div>';
-}
-if ($popup) {
-     echo '<div class="info"><p>'.sprintf(__('Choose a file to insert into entry by clicking on %s'),
-          '<img src="images/plus.png" alt="'.__('Attach this file to entry').'" />');
-     if ($core_media_writable) {
-          echo ' '.__('or').' '.sprintf('<a href="#fileupload">%s</a>',__('upload a new file'));
-     }
-     echo '</p></div>';
+} else {
+     if ($post_id) {
+          echo '<div class="form-note info"><p>'.sprintf(__('Choose a file to attach to entry %s by clicking on %s'),
+               '<a href="'.$core->getPostAdminURL($post_type,$post_id).'">'.html::escapeHTML($post_title).'</a>',
+               '<img src="images/plus.png" alt="'.__('Attach this file to entry').'" />');
+          if ($core_media_writable) {
+               echo ' '.__('or').' '.sprintf('<a href="#fileupload">%s</a>',__('upload a new file'));
+          }
+          echo '</p></div>';
+     }
+     if ($popup) {
+          echo '<div class="info"><p>'.sprintf(__('Choose a file to insert into entry by clicking on %s'),
+               '<img src="images/plus.png" alt="'.__('Attach this file to entry').'" />');
+          if ($core_media_writable) {
+               echo ' '.__('or').' '.sprintf('<a href="#fileupload">%s</a>',__('upload a new file'));
+          }
+          echo '</p></div>';
+     }
 }
 
@@ -512 +527 @@
      '</p>';
 
-if (!$popup) {
+if (!$popup || $select > 1) {
+     // Checkboxes and action
      $fmt_form_media .=
-     '<div class="medias-delete%s">'.
+     '<div class="'.(!$popup ? 'medias-delete' : '').' '.($select > 1 ? 'medias-select' : '').'">'.
      '<p class="checkboxes-helpers"></p>'.
-     '<p><input type="submit" class="delete" name="delete_medias" value="'.__('Remove selected medias').'"/></p>'.
+     '<p>';
+     if ($select > 1) {
+          $fmt_form_media .=
+          '<input type="submit" class="select" id="select_medias" name="select_medias" value="'.__('Choose selected medias').'"/> ';
+     }
+     if (!$popup) {
+          $fmt_form_media .=
+          '<input type="submit" class="delete" id="delete_medias" name="delete_medias" value="'.__('Remove selected medias').'"/>';
+     }
+     $fmt_form_media .=
+     '</p>'.
      '</div>';
 }
@@ -531 +557 @@
      '<span class="form-note">'.__('Will search into media filename (including path), title and description').'</span>'.
      form::hidden(array('popup'),$popup).
+     form::hidden(array('select'),$select).
      form::hidden(array('plugin_id'),$plugin_id).
      form::hidden(array('post_id'),$post_id).
@@ -562 +589 @@
      '<input type="submit" value="'.__('OK').'" />'.
      form::hidden(array('popup'),$popup).
+     form::hidden(array('select'),$select).
      form::hidden(array('plugin_id'),$plugin_id).
      form::hidden(array('post_id'),$post_id).
@@ -746 +774 @@
 function mediaItemLine($f,$i,$query,$table=false)
 {
-     global $core, $page_url, $popup, $post_id, $plugin_id,$page_url_params;
+     global $core, $page_url, $popup, $select, $post_id, $plugin_id, $page_url_params;
 
      $fname = $f->basename;
@@ -754 +782 @@
 
      if ($f->d) {
-
+          // Folder
           $link = $core->adminurl->get('admin.media',array_merge($page_url_params,array('d' => html::sanitizeURL($f->relname) )));
           if ($f->parent) {
@@ -763 +791 @@
           }
      } else {
+          // Item
           $params = new ArrayObject(
                array(
@@ -768 +797 @@
                     'plugin_id' => $plugin_id,
                     'popup' => $popup,
+                    'select' => $select,
                     'post_id' => $post_id
                )
@@ -784 +814 @@
 
      $act = '';
-     if ($post_id && !$f->d) {
-          // Media attachment button
-          $act .=
-          '<a class="attach-media" title="'.__('Attach this file to entry').'" href="'.
-          $core->adminurl->get("admin.post.media", array('media_id' => $f->media_id, 'post_id' => $post_id,'attach' => 1)).
-          '">'.
-          '<img src="images/plus.png" alt="'.__('Attach this file to entry').'"/>'.
-          '</a>';
-     }
-     if ($popup && !$f->d) {
-          // Media insertion button
-          $act .= '<a href="'.$link.'"><img src="images/plus.png" alt="'.__('Insert this file into entry').'" '.
-          'title="'.__('Insert this file into entry').'" /></a> ';
+     if (!$f->d) {
+          if ($select > 0) {
+               if ($select == 1) {
+                    // Single media selection button
+                    $act .= '<a href="'.$link.'"><img src="images/plus.png" alt="'.__('Select this file').'" '.
+                    'title="'.__('Select this file').'" /></a> ';
+               } else {
+                    // Multiple media selection checkbox
+                    $act .= form::checkbox(array('medias[]', 'media_'.rawurlencode($file)),$file);
+               }
+          } else {
+               // Item
+               if ($post_id) {
+                    // Media attachment button
+                    $act .=
+                    '<a class="attach-media" title="'.__('Attach this file to entry').'" href="'.
+                    $core->adminurl->get("admin.post.media", array('media_id' => $f->media_id, 'post_id' => $post_id,'attach' => 1)).
+                    '">'.
+                    '<img src="images/plus.png" alt="'.__('Attach this file to entry').'"/>'.
+                    '</a>';
+               }
+               if ($popup) {
+                    // Media insertion button
+                    $act .= '<a href="'.$link.'"><img src="images/plus.png" alt="'.__('Insert this file into entry').'" '.
+                    'title="'.__('Insert this file into entry').'" /></a> ';
+               }
+          }
      }
      if ($f->del) {
           // Deletion button or checkbox
           if (!$popup && !$f->d) {
-               $act .= form::checkbox(array('medias[]', 'media_'.rawurlencode($file)),$file);
+               if ($select < 2) {
+                    // Already set for multiple media selection
+                    $act .= form::checkbox(array('medias[]', 'media_'.rawurlencode($file)),$file);
+               }
           } else {
                $act .= '<a class="media-remove" '.
@@ -813 +860 @@
      }
 
+     // Render markup
      if (!$table) {
           $res =

admin/media_item.php

@@ -29 +29 @@
 $file = null;
 $popup = (integer) !empty($_REQUEST['popup']);
+$select = !empty($_REQUEST['select']) ? (integer)$_REQUEST['select'] : 0;  // 0 : none, 1 : single media, >1 : multiple medias
 $plugin_id = isset($_REQUEST['plugin_id']) ? html::sanitizeURL($_REQUEST['plugin_id']) : '';
-$page_url_params = array('popup' => $popup,'post_id' => $post_id);
-$media_page_url_params = array('popup' => $popup,'post_id' => $post_id);
+$page_url_params = array('popup' => $popup,'select' => $select,'post_id' => $post_id);
+$media_page_url_params = array('popup' => $popup,'select' => $select,'post_id' => $post_id);
 
 if ($plugin_id != '') {
@@ -280 +281 @@
 $file_type = explode('/',$file->type);
 
+# Selection mode
+if ($select) {
+     // Let user choose thumbnail size if image
+     $media_desc = $file->media_title;
+
+     echo
+     '<div id="media-select" class="multi-part" title="'.__('Select media item').'">'.
+     '<h3>'.__('Select media item').'</h3>'.
+     '<form id="media-select-form" action="" method="get">';
+
+     $media_img_default_size = $core->blog->settings->system->media_img_default_size;
+     if ($media_img_default_size == '') {
+          $media_img_default_size = 'm';
+     }
+     $media_img_default_alignment = $core->blog->settings->system->media_img_default_alignment;
+     if ($media_img_default_alignment == '') {
+          $media_img_default_alignment = 'none';
+     }
+     $media_img_default_link = (boolean)$core->blog->settings->system->media_img_default_link;
+
+     if ($file->media_type == 'image')
+     {
+          $media_type = 'image';
+          $media_desc = dcGetImageTitle($file,
+               $core->blog->settings->system->media_img_title_pattern,
+               $core->blog->settings->system->media_img_use_dto_first,
+               $core->blog->settings->system->media_img_no_date_alone);
+          if ($media_desc == $file->basename) {
+               $media_desc = '';
+          }
+
+          echo
+          '<h3>'.__('Image size:').'</h3> ';
+
+          $s_checked = false;
+          echo '<p>';
+          foreach (array_reverse($file->media_thumb) as $s => $v) {
+               $s_checked = ($s == $media_img_default_size);
+               echo '<label class="classic">'.
+               form::radio(array('src'),html::escapeHTML($v),$s_checked).' '.
+               $core->media->thumb_sizes[$s][2].'</label><br /> ';
+          }
+          $s_checked = (!isset($file->media_thumb[$media_img_default_size]));
+          echo '<label class="classic">'.
+          form::radio(array('src'),$file->file_url,$s_checked).' '.__('original').'</label><br /> ';
+          echo '</p>';
+
+     } elseif ($file_type[0] == 'audio') {
+          $media_type = 'mp3';
+     } elseif ($file_type[0] == 'video') {
+          $media_type = 'flv';
+     } else {
+          $media_type = 'default';
+     }
+
+     echo
+     '<p>'.
+     '<a id="media-select-ok" class="button submit" href="#">'.__('Select').'</a> '.
+     '<a id="media-select-cancel" class="button" href="#">'.__('Cancel').'</a>'.
+     form::hidden(array('type'),html::escapeHTML($media_type)).
+     form::hidden(array('title'),html::escapeHTML($file->media_title)).
+     form::hidden(array('description'),html::escapeHTML($media_desc)).
+     form::hidden(array('url'),$file->file_url).
+     '</p>';
+
+     echo '</form>';
+     echo '</div>';
+}
+
 # Insertion popup
-if ($popup)
+if ($popup && !$select)
 {
      $media_desc = $file->media_title;
@@ -459 +529 @@
 }
 
-if ($popup) {
+if ($popup || $select) {
      echo
      '<div class="multi-part" title="'.__('Media details').'" id="media-details-tab">';
@@ -728 +798 @@
 echo
 '</div>';
-if ($popup) {
+if ($popup || $select) {
      echo
      '</div>';

admin/style/default.css

@@ -1956 +1956 @@
      border-bottom: none;
      }
-.medias-delete {
+.medias-delete, .medias-select {
      text-align: right;
      }