Changeset 12759

Timestamp:

12/17/11 19:42:14 (17 months ago)

Author:

patdenice

Message:

Add a cancel button

Location:

extensions/GThumb

Files:

• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• template/admin.tpl (modified) (5 diffs)

extensions/GThumb/language/en_UK/plugin.lang.php

@@ -12 +12 @@
 $lang['Cache have been generated'] = 'Cache have been generated';
 $lang['Pre-cache thumbnails'] = 'Pre-cache thumbnails';
+$lang['Delete images in GThumb+ cache.'] = 'Delete images in GThumb+ cache.';
+$lang['Finds images that have not been cached and creates the cached version.'] = 'Finds images that have not been cached and creates the cached version.';
 
 ?>

extensions/GThumb/language/fr_FR/plugin.lang.php

@@ -12 +12 @@
 $lang['Cache have been generated'] = 'Le cache a été généré';
 $lang['Pre-cache thumbnails'] = 'Mettre en cache les miniatures';
+$lang['Delete images in GThumb+ cache.'] = 'Efface les images du cache de GThumb+.';
+$lang['Finds images that have not been cached and creates the cached version.'] = "Met en cache les images qui n'ont pas encore été crées.";
 
 ?>

extensions/GThumb/template/admin.tpl

@@ -54 +54 @@
 <p id="cache_data">&nbsp;</p>
 <p id="GThumbAction">
-  <button onclick="GThumb.deletecache();">{'Purge thumbnails cache'|@translate}</button>
-  <button onclick="GThumb.generatecache();">{'Pre-cache thumbnails'|@translate}</button>
+  <button onclick="GThumb.deletecache();" title="{'Delete images in GThumb+ cache.'|@translate}">{'Purge thumbnails cache'|@translate}</button>
+  <button onclick="GThumb.generatecache();" title="{'Finds images that have not been cached and creates the cached version.'|@translate}">{'Pre-cache thumbnails'|@translate}</button>
 </p>
 <div id="GThumbProgressbar" style="display:none;">
   {'Generating cache, please wait...'|@translate}<br>
   <div id="progressbar"></div>
+  <p><button onclick="GThumb.abort();">{'Cacncel'|@translate}</button></p>
 </div>
 </fieldset>
@@ -102 +103 @@
 
   generatecache: function() {
-    jQuery("#progressbar").progressbar({value: 0});
+    GThumb.total = nb_files;
+    GThumb.done = nb_files;
+    jQuery("#progressbar").progressbar({value: 1});
     jQuery.ajax({
       url: 'admin.php?page=plugin-GThumb&generatecache=request',
@@ -109 +112 @@
         if (data.length > 0) {
           jQuery("#GThumbProgressbar, #GThumbAction").toggle();
-          GThumb.total = data.length;
+          GThumb.total = data.length + GThumb.done;
+          jQuery("#progressbar").progressbar({value: Math.ceil(GThumb.done * 100 / GThumb.total)});
           for (i=0;i<data.length;i++) {
             GThumb.queue.add({
@@ -142 +146 @@
   progressbar: function() {
     jQuery( "#progressbar" ).progressbar({
-      value: Math.round(++GThumb.done * 100 / GThumb.total)
+      value: Math.ceil(++GThumb.done * 100 / GThumb.total)
     });
     if (GThumb.done == GThumb.total) {
       window.location = 'admin.php?page=plugin-GThumb&generatecache=complete';
     }
+  },
+
+  abort: function() {
+    GThumb.queue.clear();
+    GThumb.queue.abort();
+    jQuery("#GThumbProgressbar, #GThumbAction").toggle();
   }
 };
@@ -169 +179 @@
 
 updateCacheSizeAndFiles();
+
+jQuery('#GThumbAction button').tipTip({'delay' : 0, 'fadeIn' : 200, 'fadeOut' : 200});
 {/literal}{/footer_script}