[open-ils-commits] r11134 - in trunk/Open-ILS/web/opac: locale/en-US skin/default/js skin/default/xml/myopac

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-11-11 13:16:57 -0500 (Tue, 11 Nov 2008)
New Revision: 11134

Modified:
   trunk/Open-ILS/web/opac/locale/en-US/opac.dtd
   trunk/Open-ILS/web/opac/skin/default/js/myopac.js
   trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
Log:
if a hold estimate interval is configured, show the hold esimate in the hold table.  removed hard-coded widths

Modified: trunk/Open-ILS/web/opac/locale/en-US/opac.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/opac.dtd	2008-11-11 17:04:03 UTC (rev 11133)
+++ trunk/Open-ILS/web/opac/locale/en-US/opac.dtd	2008-11-11 18:16:57 UTC (rev 11134)
@@ -224,6 +224,7 @@
 <!ENTITY opac.holds.freeze.help "A suspended hold will retain its place in the queue, but will not be fulfilled until it has been activated.">
 <!ENTITY opac.holds.freeze.thaw_date "Automatically activate hold on:">
 <!ENTITY opac.holds.expire_time "Expiration date">
+<!ENTITY myopac.holds.estimated_wait "Estimated Wait (days)">
 
 <!--	================================================================= 
 	MyOPAC Preferences Page 

Modified: trunk/Open-ILS/web/opac/skin/default/js/myopac.js
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/js/myopac.js	2008-11-11 17:04:03 UTC (rev 11133)
+++ trunk/Open-ILS/web/opac/skin/default/js/myopac.js	2008-11-11 18:16:57 UTC (rev 11134)
@@ -401,6 +401,7 @@
 	req.send();
 }
 
+var myopacShowHoldEstimate = false;
 function myOShowHoldStatus(r) {
 
 	var hold = r.hold;
@@ -409,6 +410,14 @@
 
 	var row = $("myopac_holds_row_" + r.hold.id());
 
+    if(qstats.estimated_wait || myopacShowHoldEstimate) {
+        myopacShowHoldEstimate = true;
+        if(qstats.estimated_wait)
+            $n(row, 'myopac_holds_estimated_wait').appendChild(text(qstats.estimated_wait));
+        unHideMe($('myopac_holds_estimated_wait_column'));
+        unHideMe($n(row, 'myopac_holds_estimated_wait'));
+    } 
+
 	if( qstats.status == 4 ) {
 		unHideMe($n(row, 'hold_status_available'));
 		hideMe($n(row, 'myopac_holds_cancel_link'));

Modified: trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml	2008-11-11 17:04:03 UTC (rev 11133)
+++ trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml	2008-11-11 18:16:57 UTC (rev 11134)
@@ -40,15 +40,16 @@
 
 		<thead class='color_3'>
 			<tr>
-				<td width='30%'>&common.title;</td>
-				<td width='30%'>&common.author;</td>
+				<td width=''>&common.title;</td>
+				<td width=''>&common.author;</td>
 				<td>&myopac.holds.formats;</td>
 				<td>&myopac.holds.location;</td>
 				<td>&common.status;</td>
+				<td class='hide_me' id='myopac_holds_estimated_wait_column'>&myopac.holds.estimated_wait;</td>
 				<td>&myopac.holds.unfrozen;</td>
 				<td>&myopac.holds.frozen.until;</td>
 				<td>&opac.holds.expire_time;</td>
-                <td width='15%'>&common.select;
+                <td width=''>&common.select;
                     (<a id='myopac_select_all_holds' onclick='myopacSelectAllHolds();' 
                         class='classic_link' href='javascript:void(0);'>&common.all;</a>/<a id='myopac_select_none_holds' 
                         onclick='myopacSelectNoneHolds();' class='classic_link'  href='javascript:void(0);'>&common.none;</a>)
@@ -88,6 +89,7 @@
 					<span class='hide_me' name='hold_status_available'><b style='color:red'>&myopac.holds.status.available;</b></span>
 					<span class='hide_me' name='hold_qstats'></span>
 				</td>
+                <td class='hide_me' name='myopac_holds_estimated_wait'/>
 
                 <td>
                     <!-- These characaters do not display in Internet Exploror, *sigh*