From 7acd31683c4c37bc2d68b2e898cf3cd2305c56b1 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 29 Oct 2007 20:00:01 +0000 Subject: [PATCH] added content url is now encoded in the DTD for easier localization. JS config is now just an on/off switch git-svn-id: svn://svn.open-ils.org/ILS/trunk@7944 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/js/added_content.js | 9 --------- Open-ILS/web/opac/common/js/config.js | 10 ++++------ Open-ILS/web/opac/locale/en-US/opac.dtd | 3 ++- Open-ILS/web/opac/skin/default/js/rdetail.js | 6 +++--- Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml | 3 ++- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/Open-ILS/web/opac/common/js/added_content.js b/Open-ILS/web/opac/common/js/added_content.js index 1fb9cfcc57..850858d87b 100644 --- a/Open-ILS/web/opac/common/js/added_content.js +++ b/Open-ILS/web/opac/common/js/added_content.js @@ -10,15 +10,6 @@ function buildISBNSrc(isbn, size) { return '../../../../extras/ac/jacket/'+size+'/'+isbn; } -function buildVendorProductLink(isbn, vendor) { - vendor = (vendor) ? vendor : ADDED_CONTENT_VENDOR; - switch(vendor) { - case 'amazon': - return 'http://www.amazon.com/dp/' + isbn; - } - return ''; -} - function acMakeURL(type, key) { return '../../../../extras/ac/' + type + '/html/' + key; diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js index a8a5af2b2c..224399706b 100644 --- a/Open-ILS/web/opac/common/js/config.js +++ b/Open-ILS/web/opac/common/js/config.js @@ -140,13 +140,11 @@ var PREF_DEF_LOCATION = 'opac.default_search_location'; var PREF_DEF_DEPTH = 'opac.default_search_depth'; -/** global added content vendor setting. This setting is only needed/used - if your added content vendor requires links back to their site. If - set to null, no links will be constructed - - Current options are: null and 'amazon' +/** If enabled, added content attribution links will be + made visible where appropriate. The added content vendor name + and URL are defined in the entities in opac.dtd */ -var ADDED_CONTENT_VENDOR=null; +var ENABLE_ADDED_CONTENT_ATTRIB_LINKS = false; /* container for global variables shared accross pages */ diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd index 7202092dfd..a8b7f84548 100644 --- a/Open-ILS/web/opac/locale/en-US/opac.dtd +++ b/Open-ILS/web/opac/locale/en-US/opac.dtd @@ -622,4 +622,5 @@ Ensure Caps-Lock is off and try again or contact your local library."> - + + diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index 95b2422772..356a69c7c2 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -192,10 +192,10 @@ function _rdetailDraw(r) { G.ui.rdetail.abstr.appendChild(text(record.synopsis())); try{ - if(ADDED_CONTENT_VENDOR) { + if(ENABLE_ADDED_CONTENT_ATTRIB_LINKS) { unHideMe($('rdetail.jacket_attrib_div')); - $('rdetail.jacket_attrib_link').setAttribute( - 'href', buildVendorProductLink(cleanISBN(record.isbn()))); + var href = $('rdetail.jacket_attrib_link').getAttribute('href') +cleanISBN(record.isbn()); + $('rdetail.jacket_attrib_link').setAttribute('href', href); } } catch(E) {} diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml index 9d92a03877..42af1fc007 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml @@ -15,7 +15,8 @@
&opac.image_provided;
-
&vendor.amazon;
+
&vendor.name;
&common.title; -- 2.11.0