Finishing circ page layout changes. Still need to iron out standards for warning...

Signed-off-by: Chris Cormack <crc@liblime.com>
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 c42ef34..d941b6e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -824,4 +824,37 @@ span.expired {
 
 div.help {
        margin: .9em 0 0 0;  
+}
+
+.blocker {
+       color : #990000;
+}
+
+div.warning {
+       background-color : #FFFFCC;
+       border-color : #990000;
+}
+
+.circmessage li {
+       list-style : url(../../img/arrow-bullet.gif);
+       margin-bottom : .2em;
+}
+
+div.circmessage:first-child {
+       margin-top : 1em;
+}
+
+div.circmessage {
+       border: 1px solid #CCC;
+       padding: .4em;
+       margin-bottom : .3em;
+}
+
+span.circ-hlt {
+       color : #cc0000;
+       font-weight : bold;
+}
+
+div.first fieldset {
+       margin-right : 0;
 }
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index bf83038..9c49451 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -9,7 +9,17 @@
     <input name="printer" value="" type="hidden" />
        <input value="Submit" type="submit" />
        </form>
-       </div>  
+       </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">
@@ -19,6 +29,7 @@
        </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">Check In</a></li>
                        <li class="tabs-selected"><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
                        </ul>   
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index ba867b3..fb6041c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -75,7 +75,7 @@ function confirm_reregistration() {
        //]]>
        </script>
        <ul class="toolbar">
-       <li><a id="checkout" href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Check Out</a></li>
+       <li><a id="checkout" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Check Out</a></li>
        <!-- TMPL_IF name="adultborrower" --><li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="category_type" -->
             <!--TMPL_IF NAME="guarantor"-->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
deleted file mode 100644 (file)
index 6ae46e5..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- Begin Members Resident Search Box -->
-<div id="header_search">
-       <div id="patron_search" class="residentsearch">
-       <p class="tip">Enter patron card number or partial name:</p>
-       <form action="/cgi-bin/koha/members/member.pl" method="post">
-    <input id="searchmember" size="25" name="member" type="text" />
-    order by:
-    <select name="orderby" id="searchorderby">
-    <option value="surname,firstname">Surname</option>
-    <option value="cardnumber">Cardnumber</option>
-    </select>
-    <input value="Search" type="submit" />
-</form>
-       </div>
-       <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">
-                       <label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-       <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-       <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" value="" title="Enter the terms you wish to search for." class="form-text" />
-                               <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
-               </form>
-       </div>
-                       <ul>
-                       <li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Search Patrons</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
-                       </ul>   
-</div>
-<!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
deleted file mode 100644 (file)
index 7033bb9..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-<div id="toolbar">
-       <script type="text/javascript">
-       //<![CDATA[
-
-       // prepare DOM for YUI Toolbar
-
-        $(document).ready(function() {
-               $("#addchild").parent().remove();
-               $("#addprofessional").parent().remove();
-               $("#addorganisation").parent().remove();
-           $("#newmenuc").empty();
-           yuiToolbar();
-        });
-
-       // YUI Toolbar Functions
-
-       function yuiToolbar() {
-
-               var newmenu = [
-                       { text: "Adult Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A" },
-                       { text: "Child Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C" },
-                       { text: "Professional Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P" },
-                       { text: "Organisation",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I" },
-               ] 
-       
-           new YAHOO.widget.Button({
-               type: "menu",
-               label: "New",
-               name: "newmenubutton",
-               menu: newmenu,
-               container: "newmenuc"
-           });
-       
-       }
-
-       //]]>
-       </script>
-       <ul class="toolbar">
-       <li id="newmenuc"><a id="addadult" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Adult</a></li>
-<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Child</a></li>
-<li><a id="addprofessional" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Professional</a></li>
-<li><a id="addorganisation" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Organisation</a></li>
-</ul></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
new file mode 100644 (file)
index 0000000..6ae46e5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -0,0 +1,38 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+       <div id="patron_search" class="residentsearch">
+       <p class="tip">Enter patron card number or partial name:</p>
+       <form action="/cgi-bin/koha/members/member.pl" method="post">
+    <input id="searchmember" size="25" name="member" type="text" />
+    order by:
+    <select name="orderby" id="searchorderby">
+    <option value="surname,firstname">Surname</option>
+    <option value="cardnumber">Cardnumber</option>
+    </select>
+    <input value="Search" type="submit" />
+</form>
+       </div>
+       <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">
+                       <label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+       <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+       <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" value="" title="Enter the terms you wish to search for." class="form-text" />
+                               <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+               </form>
+       </div>
+                       <ul>
+                       <li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Search Patrons</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+                       </ul>   
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
new file mode 100644 (file)
index 0000000..7033bb9
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
@@ -0,0 +1,43 @@
+<div id="toolbar">
+       <script type="text/javascript">
+       //<![CDATA[
+
+       // prepare DOM for YUI Toolbar
+
+        $(document).ready(function() {
+               $("#addchild").parent().remove();
+               $("#addprofessional").parent().remove();
+               $("#addorganisation").parent().remove();
+           $("#newmenuc").empty();
+           yuiToolbar();
+        });
+
+       // YUI Toolbar Functions
+
+       function yuiToolbar() {
+
+               var newmenu = [
+                       { text: "Adult Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A" },
+                       { text: "Child Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C" },
+                       { text: "Professional Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P" },
+                       { text: "Organisation",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I" },
+               ] 
+       
+           new YAHOO.widget.Button({
+               type: "menu",
+               label: "New",
+               name: "newmenubutton",
+               menu: newmenu,
+               container: "newmenuc"
+           });
+       
+       }
+
+       //]]>
+       </script>
+       <ul class="toolbar">
+       <li id="newmenuc"><a id="addadult" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Adult</a></li>
+<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Child</a></li>
+<li><a id="addprofessional" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Professional</a></li>
+<li><a id="addorganisation" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Organisation</a></li>
+</ul></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 5723085..378fc4a 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -103,11 +103,10 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="message" -->
-<p>
+<!-- TMPL_INCLUDE NAME="patron-toolbar.inc" -->
+<h4>
 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
-<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" />Add adult</a>
-<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" />Add child</a>  
-</p>
+</h4>
 <!-- /TMPL_IF -->
 
 
@@ -139,12 +138,13 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <!-- BARCODE ENTRY -->
 
 <!-- TMPL_IF NAME="borrowernumber" -->
-<div class="yui-g"><div class="yui-u first"><form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
+<div class="yui-g">
+<!-- TMPL_UNLESS NAME="noissues" -->
+<div class="yui-u first"><form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
 <fieldset id="circ_circulation_issue">
-   
     <label for="barcode">Enter item barcode: </label>
        <div class="hint">Checking out to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></div>
-       <input type="text" name="barcode" id="barcode" class="focus" size="14" /></p>
+       <input type="text" name="barcode" id="barcode" class="focus" size="14" />
     
         <!-- RESULT OF ISSUING REQUEST -->
         <!-- TMPL_IF NAME="IMPOSSIBLE" -->
@@ -511,26 +511,35 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     </fieldset>
 
 </fieldset>
-</form></div><div class="yui-u">    
+</form></div><!-- /TMPL_UNLESS --><!-- /unless noissues -->
+
+<!-- TMPL_IF NAME="noissues" --><div><!-- TMPL_ELSE --><div class="yui-u"><!-- /TMPL_IF -->
        
     <!-- TMPL_IF NAME="flagged" -->
-        <div class="messages" style="border: 1px solid #CCC; padding: .7em; margin-top : 1em; margin-bottom : .3em;">
-               <h3>Attention:</h3>
+               <!-- TMPL_IF NAME="noissues" -->
+        <div id="circmessages" class="circmessage warning">
+               <!-- TMPL_ELSE -->
+        <div id="circmessages" class="circmessage attention">
+               <!-- /TMPL_IF -->
+               <h3><!-- TMPL_IF NAME="noissues" -->Cannot Check Out!<!-- TMPL_ELSE -->Attention:<!-- /TMPL_IF --></h3>
                <ul>
-                       <!--TMPL_IF Name="warndeparture"--><li> Patron card has expired or will expire soon.</li><!--/TMPL_IF-->
-            <!-- TMPL_IF NAME="gna" --><li>Address: Patron's address in doubt</li><!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="lost" --><li>Lost: Patron's card is lost</li><!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="dbarred" --><li>
-                Restricted: Patron's account is restricted <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a></li><!-- /TMPL_IF -->
-               <!-- TMPL_IF name="odues" --><li><!-- TMPL_IF name="nonreturns" -->Overdues: See highlighted items <a href="#checkouts">below</a><!-- /TMPL_IF --></li>
-            <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="charges" --><li>Fines: Patron has 
+                       <!--TMPL_IF Name="warndeparture"--><li><span class="circ-hlt">Expiration:</span> Patron card has expired or will expire soon.</li><!--/TMPL_IF-->
+            <!-- TMPL_IF NAME="gna" --><li class="blocker"><span class="circ-hlt">Address:</span> Patron's address in doubt</li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="lost" --><li class="blocker"><span class="circ-hlt">Lost: </span>Patron's card is lost</li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="dbarred" --><li class="blocker">
+               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a></li><!-- /TMPL_IF -->
+               <!-- TMPL_IF name="odues" --><li><!-- TMPL_IF name="nonreturns" --><span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a><!-- /TMPL_IF --></li>
+            <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="charges" --><li><span class="circ-hlt">Fines:</span> Patron has 
             <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Outstanding fines</a>.
             Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
 
+                       </ul>
+        </div>
+
                        <!-- TMPL_IF NAME="WaitingReserveLoop" -->      
-                       <li>
-                           <strong>Holds waiting:</strong>
+                       <div id="holdswaiting" class="circmessage">
+                   <h4>Holds waiting:</h4>
                                <!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
                                    <ul> 
                                        <li> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title"--></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"-->,<!-- /TMPL_IF --> reserved on <!-- TMPL_VAR NAME="reservedate"--> 
@@ -540,17 +549,14 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                                        </li>
                                    </ul>
                            <!-- /TMPL_LOOP -->
-                       </li>
+                       </div>
                        <!-- /TMPL_IF --><!-- /If WaitingReserveLoop -->
 
-                       </ul>
-
-        </div>
     <!-- /TMPL_IF --> <!-- /If flagged -->
        <!-- TMPL_IF name="notes" -->
-                       <div id="circnotes" style="border: 1px solid #CCC; padding: .7em;">
+                       <div id="circnotes" class="circmessage">
                        <h4>Notes:</h4>
-            <p><!-- TMPL_VAR name="notesmsg" --></>
+            <p><!-- TMPL_VAR name="notesmsg" --></p>
                        </div>
     <!-- /TMPL_IF --> <!-- /If notes -->
 
@@ -588,8 +594,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />      
         <table>
     <tr>
-        <th>Title</th>
         <th>Due date</th>
+        <th>Title</th>
         <th>Itemtype</th>
         <th>Call no</th>
         <th>Barcode</th>
@@ -604,12 +610,12 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <!-- TMPL_ELSE -->
     <tr class="highlight">
     <!-- /TMPL_IF -->
+        <td><!-- TMPL_VAR NAME="dd" --></td>
         <td>
         <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
        <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF -->
         </td>
-        <td><!-- TMPL_VAR NAME="dd" --></td>
         <td>
             <!-- TMPL_VAR NAME="itemtype" -->
             <!-- TMPL_IF NAME="itemtype_image" -->
@@ -641,11 +647,11 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <tr class="highlight">
     <!-- /TMPL_IF -->
         <td>
-        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
-        <br /><!-- TMPL_VAR NAME="author" --> - <!-- TMPL_VAR name="itemnotes" -->
+        <!-- TMPL_VAR NAME="dd" -->
         </td>
         <td>
-        <!-- TMPL_VAR NAME="dd" -->
+        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
+        <br /><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF -->
         </td>
         <td>
             <!-- TMPL_VAR NAME="itemtype" -->
@@ -692,19 +698,18 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
             <th>Call Number</th>
         </tr>
         <!-- TMPL_LOOP NAME="reservloop" -->
-                <tr class="<!-- TMPL_VAR NAME="color" -->">
+        <tr class="<!-- TMPL_VAR NAME="color" -->">
                     <td>
                         <!-- TMPL_VAR NAME="reservedate" -->
                     </td>
                     <td>
-<!-- TMPL_IF name="barcodereserv" -->
-<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="waitingposition" -->
-Hold priority :
-<b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
-<!-- /TMPL_IF -->
-</td>
+                        <!-- TMPL_IF name="barcodereserv" --><!-- TMPL_VAR NAME="barcodereserv" -->
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="waitingposition" -->
+                        Hold priority :
+                        <b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
+                        <!-- /TMPL_IF -->
+                    </td>
                     <td>
                         <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index 423fba9..7440d1a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
index 84fb5f1..b932100 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Cannot Delete Patron</div>
 <div id="doc3" class="yui-t2">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
index 060e05d..db790c1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Manual Credit</div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
index 1e1cb2f..1408327 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Manual Invoice</div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
index 6dde676..b0bf153 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
index 1221f98..bbc599d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a> &rsaquo; <!-- TMPL_IF NAME="newpassword" -->Password Updated<!-- TMPL_ELSE -->Change Username and/or Password<!-- /TMPL_IF --></div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index af83975..604010a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <!-- TMPL_IF NAME="searching" --><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Search Results<!-- TMPL_ELSE -->Patrons<!-- /TMPL_IF --></div>
 
@@ -15,7 +15,7 @@
        <div id="yui-main">
        <div class="yui-b">
        
-<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-toolbar.inc" -->
 
 <div>
     Browse by last name:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index e1c56c9..5e85797 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -9,7 +9,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; 
 <!-- TMPL_IF NAME="opadd" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 5b417b6..32a985b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <!-- TMPL_IF NAME="unknowuser" -->Patron does not exist<!-- TMPL_ELSE -->Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --> </div>
 
@@ -16,7 +16,7 @@
        <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 
-<div class="yui-g" style="border : 1px solid #CCCCCC;">
+<div class="yui-g">
 <!-- TMPL_IF NAME="unknowuser" -->
     This patron does not exist.
 <!-- TMPL_ELSE -->
@@ -45,7 +45,7 @@
 <!-- /TMPL_IF -->
 
 
- <div class="yui-u first" style="border-right : 1px solid #CCCCCC;">
+ <div class="yui-u first">
 <div id="patron-information" style="padding : .5em;">
 <h3>
     <!-- TMPL_UNLESS NAME="I" -->
@@ -102,9 +102,9 @@
     <h3>Alternate Address</h3>
     <!-- TMPL_UNLESS NAME="I"-->
       <!-- TMPL_UNLESS NAME="C"-->
-  <p><strong>Alternate address: </strong><!-- TMPL_VAR NAME="B_address" --></p>
-      <p><strong>Alternate city: </strong><!-- TMPL_VAR NAME="B_city" --></p>
-      <p><strong>Alternate zipcode: </strong><!-- TMPL_VAR NAME="B_zipcode" --></p>
+  <p><!-- TMPL_VAR NAME="B_address" --><br />
+      <!-- TMPL_VAR NAME="B_city" --><br />
+      <!-- TMPL_VAR NAME="B_zipcode" --></p>
   <!-- /TMPL_UNLESS -->
     <!-- /TMPL_UNLESS -->
  
@@ -170,9 +170,9 @@
        <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
     <table>
         <tr>
-            <th scope="col">Date due</th>
             <th scope="col">Title</th>
             <th scope="col">Barcode</th>
+            <th scope="col">Date due</th>
             <th scope="col">Itemtype</th>
             <th scope="col">Charge</th>
             <th scope="col">Price</th>
@@ -190,17 +190,9 @@
         <tr>
             <!-- /TMPL_IF -->
           <!-- /TMPL_IF -->
-            <td><!-- TMPL_VAR NAME="date_due" --></td>
-            <td>
-                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                    <!-- TMPL_VAR NAME="title" -->
-                </a></p>
-                <p><!-- TMPL_VAR name="author" -->
-                    <!-- TMPL_IF name="publishercode" --> - <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF -->
-                    <!-- TMPL_IF name="publicationyear" -->- <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
-                </p>
-            </td>
+            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> <!-- TMPL_IF name="publishercode" -->; <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --> <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->            </td>
             <td><!-- TMPL_VAR NAME="barcode" --></td>
+            <td><!-- TMPL_VAR NAME="date_due" --></td>
             <td>
                 <!-- TMPL_VAR NAME="itemtype_description" -->
                 <!-- TMPL_IF NAME="itemtype_image" -->
@@ -240,6 +232,8 @@
 <div id="patrons-items-reserved" class="yui-g">
        <h2>Patron current holds</h2>
 <!-- TMPL_IF NAME="reservloop" -->
+<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
+       <input type="hidden" name="from" value="borrower" />
        <table>
                <tr>
                        <th>Hold date</th>
@@ -247,7 +241,7 @@
                        <th>Title</th>
                        <th>Author</th>
                        <th>Localisation</th>
-                       <th>Details</th>
+                       <th>&nbsp;</th>
                </tr>
                <!-- TMPL_LOOP NAME="reservloop" -->
                <tr class="<!-- TMPL_VAR NAME="color" -->">
@@ -264,7 +258,7 @@
                                                <!-- /TMPL_IF -->
                                        </td>
                                        <td>
-                                               <!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
+                                               <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
 
                                                <!-- TMPL_IF name="waiting" -->
                                                <i>This item is available</i>
@@ -281,12 +275,17 @@
                                        </td>
                                        <td><!-- TMPL_VAR NAME="author" --></td>
                                        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
-                                       <td>
-                                           <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">view holds </a>
-                                       </td>
+                                       <td><select name="rank-request">
+                       <option value="n">No</option>
+                       <option value="del">Yes</option>
+                       </select>
+               <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+               <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="borrowernumber" -->" /></td>
                        </tr>
                <!-- /TMPL_LOOP -->
        </table>
+                       <p><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></p>
+       </form>
        <!-- TMPL_ELSE -->
        <p>Patron has nothing on hold.</p>
        <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
index 689e27b..d84ade6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
index f6f99b6..ee5c085 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/img/arrow-bullet.gif b/koha-tmpl/intranet-tmpl/prog/img/arrow-bullet.gif
new file mode 100644 (file)
index 0000000..7e3155e
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/arrow-bullet.gif differ