Index: trunk/kernel/admin_templates/incs/ajax.js
===================================================================
diff -u -r5302 -r5464
--- trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5302)
+++ trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5464)
@@ -1,3 +1,4 @@
+// Main AJAX classs
function Request() {}
Request.timeout = 5000; //5 seconds
@@ -178,4 +179,44 @@
}
}
return queryString;
-};
\ No newline at end of file
+};
+
+// AJAX ProgressBar classs
+function AjaxProgressBar($prefix, $url) {
+ this.Prefix = $prefix;
+ this.URL = $url;
+ this.BusyRequest = false;
+ this.Query();
+}
+
+AjaxProgressBar.prototype.Query = function() {
+ Request.makeRequest(this.URL, this.BusyRequest, '', this.successCallback, this.errorCallback, '', this);
+}
+
+AjaxProgressBar.prototype.successCallback = function($request, $params, $object) {
+ var $responce = $request.responseText;
+ if ($responce.match(/^#redirect#(.*)/)) {
+ $object.showProgress(100);
+ // redirect to external template requested
+ window.location.href = RegExp.$1;
+ return false;
+ }
+
+ $object.showProgress($responce);
+ $object.Query();
+}
+
+AjaxProgressBar.prototype.errorCallback = function($request, $params, $object) {
+ alert('AJAX ERROR: ' + Request.getErrorHtml($request));
+}
+
+AjaxProgressBar.prototype.showProgress = function ($percent) {
+ $percent = parseInt($percent);
+ var $display_div = document.getElementById('progress_display[' + this.Prefix + ']');
+ if ($display_div) {
+ $display_div.innerHTML = '(' + $percent + '%)';
+ }
+
+ document.getElementById('progress_done[' + this.Prefix + ']').style.width = $percent + '%';
+ document.getElementById('progress_left[' + this.Prefix + ']').style.width = (100 - $percent) + '%';
+}
\ No newline at end of file
Index: trunk/kernel/admin_templates/img/progress_left.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -r5373 -r5464
--- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 5373)
+++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 5464)
@@ -62,7 +62,7 @@
'categories_permissions'=> Array('prefixes' => Array('c', 'g_List'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Permissions!"),
'categories_custom' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"),
- 'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories! "),
+ 'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories! "),
'images_edit' => Array( 'prefixes' => Array('c', 'c-img'),
'new_status_labels' => Array('c-img'=>'!la_title_Adding_Image!'),
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -r5373 -r5464
--- trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 5373)
+++ trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 5464)
@@ -62,7 +62,7 @@
'categories_permissions'=> Array('prefixes' => Array('c', 'g_List'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Permissions!"),
'categories_custom' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"),
- 'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories! "),
+ 'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories! "),
'images_edit' => Array( 'prefixes' => Array('c', 'c-img'),
'new_status_labels' => Array('c-img'=>'!la_title_Adding_Image!'),
Index: trunk/kernel/admin_templates/img/progress_done.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -r5176 -r5464
--- trunk/core/admin_templates/categories/cache_updater.tpl (.../cache_updater.tpl) (revision 5176)
+++ trunk/core/admin_templates/categories/cache_updater.tpl (.../cache_updater.tpl) (revision 5464)
@@ -33,48 +33,11 @@
-
-
- |
-  |
-
-
+
+
+
Index: trunk/kernel/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r4996 -r5464
--- trunk/kernel/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 4996)
+++ trunk/kernel/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 5464)
@@ -315,4 +315,38 @@
|
-
\ No newline at end of file
+
+
+
+
+
+
+ 0% |
+
+
+
+
+  |
+
+
+  |
+
+
+
+ | ]" style="background: url(img/progress_done.gif);" align="left">
+ | ]" align="right">
+
+
+ |
+  |
+
+
+  |
+
+
+
+ |
+ 100% |
+
+
+
\ No newline at end of file
Index: trunk/kernel/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -r5176 -r5464
--- trunk/kernel/admin_templates/categories/cache_updater.tpl (.../cache_updater.tpl) (revision 5176)
+++ trunk/kernel/admin_templates/categories/cache_updater.tpl (.../cache_updater.tpl) (revision 5464)
@@ -33,48 +33,11 @@
-
-
- |
-  |
-
-
+
+
+
Index: trunk/kernel/admin_templates/incs/style.css
===================================================================
diff -u -r5041 -r5464
--- trunk/kernel/admin_templates/incs/style.css (.../style.css) (revision 5041)
+++ trunk/kernel/admin_templates/incs/style.css (.../style.css) (revision 5464)
@@ -579,3 +579,9 @@
display: none;
width: 100%;
}
+
+.progress-text {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ color: #414141;
+}
\ No newline at end of file