Some refinements to statuses and messages. Beginning to standardize call number displays.

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/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
index ab42828..eeb2a5e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
@@ -9,7 +9,7 @@
        <!-- TMPL_IF NAME="moredetailview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Items</a></li>
        <li>
-       <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a></li>
+       <!-- TMPL_IF NAME="holdsview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a></li>
 <!-- TMPL_IF name="subscriptionsnumber" --><li><a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&amp;title_filter=<!-- TMPL_VAR NAME="subscriptiontitle" -->">Subscription(s)</a></li><!-- /TMPL_IF -->
 </ul>
 <ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index d7f2943..5dc8632 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -77,10 +77,7 @@ function verify_images() {
         </div>
         
 <!-- TMPL_IF NAME="AmazonContent" --><div class="yui-u" id="bookcoverimg">
-        <!-- TMPL_IF name="isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="" /></a>
-<!-- TMPL_ELSE -->
-    <img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" border="0" />
-<!-- /TMPL_IF --></div><!-- /TMPL_IF -->
+        <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="" /></a></div><!-- /TMPL_IF -->
         
         <div class="yui-u" style="margin-top: 1em;">
         <ul>
@@ -159,10 +156,15 @@ function verify_images() {
 
                 <!-- TMPL_IF name="datedue" -->
                     <!-- TMPL_IF  NAME="NOTSAMEBRANCH" -->
-                                        On loan
+                                        Checked out
                     <!-- TMPL_ELSE -->
-                                        On loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>, due back on <!-- TMPL_VAR NAME="onloan" -->
+                                        Checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>, due back on <!-- TMPL_VAR NAME="datedue" -->
                     <!-- /TMPL_IF -->
+                                       <!-- TMPL_ELSE -->
+                <!-- TMPL_IF Name="transfertwhen" -->
+                                        In transit from <!-- TMPL_VAR NAME="transfertfrom" -->,
+                                        to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" -->
+                <!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
 
                 <!-- TMPL_IF NAME="itemlost" -->
@@ -197,10 +199,6 @@ function verify_images() {
                                         Not for loan (<!-- TMPL_VAR NAME="notforloanvalue" -->)
                 <!-- /TMPL_IF -->
 
-                <!-- TMPL_IF Name="transfertwhen" -->
-                                        In transit from <!-- TMPL_VAR NAME="transfertfrom" -->,
-                                        to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" -->
-                <!-- /TMPL_IF -->
                             
                 <!-- TMPL_IF NAME="reservedate"-->
                     <!-- TMPL_IF NAME="waitingdate" -->

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 5a9a481..0e8ce4f 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -395,7 +395,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
             <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
             <!-- /TMPL_IF -->
         </td>
-        <td><!-- TMPL_VAR NAME="classification" --></td>
+        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
         <td><!-- TMPL_VAR NAME="barcode" --></td>
         <td>
                <!-- TMPL_IF NAME="can_renew" -->

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 cfbf61d..0d5a79a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -92,9 +92,9 @@ if (alreadyreserved > "0"){
 </p>       
 <!-- TMPL_ELSE -->
 <!-- TMPL_IF NAME="messagetransfert" -->
-               <div>
+               <div class="dialog message">
                                <h2>Hold found for (<!-- TMPL_VAR NAME="nextreservtitle" -->), please transfer</h2>
-                       <p>Hold placed by : <b> <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> at : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please transfer this item.
+                       <p>Hold placed by : <strong> <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></strong> at : <strong> <!-- TMPL_VAR NAME="branchname" --> </strong>, Please transfer this item.
                        </p>
                        <form name="cancelReservewithtransfert" action="branchreserves.pl" method="post">
                                <input type="submit" class="button" />
@@ -105,7 +105,7 @@ if (alreadyreserved > "0"){
 
 <!-- TMPL_UNLESS NAME="cardnumber"-->
     <!-- TMPL_IF NAME="messageborrower" -->                                    
-      <div class="problem">No patron with this name, Please, try another </div>    
+      <div class="dialog alert"><h3>Patron Not Found</h3><p>No patron with this name, Please, try another</p> </div>    
     <!-- /TMPL_IF -->
     <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post">
         <!-- TMPL_UNLESS name="CGIselectborrower" -->
@@ -123,37 +123,37 @@ if (alreadyreserved > "0"){
         <!-- /TMPL_UNLESS -->
     </form>
 <!-- TMPL_ELSE -->
-  <!-- TMPL_IF NAME="maxreserves" -->
-    <p class="problem">
-      <strong>Too many holds</strong>
-      Currently, this patron has too many holds.
-    </p>
+
+<!-- TMPL_IF NAME="warnings" -->
+    <div class="dialog alert">
+       <h3>Cannot Place Hold</h3>
+       <ul>
+<!-- TMPL_IF NAME="maxreserves" -->
+      <li><strong>Too Many Holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowerfirstname" --> <!-- TMPL_VAR NAME="borrowersurname" --> </a> has too many holds.</li>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="expiry" -->
-    <br />
-    <p class="problem">
-      <strong>Expired account</strong>
-      This patron's account has expired
-    </p>
+    <!-- TMPL_IF NAME="alreadyreserved" -->
+     <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowerfirstname" --> <!-- TMPL_VAR NAME="borrowersurname" --> </a> <strong>already has a hold</strong> on this item </li>
     <!-- /TMPL_IF -->
+       </ul></div>
+<!-- /TMPL_IF -->      
 
-    <!-- TMPL_IF NAME="diffbranch" -->                 
-    <p class="problem">
-      <strong>Warning:</strong> Pickup Library is different than Patron's Home Library
-    </p>
+<!-- TMPL_IF NAME="messages" -->
+    <div class="dialog message"><ul>
+    <!-- TMPL_IF NAME="expiry" -->
+      <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowerfirstname" --> <!-- TMPL_VAR NAME="borrowersurname" --> </a>'s <strong>account has expired</strong></li>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="alreadyreserved" -->                    
-    <p class="problem">
-      <strong>Warning:</strong>
-      This patron already has a hold on this item
-    </p>
+<!-- TMPL_IF NAME="diffbranch" --><h3>Branch Mismatch</h3>
+      <li> <strong>Pickup library is different</strong> than <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowerfirstname" --> <!-- TMPL_VAR NAME="borrowersurname" --> </a>'s home library</li>
     <!-- /TMPL_IF -->
+</ul></div>
+<!-- /TMPL_IF -->
 
   <!-- TMPL_IF NAME="messageborrower" -->
-    <p class="problem"><strong>Patron not found:</strong> Name or barcode not found. Please try an other </p>
+   <div class="dialog alert"><h3>Patron not found:</h3> <p>Name or barcode not found. Please try an other </p></div>
   <!-- /TMPL_IF -->
+  
   <fieldset class="rows left">
     <legend>Hold details</legend>
         <form action="placerequest.pl" method="post" onsubmit="return check();" name="form">
@@ -202,9 +202,10 @@ if (alreadyreserved > "0"){
        <!-- /TMPL_UNLESS -->
         <!-- TMPL_IF NAME="publicationyear" --><li><span class="label">Publication year:</span> <!-- TMPL_VAR NAME="publicationyear" --></li><!-- /TMPL_IF -->
 </ol>
-        <label for="requestspecific">Place a hold on a specific copy</label> 
+         
         <table id="requestspecific">
-        <tr>
+        <caption>Place a hold on a specific copy</caption>
+               <tr>
             <!-- TMPL_IF NAME="item-level_itypes" -->
            <th>Hold</th>
             <th>Item type</th>
@@ -221,13 +222,13 @@ if (alreadyreserved > "0"){
             <!-- TMPL_IF NAME="available" -->
             <input type="checkbox" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
             <!-- TMPL_ELSE -->
-            <input DISABLED type="checkbox" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" /> 
+            <input disabled="disabled" type="checkbox" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" /> 
             <!-- /TMPL_IF -->
             </td>
 
             <!-- TMPL_IF NAME="item-level_itypes" -->
             <td>
-            <img src="<!-- TMPL_VAR name="imageurl" -->" alt="<!-- TMPL_VAR NAME="itypename" -->" title="<!-- TMPL_VAR NAME="itypename" -->"/>
+            <img src="<!-- TMPL_VAR name="imageurl" -->" alt="<!-- TMPL_VAR NAME="itypename" -->" title="<!-- TMPL_VAR NAME="itypename" -->" />
             </td>
             <!-- /TMPL_IF -->
 
@@ -246,6 +247,11 @@ if (alreadyreserved > "0"){
             <td>
                <!-- TMPL_IF Name="onloan" -->
             <span class="checkedout">Due <!-- TMPL_VAR NAME="onloan" --></span>
+                       <!-- TMPL_ELSE -->
+               <!-- TMPL_IF Name="transfertwhen" -->
+            In transit from <!-- TMPL_VAR NAME="transfertfrom" -->,
+            to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" -->
+               <!-- /TMPL_IF -->
                <!-- /TMPL_IF -->
     
                <!-- TMPL_IF Name="message" -->
@@ -255,10 +261,6 @@ if (alreadyreserved > "0"){
                <!-- TMPL_IF Name="notforloan" -->
             Not for loan (<!-- TMPL_VAR NAME="notforloanvalue" -->)
                <!-- /TMPL_IF -->
-               <!-- TMPL_IF Name="transfertwhen" -->
-            In transit from <!-- TMPL_VAR NAME="transfertfrom" -->,
-            to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" -->
-               <!-- /TMPL_IF -->
 
             <!-- TMPL_IF NAME="reservedate"-->
                     <!-- TMPL_IF NAME="nocancel" -->
@@ -286,8 +288,8 @@ if (alreadyreserved > "0"){
     </fieldset>
        </fieldset>
     </form>
-
 <!-- /TMPL_UNLESS -->
+
 <!-- TMPL_UNLESS NAME="cardnumber" -->
 <!-- TMPL_IF name="reserveloop" -->
 <form name="T<!-- TMPL_VAR NAME="time" -->" action="modrequest.pl" method="post">

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 06f2ff5..a9b4299 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -138,6 +138,11 @@
             <td>
         <!-- TMPL_IF Name="date_due" -->
             <span class="checkedout">Due <!-- TMPL_VAR NAME="date_due" --></span>
+                       <!-- TMPL_ELSE -->
+        <!-- TMPL_IF Name="transfertwhen" -->
+            In transit from <!-- TMPL_VAR NAME="transfertfrom" -->,
+            to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" -->
+        <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
 
         <!-- TMPL_IF Name="message" -->
@@ -147,10 +152,6 @@
         <!-- TMPL_IF Name="notforloan" -->
             Not for loan (<!-- TMPL_VAR NAME="notforloanvalue" -->)
         <!-- /TMPL_IF -->
-        <!-- TMPL_IF Name="transfertwhen" -->
-            In transit from <!-- TMPL_VAR NAME="transfertfrom" -->,
-            to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" -->
-        <!-- /TMPL_IF -->
 
             <!-- TMPL_IF NAME="reservedate"-->
                     <!-- TMPL_IF NAME="waitingdate" -->Waiting<!-- TMPL_ELSE -->On hold<!-- /TMPL_IF --> for patron 

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 66c670e..32a693c 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -22,6 +22,7 @@
             <th>Title</th>
             <th>Author</th>
             <th>Copyright</th>
+                       <th>Call No.</th>
         </tr>
             <!-- TMPL_LOOP NAME="itemsloop" -->
                 <!-- TMPL_IF NAME="toggle" -->
@@ -50,6 +51,7 @@
             </td>
             <td><!-- TMPL_VAR NAME="author" --></td>
             <td><!-- TMPL_VAR NAME="copyrightdate" --></td>
+            <td><!-- TMPL_VAR NAME="cn_class" --> <!-- TMPL_VAR NAME="cn_item" --> <!-- TMPL_VAR NAME="cn_suffix" --> <!-- TMPL_VAR NAME="itemcallnumber" --></td>
         </tr>
                 <!-- /TMPL_LOOP --><!-- /itemsloop -->
     </table>

diff --git a/reserve/request.pl b/reserve/request.pl
index a49b56e..d0fea98 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -66,6 +66,8 @@ $findborrower =~ s|,| |g;
 my $cardnumber = $input->param('cardnumber');
 my $borrowerslist;
 my $messageborrower;
+my $warnings;
+my $messages;
 
 my $date = sprintf( '%04d-%02d-%02d', Today() );
 
@@ -103,6 +105,7 @@ if ($cardnumber) {
       GetReserveCount( $borrowerinfo->{'borrowernumber'} );
 
     if ( $number_reserves > C4::Context->preference('maxreserves') ) {
+               $warnings = 1;
         $maxreserves = 1;
     }
 
@@ -110,15 +113,18 @@ if ($cardnumber) {
     if ($borrowerinfo->{'dateexpiry'} ne '0000-00-00') {
         my $warning = (Date_to_Days(split /-/,$date) > Date_to_Days( split /-/,$borrowerinfo->{'dateexpiry'}));
         if ( $warning > 0 ) {
+                       $messages = 1;
             $expiry = 1;
         }
     } else {
+               $messages = 1;
         $expiry = 1;
     }
      
 
     # check if the borrower make the reserv in a different branch
     if ( $borrowerinfo->{'branchcode'} ne C4::Context->userenv->{'branch'} ) {
+               $messages = 1;
         $diffbranch = 1;
     }
 
@@ -138,7 +144,9 @@ if ($cardnumber) {
                 borrowerreservs   => $count_reserv,
                 maxreserves       => $maxreserves,
                 expiry            => $expiry,
-                diffbranch        => $diffbranch
+                diffbranch        => $diffbranch,
+                               messages => $messages,
+                               warnings => $warnings
     );
 }
 
@@ -190,11 +198,14 @@ foreach my $res (@$reserves) {
     }
 
     if ( $borrowerinfo->{borrowernumber} eq $res->{borrowernumber} ) {
+               $warnings = 1;
         $alreadyreserved = 1;
     }
 }
 
-$template->param( alreadyreserved => $alreadyreserved );
+$template->param( alreadyreserved => $alreadyreserved,
+                               messages => $messages,
+                               warnings => $warnings );
 
 # FIXME think @optionloop, is maybe obsolete, or  must be switchable by a systeme preference fixed rank or not
 # make priorities options
@@ -458,7 +469,8 @@ $template->param(
     cardnumber        => $cardnumber,
     CGIselectborrower => $CGIselectborrower,
     title             => $dat->{title},
-    author            => $dat->{author}
+    author            => $dat->{author},
+       holdsview => 1
 );
 
 # printout the page