From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 1 Aug 2006 21:18:44 +0000 (+0000)
Subject: added holdable column to copy details display when isXUL
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0b0e9c2949a02a37d030220d79ca0d888cee3481;p=Evergreen.git

added holdable column to copy details display when isXUL


git-svn-id: svn://svn.open-ils.org/ILS/trunk@5217 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css
index 1b4c985c21..1765d529d0 100644
--- a/Open-ILS/web/opac/skin/default/css/layout.css
+++ b/Open-ILS/web/opac/skin/default/css/layout.css
@@ -226,3 +226,5 @@ table { border-collapse: collapse; }
 
 /* ie does not support disabling <option> elements */
 .disabled_option { color: #808080; }
+
+.copy_more_info { padding-left: 6px; color: #804070; }
diff --git a/Open-ILS/web/opac/skin/default/js/copy_details.js b/Open-ILS/web/opac/skin/default/js/copy_details.js
index 86affdb8ee..34c1ae06d5 100644
--- a/Open-ILS/web/opac/skin/default/js/copy_details.js
+++ b/Open-ILS/web/opac/skin/default/js/copy_details.js
@@ -20,6 +20,13 @@ var i = cpdCheckExisting(contextRow);
 	goTo('#slot_'+templateRow.id);
 	*/
 
+	if(isXUL()) {
+		/* unhide before we unhide/clone the parent */
+		unHideMe($n(templateRow, 'age_protect_label'));
+		unHideMe($n(templateRow, 'create_date_label'));
+		unHideMe($n(templateRow, 'holdable_label'));
+	}
+
 	unHideMe(templateRow);
 
 	var print = $n(templateRow,'print');
@@ -161,6 +168,13 @@ function cpdDrawCopies(r) {
 	var copytbody	= $n(args.templateRow, 'copies_tbody');
 	var copyrow		= copytbody.removeChild($n(copytbody, 'copies_row'));
 
+	if(isXUL()) {
+		/* unhide before we unhide/clone the parent */
+		unHideMe($n(copyrow, 'age_protect_value'));
+		unHideMe($n(copyrow, 'create_date_value'));
+		unHideMe($n(copyrow, 'copy_holdable_td'));
+	}
+
 	for( var i = 0; i < copies.length; i++ ) {
 		var row = copyrow.cloneNode(true);
 		var copyid = copies[i];
@@ -177,12 +191,13 @@ function cpdDrawCopy(r) {
 	var copy = r.getResultObject();
 	var row  = r.row;
 
-	r.args.copy = copy;
-
 	$n(row, 'barcode').appendChild(text(copy.barcode()));
 	$n(row, 'location').appendChild(text(copy.location().name()));
+	$n(row, 'status').appendChild(text(copy.status().name()));
 
 	if(isXUL()) {
+
+		/* show the hold link */
 		var l = $n(row, 'copy_hold_link');
 		unHideMe(l);
 		l.onclick = function() {
@@ -194,20 +209,6 @@ function cpdDrawCopy(r) {
 				}
 			);
 		}
-	}
-
-	$n(row, 'status').appendChild(text(copy.status().name()));
-
-	r.args.copyrow = row;
-	cpdShowNotes(copy, r.args)
-	cpdShowStats(copy, r.args);
-
-	if(isXUL()) {
-
-		unHideMe($('age_protect_label'));
-		unHideMe($('create_date_label'));
-		unHideMe($n(row, 'age_protect_value'));
-		unHideMe($n(row, 'create_date_value'));
 
 		if( copy.age_protect() ) 
 			appendClear($n(row, 'age_protect_value'), text(copy.age_protect().name()));
@@ -216,7 +217,24 @@ function cpdDrawCopy(r) {
 		cd = cd.replace(/T.*/, '');
 		$n(row, 'create_date_value').appendChild(text(cd));
 
+		var yes = $('rdetail.yes').innerHTML;
+		var no = $('rdetail.no').innerHTML;
+
+		if( isTrue(copy.holdable()) &&
+				isTrue(copy.location().holdable()) &&
+				isTrue(copy.status().holdable()) ) {
+			$n(row, 'copy_is_holdable').appendChild(text(yes));	
+		} else {
+			$n(row, 'copy_is_holdable').appendChild(text(no));	
+		}
+
 	}
+
+	r.args.copy = copy;
+	r.args.copyrow = row;
+	cpdShowNotes(copy, r.args)
+	cpdShowStats(copy, r.args);
+
 }
 
 function _cpdExtrasInit(args) {
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
index 050cf67f45..619f5ca2f6 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
@@ -1,10 +1,6 @@
 <table class='hide_me'>
 	<script language='javascript' src='../js/copy_details.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Date.W3CDTF.js'/>
-	<style>
-		.copy_details_table {
-		}
-	</style>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Date.W3CDTF.js'>  </script>
 	<tbody>
 		<tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row' templateRow='1'>
 			<td colspan='10'>
@@ -17,28 +13,36 @@
 								<td width='33%'>Barcode</td>
 								<td>Status</td>
 								<td>Location</td>
-								<td id='age_protect_label' class='hide_me'>Age Hold Protection</td>
-								<td id='create_date_label' class='hide_me'>Create Date</td>
+								<td name='age_protect_label' class='hide_me'>Age Hold Protection</td>
+								<td name='create_date_label' class='hide_me'>Create Date</td>
+								<td name='holdable_label' class='hide_me'>Holdable</td>
 							</tr>
 						</thead>
 						<tbody name='copies_tbody' class='copy_details_table' width='100%'>
+
 							<tr name='copies_row'>
+
 								<td>
 									<span name='barcode'> </span>
-									<a style='padding-left: 6px; color: #804070;' 
-										class='hide_me classic_link' name='details_link'>more info...</a>
-									<a style='padding-left: 6px; color: #804070;' 
-										class='hide_me classic_link' name='less_details_link'>less info</a>
-									<a style='padding-left: 6px; color: #804070;' 
-										class='hide_me classic_link' name='copy_hold_link' href='javascript:void(0);'>place hold</a>
+									<a class='hide_me classic_link copy_more_info' name='details_link'>more info...</a>
+									<a class='hide_me classic_link copy_more_info' name='less_details_link'>less info</a>
+									<a class='hide_me classic_link copy_more_info' name='copy_hold_link' 
+										href='javascript:void(0);'>place hold</a>
 								</td>
-								<td name='status'></td>
-								<td name='location'></td>
+
+								<td name='status'> </td>
+								<td name='location'> </td>
 								<td name='age_protect_value' class='hide_me'>- Disabled -</td>
-								<td name='create_date_value' class='hide_me'/>
+								<td name='create_date_value' class='hide_me'> </td>
+
+								<td name='copy_holdable_td' class='hide_me'>
+									<span name='copy_is_holdable'> </span>
+								</td>
+
 							</tr>
+
 							<tr name='copy_extras_row' class='hide_me'>
-								<td colspan='5'>
+								<td colspan='10'>
 									<table width='100%' class='data_grid'>
 										<tbody name='extras_tbody'>
 											<tr name='extras_row' class='hide_me'>
@@ -47,13 +51,14 @@
 													<span name='cat' class='hide_me'><b>Copy Category</b></span>
 												</td>
 												<td>
-													<span name='key'/> : <span name='value'/>
+													<span name='key'> </span> : <span name='value'> </span>
 												</td>
 											</tr>
 										</tbody>
 									</table>
 								</td>
 							</tr>
+
 						</tbody>
 					</table>
 				</div>
@@ -62,6 +67,8 @@
 	</tbody>
 </table>
 
+<span class='hide_me' id='rdetail.yes'>Yes</span>
+<span class='hide_me' id='rdetail.no'>No</span>
 
 
 <div id='rdetail_print_details' class='hide_me'>
@@ -82,7 +89,7 @@
 					<tr>
 						<td colspan='3' style='background: #E0F0E0;'> </td>
 					</tr>
-					<tr name='cnrow'><td><b>Call Number</b></td><td><b colspan='2' name='cn'/></td></tr>
+					<tr name='cnrow'><td><b>Call Number</b></td><td><b colspan='2' name='cn'></b></td></tr>
 				</tbody>
 			</table>
 		</div>