From fdf060eaebe55b3a5cdbd242ab22e133e3c2f73f Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 22 Sep 2009 18:00:13 +0000 Subject: [PATCH] backporting r14089 and r14091: IE does not appreciate direct parent/child CSS selectors, so we will use the more generic descendant selector; improve the display of title data by providing a space between subfields (XML processors, particularly those rendering HTML, normalizes whitespace by default) git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_0@14093 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/BibTemplate.js | 11 +++-------- .../opac/skin/default/xml/rdetail/rdetail_summary.xml | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/BibTemplate.js b/Open-ILS/web/js/dojo/openils/BibTemplate.js index 5860b265e5..03f1948114 100644 --- a/Open-ILS/web/js/dojo/openils/BibTemplate.js +++ b/Open-ILS/web/js/dojo/openils/BibTemplate.js @@ -54,14 +54,9 @@ if(!dojo._hasResource["openils.BibTemplate"]) { var joiner = slot.getAttribute('join') || ' '; var slot_handler = dojo.map( - dojo.query('script[type=opac/slot-format]', slot).orphan(), - function(x){ - if(dojo.isIE) return x.innerHTML; - return dojox.data.dom.textContent(x) - } - ); - - slot_handler = slot_handler.join(''); + dojo.query( 'script[type=opac/slot-format]', slot ).orphan(), + function(x){ return dojox.data.dom.textContent(x) || x.innerHTML } + ).join(''); if (slot_handler) slot_handler = new Function('item', slot_handler); else slot_handler = new Function('item','return dojox.data.dom.textContent(item);'); 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 21ae8d7454..38e7dd1acd 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 @@ -6,7 +6,7 @@ - + &common.title; - - + + + @@ -75,7 +83,6 @@ -