From 96c29c707ffc4a6e1e6f44f15a627f9c9a1addae Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 2 Oct 2008 11:23:49 -0500 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 | 2 +- .../prog/en/includes/file-upload.inc | 2 +- .../en/modules/tools/manage-marc-import.tmpl | 18 ++++++++++-------- 3 files changed, 12 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 28b76a6997..3cfe0294c7 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,7 @@ if (json.job_status == 'completed') { percentage = 100; } - var bgproperty = (parseInt(percentage)-300)+"px 0px"; + var bgproperty = (parseInt(percentage)*2-300)+"px 0px"; $("#jobprogress").css("background-position",bgproperty); $("#jobprogresspercent").text(percentage); 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 8dd2c47af7..71f02d86d7 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,7 @@ inFileUploadProgressTimer = true; $.getJSON("/cgi-bin/koha/tools/upload-file-progress.pl", function(json) { if (!fileUploadProgressTimerCanceled) { - var bgproperty = (parseInt(json.progress)-300)+"px 0px"; + var bgproperty = (parseInt(json.progress)*2-300)+"px 0px"; $("#fileuploadprogress").css("background-position",bgproperty); $("#fileuploadpercent").text(json.progress); } 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