Attachment 1962 Details for Bug 4262 – Proposed fix

[patch] Proposed fix

0001-Fix-for-Bug-4262-changing-matching-rule-add-big-mess.patch (text/plain), 10.17 KB, created by Chris Cormack on 2010-03-02 19:24:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2010-03-02 19:24:00 UTC

Size: 10.17 KB

patch

obsolete

>From e7cb4f0d7ca3637c9c7134864e423f7e142f9484 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 @@
> 
> 
> 
>+<script type="text/JavaScript" language="JavaScript">
>+//<![CDATA[
>+$(document).ready(function(){
>+  $("#staged-record-matching-rules select").change(function(){
>+      var str = $(this).attr("id");
>+      $("#reset_"+str).parent().show();
>+  });
>+  $("a.reset").click(function(){
>+      var str = $(this).attr("id");
>+      str = str.replace("reset_","")
>+      $("#"+str+" option[selected='selected']").attr("selected","selected");
>+      $(this).parent().hide();
>+  });
>+});
>+//]]>
>+</script>
> <style type="text/css">
> 	#jobpanel,#jobstatus,#jobfailed { display : none; }
> 	#jobstatus { margin:.4em; }
>-	#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; }</style>
>+	#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; }</style>
> </head>
> <body>
> 
>@@ -59,62 +75,14 @@
> 
> 
> 
>-<fieldset class="rows">
>-  <ol>
>-    <li><span class="label">File name</span> </li>
>-    <li><span class="label">Comments</span> (none)</li>
>-    <li><span class="label">Staged</span> </li>
>-    <li><span class="label">Status</span> </li>
>-    <li><span class="label">Matching rule applied</span> 
>-
>-   ()
>-
>-  No matching rule in effect
>-
>-    </li>
>-    <li><span class="label">Action if matching record found</span> </li>
>-    <li><span class="label">Action if no match found</span> </li>
>-    <li><span class="label">Item processing</span> </li>
>-  </ol>
>-</fieldset>
> 
> 
>-<div id="matchingrules">
>-  <form action="" method="post">
>-  <fieldset class="rows">
>-    <input type="hidden" name="op" value="redo-matching" />
>-    <input type="hidden" name="import_batch_id" value="" />
>-    <input type="hidden" name="current_matcher_id" value="" />
>-    <ol>
>-    <li><label for="new_matcher_id">New matching rule</label>
>-    <select name="new_matcher_id" id="new_matcher_id">
>-       <option value="">Do not look for matching records</option> 
>-       
>-          
>-          <option value="" selected="selected">
>-              ()
>-          </option>
>-          
>-          <option value="">
>-             ()
>-          </option>
>-          
>-       
>-    </select>
>-    </li>
>-    <li><label for="overlay_action">Action if matching record found</label>
>-     
>-    </li>
>-    <li><label for="overlay_action">Action if no match found</label>
>-     
>-    </li>
>-    <li><label for="overlay_action">Item processing</label>
>-     
>-    </li>
>-    </ol>
>-    <fieldset class="action"><input type="submit" class="button" value="Apply different matching rule" /></fieldset>
>-    </fieldset>
>-  </form>
>+<form action="" method="post">
>+<input type="hidden" name="op" value="redo-matching" />
>+<input type="hidden" name="import_batch_id" value="" />
>+<input type="hidden" name="current_matcher_id" value="" />
>+
>+
>   
>     
>       <div class="dialog alert">Failed to apply different matching rule</div>
>@@ -133,8 +101,46 @@
>   
>       <div class="dialog message">Changed item processing option</div>
>   
>-</div>
>-
>+
>+<fieldset class="rows" id="staged-record-matching-rules">
>+  <ol>
>+    <li><span class="label">File name:</span> </li>
>+    <li><span class="label">Comments:</span> (none)</li>
>+    <li><span class="label">Staged:</span> </li>
>+    <li><span class="label">Status:</span> </li>
>+    <li> 
>+<label for="new_matcher_id">Matching rule applied:</label><select name="new_matcher_id" id="new_matcher_id">
>+       <option value="">Do not look for matching records</option> 
>+       
>+          
>+          <option value="" selected="selected">
>+              ()
>+          </option>
>+          
>+          <option value="">
>+             ()
>+          </option>
>+          
>+       
>+    </select> <span class="change-status">Changed. <a href="#" class="reset" id="reset_new_matcher_id">Reset</a></span><span class="label">Matching rule applied</span>
>+   ()
>+
>+  No matching rule in effect
>+
>+    </li>
>+    <li> <label for="overlay_action">Action if matching record found:</label>
>+      <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span><span class="label">Action if matching record found:</span></li>
>+     
>+    <li><label for="nomatch_action">Action if no match found:</label>
>+      <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span><span class="label">Action if no match found:</span></li>
>+    
>+    <li><label for="item_action">Item processing:</label>
>+      <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span><span class="label">Item processing:</span></li>
>+  </ol>
>+<fieldset class="action"><input type="submit" value="Apply different matching rules" class="button" /></fieldset></form>
>+</fieldset>
>+
>+
> <div>
>   
>   <form action="" method="post">
>@@ -142,7 +148,7 @@
>     <input type="hidden" name="runinbackground" value="" />
>     <input type="hidden" name="completedJobID" value="" />
>     <input type="hidden" name="import_batch_id" value="" />
>-    <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Import into catalog" onclick="return submitBackgroundJob(this.form);" /></fieldset>
>+    <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" onclick="return submitBackgroundJob(this.form);" /></fieldset>
>   </form>
>   <div id="jobpanel"><div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
>      <div id="jobfailed"></div></div>
>@@ -263,7 +269,7 @@ Page
> 
>   </tr>
>   
>-  <tr>
>+  <tr class="highlight"><tr>
>     <td></td>
>     <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=" rel="gb_page_center[600,500]"></a></td>
>     <td></td>
>-- 
>1.6.3.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 4262: 1961 | 1962 | 1963