From bb3d3afe6e7cb4639bdd5e915486868181d0cd3d Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Tue, 28 Oct 2008 23:29:37 +0100 Subject: [PATCH] Corrections to manage marc import interface, including fix for inaccurate progress bar. Signed-off-by: Galen Charlton --- .../prog/en/includes/background-job.inc | 4 +++- .../prog/en/includes/file-upload.inc | 4 +++- .../en/modules/tools/manage-marc-import.tmpl | 18 ++++++++++-------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc index cfa9e94999..8272fe93a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc @@ -15,7 +15,9 @@ if (json.job_status == 'completed') { percentage = 100; } - $("#jobprogress").text(percentage); + var bgproperty = (parseInt(percentage)*2-300)+"px 0px"; + $("#jobprogress").css("background-position",bgproperty); + $("#jobprogresspercent").text(percentage); if (percentage == 100) { clearInterval(backgroundJobProgressTimer); // just in case form submission fails completeJob(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc index cd18f0b118..a2f7328e27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc @@ -14,7 +14,9 @@ inFileUploadProgressTimer = true; $.getJSON("/cgi-bin/koha/tools/upload-file-progress.pl", function(json) { if (!fileUploadProgressTimerCanceled) { - $("#fileuploadprogress").text(json.progress); + var bgproperty = (parseInt(json.progress)*2-300)+"px 0px"; + $("#fileuploadprogress").css("background-position",bgproperty); + $("#fileuploadpercent").text(json.progress); } inFileUploadProgressTimer = false; }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl index 45e0e4a5de..faeb8e5af8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl @@ -10,7 +10,7 @@ + #jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; } @@ -38,7 +38,7 @@ -

Label batch created, with id:

@@ -69,6 +69,7 @@

Item processing