Changeset 30766 for trunk/admin

Timestamp:

Dec 16, 2014, 1:12:54 PM (10 years ago)

Author:

mistic100

Message:

Feature 3185 : Add upload progress indicator with Piecon

File:

• trunk/admin/themes/default/template/photos_add_direct.tpl (modified) (5 diffs)

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

@@ -1 +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'}
 {combine_script id='jquery.plupload.queue' load='footer' require='jquery' path='themes/default/js/plugins/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js'}
-{combine_script id='jquery.ui.progressbar' load='footer'}
 
 {combine_css path="themes/default/js/plugins/jquery.jgrowl.css"}
@@ -20 +21 @@
 {combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
+
+{combine_script id='piecon' load='footer' path='themes/default/js/plugins/piecon.min.js'}
 
 {footer_script}
@@ -43 +46 @@
     jQuery("#albumSelection, .selectFiles, .showFieldset").show();
   }
+});
+
+Piecon.setOptions({
+  color: '#ff7700',
+  background: '#bbb',
+  shadow: '#fff',
+  fallback: 'force'
 });
 
@@ -119 +129 @@
       UploadProgress: function(up, file) {
         jQuery('#uploadingActions .progressbar').width(up.total.percent+'%');
+        Piecon.setProgress(up.total.percent);
       },
       
@@ -174 +185 @@
         // Called when all files are either uploaded or failed
         //console.log('[UploadComplete]');
+        
+        Piecon.reset();
 
         jQuery(".selectAlbum, .selectFiles, #permissions, .showFieldset").hide();