X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Ftools%2Fmanage-marc-import.tmpl;h=ea0a5e5f4ff419e64679a9bfbcc4e12d017333c0;hb=438ed2333787a37101ce5476dbd656005ab17537;hp=9334934667cc0035412852fc31561c6976dd4eca;hpb=b01eb81b7a0f244441139f1df3ca23c6303bef21;p=srvgit

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 9334934667..ea0a5e5f4f 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
@@ -4,6 +4,7 @@
  &rsaquo; Batch <!-- TMPL_VAR name="import_batch_id" -->
 <!-- /TMPL_IF -->
 </title>
+<!-- TMPL_INCLUDE NAME="greybox.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="background-job.inc" -->
 </head>
@@ -32,25 +33,39 @@
  &rsaquo; Batch <!-- TMPL_VAR name="import_batch_id" -->
 <!-- /TMPL_IF -->
 </h1>
-
+<!-- TMPL_IF name="label_batch" -->
+<div class="alert">
+<p>Label batch created, with id: <!-- TMPL_VAR name="label_batch" --> </p>
+</div>
+<!-- /TMPL_IF -->
 <!-- TMPL_IF name="batch_info" -->
-<p><label>File name</label> <!-- TMPL_VAR name="file_name" --></p>
-<p><label>Comments</label> <!-- TMPL_VAR name="comments" --></p>
-<p><label>Staged</label> <!-- TMPL_VAR name="upload_timestamp" --></p>
-<p><label>Status</label> <!-- TMPL_VAR name="import_status" --></p>
-<p><label>Matching rule applied</label> 
+<fieldset class="rows">
+  <ul>
+    <li><label>File name</label> <!-- TMPL_VAR name="file_name" --></li>
+    <li><label>Comments</label> <!-- TMPL_VAR name="comments" --></li>
+    <li><label>Staged</label> <!-- TMPL_VAR name="upload_timestamp" --></li>
+    <li><label>Status</label> <!-- TMPL_VAR name="import_status" --></li>
+    <li><label>Matching rule applied</label> 
 <!-- TMPL_IF name="current_matcher_id" -->
   <!-- TMPL_VAR name="current_matcher_code" --> (<!-- TMPL_VAR name="current_matcher_description" -->)
 <!-- TMPL_ELSE -->
   No matching rule in effect
 <!-- /TMPL_IF -->
-</p>
+    </li>
+    <li><label>Action if matching record found</label> <!-- TMPL_VAR NAME="overlay_action" --></li>
+    <li><label>Action if no match found</label> <!-- TMPL_VAR NAME="nomatch_action" --></li>
+    <li><label>Item processing</label> <!-- TMPL_VAR NAME="item_action" --></li>
+  </ul>
+</fieldset>
 <!-- TMPL_IF name="can_commit" -->
 <div>
+  <fieldset class="rows">
   <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
     <input type="hidden" name="op" value="redo-matching" />
     <input type="hidden" name="import_batch_id" value="<!-- TMPL_VAR name="import_batch_id" -->" />
     <input type="hidden" name="current_matcher_id" value="<!-- TMPL_VAR name="current_matcher_id" -->" />
+    <ul>
+    <li><label for name="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> 
        <!-- TMPL_LOOP name="available_matchers" -->
@@ -65,11 +80,42 @@
           <!-- /TMPL_IF -->
        <!-- /TMPL_LOOP -->
     </select>
+    </li>
+    <li><label for="overlay_action">Action if matching record found</label>
+     <!-- TMPL_INCLUDE NAME="tools-overlay-action.inc" -->
+    </li>
+    <li><label for="overlay_action">Action if no match found</label>
+     <!-- TMPL_INCLUDE NAME="tools-nomatch-action.inc" -->
+    </li>
+    <li><label for="overlay_action">Item processing</label>
+     <!-- TMPL_INCLUDE NAME="tools-item-action.inc" -->
+    </li>
+    </ul>
     <input type="submit" class="button" value="Apply different matching rule" />
   </form>
