backporting r14089 and r14091: IE does not appreciate direct parent/child CSS selecto...

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

diff --git a/Open-ILS/web/js/dojo/openils/BibTemplate.js b/Open-ILS/web/js/dojo/openils/BibTemplate.js
index 5860b26..03f1948 100644 (file)
--- 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 21ae8d7..38e7dd1 100644 (file)
--- 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 @@
                <tbody id='rdetail_details_tbody'>
 
                        <tr>
-                               <td id='rdetail_image_cell' rowspan='10'>
+                               <td id='rdetail_image_cell' rowspan='30'>
                                        <a id='rdetail_img_link'>
                                                <img style='border: none;' id='rdetail_image' 
                             onerror='
@@ -23,8 +23,16 @@
                                <td nowrap='nowrap' class='rdetail_desc'>&common.title;</td>            
                 <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
                      *** summary screen with more and/or different information.  In this case, the raw MARC 245. -->
-                <!-- <td type='opac/slot-data' query='datafield[tag=245]' class='rdetail_item' id='rdetail_title'> </td> -->
-                               <td class='rdetail_item' id='rdetail_title'> </td>
+                <td type='opac/slot-data' query='datafield[tag=245]' class='rdetail_item' id='rdetail_title'>
+                    <script type='opac/slot-format'><![CDATA[
+                        var out = '';
+                        var list = dojo.query( 'subfield', item );
+                        for (var i = 0; i < list.length; i++) {
+                            out += dojox.data.dom.textContent(list[i]) + ' ';
+                        }
+                        return out;
+                    ]]></script>
+                </td>
                        </tr>
 
                        <tr>
@@ -75,7 +83,6 @@
 
             <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
                  *** summary screen with complex information, such as new search links on subjects. -->
-            <!--
             <tr>
                 <td nowrap='nowrap' class='rdetail_desc'>Subjects</td>
                 <td type='opac/slot-data' query='datafield[tag=650]' class='rdetail_item'>
@@ -99,7 +106,6 @@
                     ]]></script>
                 </td>
             </tr>
-            -->
 
                        <tr class='hide_me' id='rdetail_online_row'>
                                <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
@@ -113,7 +119,7 @@
                                                ]]></script>
                                        </span>
                                </td>
-                               <td class='rdetail_item' id='rdetail_online' type='opac/slot-data' query='volumes > volume > uris > uri' join=", ">
+                               <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>';
                                                if (item.getAttribute('use_restriction'))