From e7cb4f0d7ca3637c9c7134864e423f7e142f9484 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 25 Feb 2010 14:39:08 -0500 Subject: [PATCH] Fix for Bug 4262, changing matching rule add big message box Fix includes a change to the format of the page to consolidate matching rule settings with matching rule controls. This reduces potential confusion from the placement of the message box. Assuming that matching rule settings and controls were displayed separately for clarity and control, I've added JavaScript which allows the user to change their mind after changing a selection (but before submitting). It's a new interaction which I hope is useful. --- .../prog/en/modules/tools/manage-marc-import.tmpl | 124 ++++++++++--------- 1 files changed, 65 insertions(+), 59 deletions(-) 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 4928d2c..9f11c66 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 @@ -7,10 +7,26 @@ + + #jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; } span.change-status { font-style:italic; color:#666; display:none; } @@ -59,62 +75,14 @@ -
-
    -
  1. File name
  2. -
  3. Comments (none)
  4. -
  5. Staged
  6. -
  7. Status
  8. -
  9. Matching rule applied - - () - - No matching rule in effect - -
  10. -
  11. Action if matching record found
  12. -
  13. Action if no match found
  14. -
  15. Item processing
  16. -
-
-
-
" method="post"> -
- - " /> - " /> -
    -
  1. - -
  2. -
  3. - -
  4. -
  5. - -
  6. -
  7. - -
  8. -
-
-
-
+
" method="post"> + +" /> +" /> + +
Failed to apply different matching rule
@@ -133,8 +101,46 @@
Changed item processing option
-
- + +
+
    +
  1. File name:
  2. +
  3. Comments: (none)
  4. +
  5. Staged:
  6. +
  7. Status:
  8. +
  9. + Changed. ResetMatching rule applied + () + + No matching rule in effect + +
  10. +
  11. + Changed. ResetAction if matching record found:
  12. + +
  13. + Changed. ResetAction if no match found:
  14. + +
  15. + Changed. ResetItem processing:
  16. +
+
+
+ +
" method="post"> @@ -142,7 +148,7 @@ " /> -
+
Job progress:
0%
@@ -263,7 +269,7 @@ Page - + -- 1.6.3.3