Index: trunk/admin/install/langpacks/english.lang =================================================================== diff -u -N -r5529 -r5544 --- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 5529) +++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 5544) @@ -273,7 +273,6 @@ U3VnZ2VzdCB0byBhIGZyaWVuZA== VXNlciB1bnN1YnNjcmliZWQ= VmFsaWRhdGUgVXNlcg== - QW4gZXJyb3IgaGFzIG9jY3VyZWQgZHVyaW5nIGV4cG9ydC4= RmllbGQ= RGlzcGxheSBPcmRlcg== QWRkcmVzcyBMaW5l @@ -402,7 +401,6 @@ VGhpcyBoZWxwIHNlY3Rpb24gZG9lcyBub3QgeWV0IGV4aXN0LCBpdCdzIGNvbWluZyBzb29uIQ== aHRtbA== SUQgRmllbGQ= - QW4gZXJyb3IgaGFzIG9jY3VyZWQgZHVyaW5nIGltcG9ydC4= SW1wb3J0aW5nIEVtYWlsIEV2ZW50cyAuLi4= SW1wb3J0aW5nIExhbmd1YWdlcyAuLi4= SW1wb3J0aW5nIFBocmFzZXMgLi4u @@ -420,7 +418,6 @@ S0I= TGFuZ3VhZ2U= SW1wb3J0IHByb2dyZXNz - TGFzdCBSZXNwb25jZQ== TGFzdCBVcGRhdGVk RGF0ZQ== TGluayBEZXNjcmlwdGlvbg== Index: trunk/kernel/admin_templates/incs/export.js =================================================================== diff -u -N --- trunk/kernel/admin_templates/incs/export.js (revision 5431) +++ trunk/kernel/admin_templates/incs/export.js (revision 0) @@ -1,86 +0,0 @@ -var $http_request = getXMLHTTPObject(); -var $last_responce = new Date(); - -function formatNumber($number, $digits_count) -{ - return parseInt($number) < Math.pow(10, $digits_count - 1) ? str_repeat('0', $digits_count - 1) + $number : $number; -} - -function formatDate($date) -{ - var $hour = formatNumber($date.getHours(), 2); - var $minute = formatNumber($date.getMinutes(), 2); - var $second = formatNumber($date.getSeconds(), 2); - return $hour + ':' + $minute + ':' + $second; -} - -function getSeconds($from_date, $to_date) -{ - var $from_seconds = $from_date.getSeconds() + $from_date.getMinutes() * 60 + $from_date.getHours() * 3600; - var $to_seconds = $to_date.getSeconds() + $to_date.getMinutes() * 60 + $to_date.getHours() * 3600; - return $to_seconds - $from_seconds; -} - -var $aborting = false; -function queryProgress($url, $responce_func) -{ - if ($http_request && $http_request.readyState != 0) { - $aborting = true; - $http_request.abort(); - $aborting = false; - } - - $http_request.open('POST', $url, true); - $http_request.setRequestHeader("referer", $url); - $http_request.onreadystatechange = function() { processExportResponce($url, $responce_func); }; - $http_request.send('is_xml=1'); - $last_responce = new Date(); -} - -function setProgress($percent) -{ - $percent = parseInt($percent); - document.getElementById('percent_done').style.width = $percent + '%'; - document.getElementById('percent_left').style.width = (100 - $percent) + '%'; - document.getElementById('progress_display').innerHTML = $percent; - document.getElementById('progress_time').innerHTML = '[' + $phrase_LastResponce + ': ' + formatDate($last_responce) + ']'; -} - -function processExportResponce($url, $responce_func) -{ -// alert('processExportResponce ready: '+$http_request.readyState); - if ($aborting) return; - if ($http_request.readyState == 4) { - if ($http_request.status == 200) { -// alert('readyState: '+$http_request.readyState+' status: '+$http_request.status); - var $progress = parseFloat($http_request.responseText); -// alert('progress from xml: '+$http_request.responseText+'; type: '+typeof($http_request.responseText)); - if ($progress) { - setProgress($progress); - if ($progress < 100) { - // proceed to next import step - //alert('ANOTHER abort'); - //$http_request.abort(); - //alert('After ANOTHER Abort: readyState: '+$http_request.readyState+' status: '+$http_request.status); - setTimeout( function() { -// alert('quering after timeout'); - queryProgress($url, $responce_func); - }, 500) - } - else { - // proceed to finish screen - window.location.href = $finish_template; - } - } - else { -// alert('progress: '+$progress+' ('+$http_request.responseText+')'); - if (typeof($Debugger) != 'undefined') { - alert('DEBUG_MODE: error in ajax responce' + "\n" + $http_request.responseText); - } - else { - alert($phrase_ResponceError); - } - } - } - } -} \ No newline at end of file