5 files changed, 25 insertions, 6 deletions
diff --git a/admin/themes/default/js/batchManagerGlobal.js b/admin/themes/default/js/batchManagerGlobal.js
index 5fd694823..50fadb1f1 100644
--- a/admin/themes/default/js/batchManagerGlobal.js
+++ b/admin/themes/default/js/batchManagerGlobal.js
@@ -95,7 +95,7 @@ jQuery(document).ready(function() {
 	$('ul.thumbnails').enableShiftClick();
 });
 
-jQuery("a.preview-box").colorbox();
+jQuery("a.preview-box").colorbox( {photo: true} );
 
 jQuery('.thumbnails img').tipTip({
 	'delay' : 0,
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index d4e560aa7..085a9bd63 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -29,7 +29,9 @@ jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
 });
 
 {* <!-- THUMBNAILS --> *}
-jQuery("a.preview-box").colorbox();
+jQuery("a.preview-box").colorbox( {
+	photo: true
+});
 }());
 {/footer_script}
 
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 850cb2277..ad9e80b07 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -1,8 +1,9 @@
 {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"}
 {combine_css path="themes/default/js/plugins/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css"}
@@ -20,6 +21,8 @@
 {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}
 {* <!-- CATEGORIES --> *}
 var categoriesCache = new CategoriesCache({
@@ -44,6 +47,13 @@ jQuery('[data-add-album]').pwgAddAlbum({
   }
 });
 
+Piecon.setOptions({
+  color: '#ff7700',
+  background: '#bbb',
+  shadow: '#fff',
+  fallback: 'force'
+});
+
 var pwg_token = '{$pwg_token}';
 var photosUploaded_label = "{'%d photos uploaded'|translate}";
 var batch_Label = "{'Manage this set of %d photos'|translate}";
@@ -118,6 +128,7 @@ jQuery(document).ready(function(){
       
       UploadProgress: function(up, file) {
         jQuery('#uploadingActions .progressbar').width(up.total.percent+'%');
+        Piecon.setProgress(up.total.percent);
       },
       
       BeforeUpload: function(up, file) {
@@ -173,6 +184,8 @@ jQuery(document).ready(function(){
       UploadComplete: function(up, files) {
         // Called when all files are either uploaded or failed
         //console.log('[UploadComplete]');
+        
+        Piecon.reset();
 
         jQuery(".selectAlbum, .selectFiles, #permissions, .showFieldset").hide();
 
@@ -215,7 +228,7 @@ jQuery(document).ready(function(){
 
 <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>
+<p class="afterUploadActions" style="margin:10px; display:none;"><a class="batchLink"></a> | <a href="admin.php?page=photos_add">{'Add another set of photos'|@translate}</a></p>
 
 {if count($setup_errors) > 0}
 <div class="errors">
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 76b5e14dc..aeba2dd6f 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -38,7 +38,9 @@ jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
 });
 
 {* <!-- THUMBNAILS --> *}
-jQuery("a.preview-box").colorbox();
+jQuery("a.preview-box").colorbox({
+	photo: true
+});
 }());
 {/footer_script}
 
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index c436bd25b..26c2a6591 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -358,4 +358,6 @@ table.qsearch_help_table td {
 	border-color: #444;
 }
 
-.font-checkbox [class*=icon-check]:before { color:#aaa; }
-\ No newline at end of file
+.font-checkbox [class*=icon-check]:before { color:#aaa; }
+
+#cboxLoadedContent { background-color:#222 !important; }
+\ No newline at end of file