Changeset 28554

Timestamp:

May 28, 2014, 6:41:56 PM (10 years ago)

Author:

plg

Message:

feature 2616: better behavior at the end of upload (more like with uploadify, but no page reload)

Location:

trunk

Files:

• admin/themes/default/template/photos_add_direct.tpl (modified) (8 diffs)
• include/ws_functions/pwg.images.php (modified) (1 diff)

trunk/admin/themes/default/template/photos_add_direct.tpl

@@ +1 @@
+{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
 {combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'}
 {combine_script id='jquery.plupload' load='footer' require='jquery' path='themes/default/js/plugins/plupload/plupload.full.min.js'}
@@ -36 +37 @@
 jQuery('[data-add-album]').pwgAddAlbum({ cache: categoriesCache });
 
-var uploadify_path = '{$uploadify_path}';
-var upload_id = '{$upload_id}';
-var session_id = '{$session_id}';
 var pwg_token = '{$pwg_token}';
-var buttonText = "{'Select files'|@translate}";
-var sizeLimit = Math.round({$upload_max_filesize} / 1024); /* in KBytes */
-
-var noAlbum_message = "{'Select an album'|translate}";
+var photosUploaded_label = "{'%d photos uploaded'|translate}";
+var batch_Label = "{'Manage this set of %d photos'|translate}";
+var albumSummary_label = "{'Album "%s" now contains %d photos'|translate|escape}";
+var uploadedPhotos = [];
+var uploadCategory = null;
 
 {literal}
@@ -95 +94 @@
         console.log('[BeforeUpload]', file);
 
+        // no more change on category/level
+        jQuery("select[name=level]").attr("disabled", "disabled");
+
         // You can override settings before the file is uploaded
         // up.setOption('url', 'upload.php?id=' + file.id);
@@ -122 +124 @@
         jQuery("#uploadedPhotos").prepend(html);
 
-        up.removeFile(file);
+        // do not remove file, or it will reset the progress bar :-/
+        // up.removeFile(file);
+        uploadedPhotos.push(parseInt(data.result.image_id));
+        uploadCategory = data.result.category;
+      },
+
+      UploadComplete: function(up, files) {
+        // Called when all files are either uploaded or failed
+        console.log('[UploadComplete]');
+
+        jQuery(".selectAlbum, .selectFiles, #permissions, .showFieldset").hide();
+
+        jQuery(".infos").append('<ul><li>'+sprintf(photosUploaded_label, uploadedPhotos.length)+'</li></ul>');
+
+        html = sprintf(
+          albumSummary_label,
+          '<a href="admin.php?page=album-'+uploadCategory.id+'">'+uploadCategory.label+'</a>',
+          parseInt(uploadCategory.nb_photos)
+        );
+
+        jQuery(".infos ul").append('<li>'+html+'</li>');
+
+        jQuery(".infos").show();
+
+        // TODO: use a new method pwg.caddie.empty +
+        // pwg.caddie.add(uploadedPhotos) instead of relying on huge GET parameter
+        // (and remove useless code from admin/photos_add_direct.php)
+
+        jQuery(".batchLink").attr("href", "admin.php?page=photos_add&section=direct&batch="+uploadedPhotos.join(","));
+        jQuery(".batchLink").html(sprintf(batch_Label, uploadedPhotos.length));
+
+        jQuery(".afterUploadActions").show();
       }
     }
@@ -137 +170 @@
 <div id="photosAddContent">
 
-{*
-<div class="infos">
-  <ul>
-    <li>%d photos added..</li>
-  </ul>
-</div>
-*}
+<div class="infos" style="display:none"></div>
+
+<p class="afterUploadActions" style="margin:10px; display:none;"><a class="batchLink"></a> | <a href="">{'Add another set of photos'|@translate}</a></p>
 
 {if count($setup_errors) > 0}
@@ -167 +196 @@
 
 
-{if !empty($thumbnails)}
-<fieldset>
-  <legend>{'Uploaded Photos'|@translate}</legend>
-  <div>
-  {foreach from=$thumbnails item=thumbnail}
-    <a href="{$thumbnail.link}" class="externalLink">
-      <img src="{$thumbnail.src}" alt="{$thumbnail.file}" title="{$thumbnail.title}" class="thumbnail">
-    </a>
-  {/foreach}
-  </div>
-  <p id="batchLink"><a href="{$batch_link}">{$batch_label}</a></p>
-</fieldset>
-<p style="margin:10px"><a href="{$another_upload_link}">{'Add another set of photos'|@translate}</a></p>
-{else}
-
 <form id="uploadForm" enctype="multipart/form-data" method="post" action="{$form_action}">
-{if $upload_mode eq 'multiple'}
-    <input name="upload_id" value="{$upload_id}" type="hidden">
-{/if}
-
-    <fieldset>
+    <fieldset class="selectAlbum">
       <legend>{'Drop into album'|@translate}</legend>
 
@@ -231 +241 @@
 </form>
 
-<div id="uploadProgress" style="display:none">
-{'Photo %s of %s'|@translate:'<span id="progressCurrent">1</span>':'<span id="progressMax">10</span>'}
-<br>
-<div id="progressbar"></div>
-</div>
-
 <fieldset style="display:none">
   <legend>{'Uploaded Photos'|@translate}</legend>
@@ -242 +246 @@
 </fieldset>
 
-{/if} {* empty($thumbnails) *}
 {/if} {* $setup_errors *}
 

trunk/include/ws_functions/pwg.images.php

@@ -1366 +1366 @@
     $image_infos = pwg_db_fetch_assoc(pwg_query($query));
 
+    $query = '
+SELECT
+    COUNT(*) AS nb_photos
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE category_id = '.$params['category'][0].'
+;';
+    $category_infos = pwg_db_fetch_assoc(pwg_query($query));
+
+    $category_name = get_cat_display_name_from_id($params['category'][0], null);
+    
     return array(
       'image_id' => $image_id,
       'src' => DerivativeImage::thumb_url($image_infos),
       'name' => $image_infos['name'],
+      'category' => array(
+        'id' => $params['category'][0],
+        'nb_photos' => $category_infos['nb_photos'],
+        'label' => $category_name,
+        )
       );
   }