Continuing reformatting of returns.tmpl; Correcting javascript error in request.tmpl.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 16d438f..fba7874 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -462,8 +462,8 @@ ul.toolbar li {
 
 div.message {
    border : 1px solid #6699CC;
-       width : 33%;
-       margin : 1em;
+       width : 75%;
+       margin : 1em auto;
        padding : .5em;
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
new file mode 100644 (file)
index 0000000..728f315
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -0,0 +1,97 @@
+
+<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Circulation Resident Search Box -->
+
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class=\"sample-result\">",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+//]]>
+</script><!-- /TMPL_IF -->
+
+<div id="header_search">
+
+<div id="circ_search" class="residentsearch">
+    <p class="tip">Enter patron card number or partial name:</p>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit" />
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+       <!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+       <!-- /TMPL_IF -->
+    </form>
+</div>  
+
+<div id="checkin_search" class="residentsearch">
+    <p class="tip">Scan a barcode to check in:</p>
+    <form method="post" action="/cgi-bin/koha/circ/returns.pl">
+        <input name="barcode" id="ret_barcode" size="40" maxlength="14" />
+        <input value="Submit" type="submit" />
+    </form>
+</div>
+
+<div id="catalog_search" class="residentsearch">
+    <p class="tip">Enter search keywords:</p>
+    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+        <input type="text" name="q" id="search-form" size="40" />
+        <input type="submit" class="form-submit" value="Submit"/>
+    </form>
+</div>
+
+<ul>
+    <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+    <li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search" class="tabs-selected">Check In</a></li>
+    <li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
+</ul>   
+
+</div>
+
+<!-- End Circulation Resident Search Box -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index e395970..8da2ec7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -18,44 +18,41 @@
 
 <div class="yui-g">
 <!-- case of a mistake in transfer loop -->
-<!-- TMPL_IF Name="WrongTransfer" --><div class="dialog"><div><div class="confirm">  <h3 class="problem">This item should not be in this library !</h3>
-<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a><br />
-Hold for: <!-- TMPL_IF Name="wborcnum"-->
-        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="wborcnum" --></a></li>
+<!-- TMPL_IF Name="WrongTransfer" --><div class="message">  <h3 class="problem">Please Transfer <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a> to <!-- TMPL_VAR Name="TransferWaitingAt" --></h3>
+<br />
+<!-- TMPL_IF Name="wborcnum"--><h5>Hold for:</h5> 
+        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"></a> (<!-- TMPL_VAR Name="wborcnum" -->)</li>
         <li><!-- TMPL_VAR Name="wborsurname" -->, <!-- TMPL_VAR Name="wborfirstname" --> </li>
-        <li><!-- TMPL_VAR Name="wboraddress" --><br />
-               <!-- TMPL_VAR NAME="wboraddress2" -->
+        <li><!-- TMPL_VAR Name="wboraddress" --><!-- TMPL_IF NAME="wboraddress2" --><br />
+               <!-- TMPL_VAR NAME="wboraddress2" --><br /><!-- /TMPL_IF -->
         <!-- TMPL_VAR Name="wborcity" -->  <!-- TMPL_VAR NAME="wborzip" --></li>
-        <li><!-- TMPL_VAR Name="wborphone" --></li>
-               <li><!-- TMPL_VAR NAME="wboremail" --></li>
+        <!-- TMPL_IF NAME="wborphone" --><li><!-- TMPL_VAR Name="wborphone" --></li><!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="wboremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="wboremail" -->"><!-- TMPL_VAR NAME="wboremail" --></a></li><!-- /TMPL_IF -->
         </ul>
-    <!-- TMPL_ELSE-->
-            No reservation linked
-    <!-- /TMPL_IF --><br />
-    This item must be transfered to : <!-- TMPL_VAR Name="TransferWaitingAt" --><br />
+    <!-- /TMPL_IF -->
   
     <form method="post" action="returns.pl">
             <input type="hidden" name="WT-itemNumber" value="<!-- TMPL_VAR Name="WrongTransferItem" -->" />
             <input type="hidden" name="WT-waitingAt" value="<!-- TMPL_VAR Name="TransferWaitingAt" -->" />
             <input type="hidden" name="WT-From" value="<!-- TMPL_VAR Name="wtransfertFrom" -->" />
-        <input type="submit" class="approve" value="Send item" />
-    </form></div></div></div>
+        <input type="submit" class="approve" value="Confirm" />
+    </form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF Name="found" -->
-<div class="dialog"><div><div class="confirm">
+<div class="message">
 <!-- case of a reservation found, and display info -->
     <!-- TMPL_IF Name="waiting" -->
-        <h3>Reserve Found (item is already waiting) </h3>
+        <h3>Hold Found (item is already waiting) </h3>
                <h4><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h4>
-        <h5>Patron:</h5>
+        <h5>Hold for:</h5>
                        <ul>
             <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --></a> (<!-- TMPL_VAR Name="borcnum" -->)</li>
             <li><!-- TMPL_VAR Name="boraddress" --><br />
-                       <!-- TMPL_VAR NAME="boraddress2" --><br />
+                       <!-- TMPL_IF NAME="boraddress2" --><!-- TMPL_VAR NAME="boraddress2" --><br /><!-- /TMPL_IF -->
             <!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
-           <li> <!-- TMPL_VAR Name="borphone" --></li>
-                  <li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li></ul>
+           <!-- TMPL_IF NAME="borphone" --><li> <!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
+                  <!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF --></ul>
         </p>
         <form method="post" action="returns.pl">
             <input type="submit" class="approve" value="Confirm" />
@@ -74,17 +71,17 @@ Hold for: <!-- TMPL_IF Name="wborcnum"-->
     <!-- TMPL_IF Name="diffbranch" -->
         <h2>Hold needing transfer found</h2>
         <h3><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h3>
-                <h4>Patron: </h4>
+                <h4>Hold for: </h4>
                     <ul>
                         <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --></a> (<!-- TMPL_VAR Name="borcnum" -->)</li>
                         <li><!-- TMPL_VAR Name="boraddress" --><br />
-                                               <!-- TMPL_VAR NAME="boraddress2" --><br />
+                                               <!-- TMPL_IF NAME="boraddress2" --><!-- TMPL_VAR NAME="boraddress2" --><br /><!-- /TMPL_IF -->
                                                <!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
-                        <li><!-- TMPL_VAR Name="borphone" --></li>
-                                               <li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li>
+                        <!-- TMPL_IF NAME="borphone" --><li><!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF -->
                     </ul>
             <!-- TMPL_IF name="transfertodo" -->
-                <p><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></p>
+                <h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
             <!-- /TMPL_IF -->
 
         <form method="post" action="returns.pl">
@@ -101,8 +98,7 @@ Hold for: <!-- TMPL_IF Name="wborcnum"-->
 
     <!-- case of a return of item, but with no reservation after, if the item must be  returned to its homebranch -->
     <!-- TMPL_IF Name="transfer" -->
-         <h2>Send item to <!-- TMPL_VAR NAME="homebranch" --></h2>
-        <p>Please return <em><!-- TMPL_VAR NAME="title" --></em> to <strong><!-- TMPL_VAR NAME="homebranch" --></strong></p>
+         <h2>Please transfer <em><!-- TMPL_VAR NAME="title" --></em> to <!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="homebranch" --></h2>
             <form method="post" action="returns.pl">
                 <!-- TMPL_LOOP Name="inputloop" -->
                     <input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->" />
@@ -111,7 +107,7 @@ Hold for: <!-- TMPL_IF Name="wborcnum"-->
                 <!-- /TMPL_LOOP -->
                 <input type="hidden" name="barcode" value="0" />
                 <input type="submit" class="approve" value="OK" />
-            </form></div></div></div>
+            </form>
     <!-- /TMPL_IF -->
     
     <!-- TMPL_IF Name="diffbranch" -->
@@ -119,7 +115,7 @@ Hold for: <!-- TMPL_IF Name="wborcnum"-->
         <table>
         <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
         <tr>
-            <th>Patron:</th>
+            <th>Hold for:</th>
             <td><!-- TMPL_VAR Name="name" --></td>
         </tr>
         </table>
@@ -138,27 +134,23 @@ Hold for: <!-- TMPL_IF Name="wborcnum"-->
     
     <!-- case of simple return no issue or transfer but with a reservation  -->
     <!-- TMPL_IF Name="reserved" -->
-        <!-- TMPL_IF Name="transfertodo"-->
-            <h3>Hold placed for another library, please transfer</h3>
-        <!-- TMPL_ELSE -->
-            <h3>Reserve Found:</h3>
-        <!-- /TMPL_IF -->
-        <h4><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h4>
-        <h5>Patron:</h5>
+         <h3>Hold Found:</h3>
+       <h4><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h4>
+        <h5>Hold for:</h5>
                <ul>
             <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
                 <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" -->
             </a> (<!-- TMPL_VAR Name="borcnum" -->)</li>
             <li><!-- TMPL_VAR Name="boraddress" --><br />
-                       <!-- TMPL_VAR NAME="boraddress2" --><br />
+                       <!-- TMPL_IF NAME="boraddress2" --><!-- TMPL_VAR NAME="boraddress2" --><br /><!-- /TMPL_IF -->
                        <!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
-            <li><!-- TMPL_VAR Name="borphone" --></li>
-                       <li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li>
+            <!-- TMPL_IF NAME="borphone" --><li><!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF -->
         </ul>
         <!-- TMPL_IF name="transfertodo" -->
-            <p><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></p>
+            <h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
                <!-- TMPL_ELSE -->
-               <p><strong>Hold at</strong> <!-- TMPL_VAR Name="destbranchname" --></p>
+               <h4><strong>Hold at</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
         <!-- /TMPL_IF -->
         <form method="post" action="returns.pl">
             <!-- TMPL_IF name="transfertodo" -->
@@ -177,22 +169,10 @@ Hold for: <!-- TMPL_IF Name="wborcnum"-->
         </form>
        
     <!-- /TMPL_IF -->
-       </div></div></div>
+       </div>
 <!-- TMPL_ELSE -->
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl" >
-            <fieldset>
-            <p>
-                <label for="barcode">Enter item barcode: </label><input name="barcode" id="barcode" size="14" maxlength="14" class="focus" />
-                <input type="submit" value="Submit" />
-            </p>
-            <!-- TMPL_LOOP Name="inputloop" -->
-                <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-                <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-                <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
-            <!-- /TMPL_LOOP -->
-            </fieldset>
-        </form>
-    <!-- TMPL_IF NAME="errmsgloop" -->
+
+<!-- TMPL_IF NAME="errmsgloop" -->
     <div class="message">
         <!-- TMPL_LOOP Name="errmsgloop" -->
                     <!-- TMPL_IF Name="badbarcode" -->
@@ -214,6 +194,18 @@ Hold for: <!-- TMPL_IF Name="wborcnum"-->
         <!-- /TMPL_IF -->
     </div>
 <!-- /TMPL_IF -->
+
+    <form method="post" action="/cgi-bin/koha/circ/returns.pl">
+            <fieldset>
+            <label for="barcode">Enter item barcode: </label><input name="barcode" id="barcode" size="14" maxlength="14" class="focus" /> <input type="submit" value="Submit" />
+            <!-- TMPL_LOOP Name="inputloop" -->
+                <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
+                <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
+                <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+            <!-- /TMPL_LOOP -->
+            </fieldset>
+        </form>
+   
 </div>
 
 <!-- TMPL_IF Name="returned" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index c865cd0..05f23cd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -106,7 +106,7 @@ if (alreadyreserved > "0"){
     <!-- TMPL_IF NAME="messageborrower" -->                                    
       <div class="problem">No patron with this name, Please, try another </div>    
     <!-- /TMPL_IF -->
-    <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" onsubmit="request.pl" name="getborrower">
+    <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post">
         <!-- TMPL_UNLESS name="CGIselectborrower" -->
                        <fieldset class="brief">
                        <label for="patron">Patron: </label>