From ce5d1978c725bbf64e88832e9ad8754418d526c8 Mon Sep 17 00:00:00 2001
From: Jeff Godin <jgodin@tadl.org>
Date: Tue, 3 Apr 2012 14:39:52 -0400
Subject: [PATCH] Use a default auri label instead of http:// urls

Use a default auri label in search results and record summary
pages. This is mostly to prevent the symptoms of LP 918020
but may be more generally useful as well.

Also, use css_button class for BibTemplate-generated auri links
in a record summary.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
---
 Open-ILS/web/opac/skin/tadlv2/js/rdetail.js                   | 4 ++++
 Open-ILS/web/opac/skin/tadlv2/xml/rdetail/rdetail_summary.xml | 7 ++++++-
 Open-ILS/web/opac/skin/tadlv2/xml/result/result_table.xml     | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/web/opac/skin/tadlv2/js/rdetail.js b/Open-ILS/web/opac/skin/tadlv2/js/rdetail.js
index ba8f086410..beb53218ed 100644
--- a/Open-ILS/web/opac/skin/tadlv2/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/tadlv2/js/rdetail.js
@@ -541,6 +541,10 @@ function _rdetailDraw(r) {
 					displayLabel = note;
 				}
 			}
+			// Latch-ditch attempt to prevent URLs as display labels
+			if (displayLabel.substring(0,7) == 'http://') {
+				displayLabel = 'Connect to this resource online';
+			}
 			$('rdetail_online').appendChild(elem('a', {href:href,'class':'css_button'}, displayLabel));
 			if (note && note != displayLabel) {
 				$('rdetail_online').appendChild(elem('span', {'class':'url_note'}, ' - ' + note));
diff --git a/Open-ILS/web/opac/skin/tadlv2/xml/rdetail/rdetail_summary.xml b/Open-ILS/web/opac/skin/tadlv2/xml/rdetail/rdetail_summary.xml
index 3bc25f0283..90dd95eb8a 100644
--- a/Open-ILS/web/opac/skin/tadlv2/xml/rdetail/rdetail_summary.xml
+++ b/Open-ILS/web/opac/skin/tadlv2/xml/rdetail/rdetail_summary.xml
@@ -133,7 +133,12 @@
    				<td nowrap='nowrap' class='rdetail_desc'>&rdetail.summary.online;</td>
 				<td class='rdetail_item' id='rdetail_online' type='opac/slot-data' query='volumes volume uris uri' join=", ">
 					<script type='opac/slot-format'><![CDATA[
-						var link = '<a href="' + item.getAttribute('href') + '">' + item.getAttribute('label') + '</a>';
+						var link;
+						var linklabel = item.getAttribute('label');
+						if (linklabel.substring(0,7) == 'http://') {
+							linklabel = 'Connect to this resource online';
+						}
+						var link = '<a href="' + item.getAttribute('href') + '" class="css_button">' + linklabel + '</a>';
 						if (item.getAttribute('use_restriction'))
 							link += ' (Use restriction: ' + item.getAttribute('use_restriction') + ')';
 						return link;
diff --git a/Open-ILS/web/opac/skin/tadlv2/xml/result/result_table.xml b/Open-ILS/web/opac/skin/tadlv2/xml/result/result_table.xml
index 4c628ebebf..a1e05e9841 100644
--- a/Open-ILS/web/opac/skin/tadlv2/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/tadlv2/xml/result/result_table.xml
@@ -161,6 +161,10 @@
                                             if (urihref.substring(0,20) == "http://via.tadl.org/") {
                                                 var uri_entry = dojo.create('div', {"style":"padding-bottom: 5px;"});
                                                 var link = dojo.create('a', {"class":"css_button", "href": urihref}, uri_entry);
+                                                if (urilabel.substring(0,7) == "http://") {
+                                                    // Provide a default label if label appears to be a URL
+                                                    urilabel = "Connect to this resource online";
+                                                }
                                                 var link_text = dojo.doc.createTextNode(urilabel);
                                                 link.appendChild(link_text);
                                                 output.appendChild(uri_entry);
-- 
2.11.0