+  <!-- TMPL_IF name="rematch_attempted" -->
+    <!-- TMPL_IF name="rematch_failed" -->
+      <p><span class="problem">Failed to apply different matching rule</span></p>
+    <!-- TMPL_ELSE -->
+      <p><span class="problem">Applied different matching rule.  Number of records matched now
+       <!-- TMPL_VAR name="num_with_matches" -->
+      </span></p>
+    <!-- /TMPL_IF -->
+  <!-- /TMPL_IF -->
+  <!-- TMPL_IF name="changed_overlay_action" -->
+      <p><span class="problem">Changed action if matching record found</span></p>
+  <!-- /TMPL_IF -->
+  <!-- TMPL_IF name="changed_nomatch_action" -->
+      <p><span class="problem">Changed action if no match found</span></p>
+  <!-- /TMPL_IF -->
+  <!-- TMPL_IF name="changed_item_action" -->
+      <p><span class="problem">Changed item processing option</span></p>
+  <!-- /TMPL_IF -->
+    </fieldset>
 </div>
 <!-- /TMPL_IF -->
 <div>
+  <fieldset class="rows">
   <!-- TMPL_IF name="can_commit" -->
   <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
     <input type="hidden" name="op" value="commit-batch" />
@@ -92,15 +138,16 @@
   <div id="jobstatus" style="display:none">Job progress: <span id="jobprogress">0</span>%</div>
   <div id="jobfailed" style="display:none"></div>
   <!-- /TMPL_IF -->
+  </fieldset>
 </div>
   <!-- TMPL_IF name="did_commit" -->
   <p><span class="problem">Completed import of records</span></p>
   <table>
   <tr><td>Number of records added</td><td><!-- TMPL_VAR name="num_added" --></td></tr>
   <tr><td>Number of records updated</td><td><!-- TMPL_VAR name="num_updated" --></td></tr>
+  <tr><td>Number of records ignored</td><td><!-- TMPL_VAR name="num_ignored" --></td></tr>
   <tr><td>Number of items added</td><td><!-- TMPL_VAR name="num_items_added" --></td></tr>
   <tr><td>Number of items ignored because of duplicate barcode</td><td><!-- TMPL_VAR name="num_items_errored" --></td></tr>
-  <tr><td>Number of records ignored</td><td><!-- TMPL_VAR name="num_ignored" --></td></tr>
   </table>
   <!-- /TMPL_IF -->
   <!-- TMPL_IF name="did_revert" -->
@@ -113,15 +160,6 @@
   <tr><td>Number of records ignored</td><td><!-- TMPL_VAR name="num_ignored" --></td></tr>
   </table>
   <!-- /TMPL_IF -->
-  <!-- TMPL_IF name="rematch_attempted" -->
-    <!-- TMPL_IF name="rematch_failed" -->
-      <p><span class="problem">Failed to apply different matching rule</span></p>
-    <!-- TMPL_ELSE -->
-      <p><span class="problem">Applied different matching rule.  Number of records matched now
-       <!-- TMPL_VAR name="num_with_matches" -->
-      </span></p>
-    <!-- /TMPL_IF -->
-  <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <br />
 
@@ -156,7 +194,7 @@ Page
     <td><!-- TMPL_VAR name="import_status" --></td>
     <td><!-- TMPL_VAR name="upload_timestamp" --></td>
     <td><!-- TMPL_VAR name="num_biblios" --></td>
-    <td><!-- TMPL_VAR name="num_items" --></td>
+    <td><!-- TMPL_VAR name="num_items" --><!-- TMPL_IF NAME="num_items" --><a href="<!-- TMPL_VAR name="script_name" -->?import_batch_id=<!-- TMPL_VAR name="import_batch_id" -->&op=create_labels">(Create Label Batch)</a><!-- /TMPL_IF --></td>
   </tr>
   <!-- /TMPL_LOOP -->
 </table>
@@ -196,7 +234,7 @@ Page
   </tr>
   <!-- TMPL_LOOP name="biblio_list" -->
   <tr>
-    <td><!-- TMPL_VAR name="record_sequence"--></td>
+    <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=<!-- TMPL_VAR name='import_record_id' -->" rel="gb_page_center[600,500]"><!-- TMPL_VAR name="record_sequence"--></a></td>
     <td><!-- TMPL_VAR name="citation"--></td>
     <td><!-- TMPL_VAR name="status"--></td>
     <td><!-- TMPL_VAR name="overlay_status"--></td>
@@ -225,7 +263,7 @@ Page
 
 </div>
 </div>
-<div class="yui-b">
+<div class="yui-b noprint">
 <!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
 </div>
 </div>