[Koha-patches] [PATCH] Identifying "waiting at" branch on screen.

[Owen Leonard]

---
 circ/circulation.pl                                |    6 ++----
 .../intranet-tmpl/prog/en/css/staff-global.css     |    5 ++++-
 .../prog/en/modules/circ/circulation.tmpl          |    4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 128864c..9f82d1a 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -338,7 +338,7 @@ if ($borrowernumber) {
         $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
         $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
 		$getreserv{biblionumber}   = $getiteminfo->{'biblionumber'};
-
+		$getreserv{waitingat}    = GetBranchName( $num_res->{'branchcode'} );
         #         check if we have a waiting status for reservations
         if ( $num_res->{'found'} eq 'W' ) {
             $getreserv{color}   = 'reserved';
@@ -349,10 +349,8 @@ if ($borrowernumber) {
         $getWaitingReserveInfo{itemtype}    = $itemtypeinfo->{'description'};
         $getWaitingReserveInfo{author}        = $getiteminfo->{'author'};
         $getWaitingReserveInfo{reservedate}    = format_date( $num_res->{'reservedate'} );
-        if ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'} ) {
         $getWaitingReserveInfo{waitingat}    = GetBranchName( $num_res->{'branchcode'} );
-        }
-    
+    	if($num_res->{'branchcode'} eq $branch){ $getWaitingReserveInfo{waitinghere} = 1; }
         }
         #         check transfers with the itemnumber foud in th reservation loop
         if ($transfertwhen) {
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 47cd9f7..9ed04f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -964,7 +964,7 @@ div.circmessage:first-child {
 }
 
 div.circmessage {
-	padding: .4em;
+	padding: 0 .4em .4em .4em;
 	margin-bottom : .3em;
 }
 
@@ -1542,4 +1542,7 @@ tr.reserved td {
 }
 tr.transfered td {
 	background-color : #e8f0f6;
+}
+.waitinghere {
+	color : #669900;
 }
\ No newline at end of file
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 3312c66..e8f6d5f 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -349,7 +349,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 			            <ul> 
 			                <li> <a href="/cgi-bin/koha/reserve/request.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"-->.
 			            <!-- TMPL_IF NAME="waitingat" -->
-			                Waiting at <!-- TMPL_VAR NAME="waitingat" -->	
+			                <br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>	
 			            <!-- /TMPL_IF -->
 			                </li>
 			            </ul>
@@ -528,7 +528,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 					<td><!-- TMPL_VAR NAME="itemtype" --></td>
                     <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 					<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
-                        <!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting</strong>
+                        <!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="transfered" --> <strong>in transit</strong> from
                         <!-- TMPL_VAR NAME="frombranch" --> since <!-- TMPL_VAR NAME="datesent" -->
-- 
1.5.2.1