From 94fb99d17303447c294e23d1658dc90347963c7d Mon Sep 17 00:00:00 2001
From: dbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Fri, 31 Jul 2009 19:27:36 +0000
Subject: [PATCH] Make the detailed skin work better in IE (although URIs are
 still coming only from the bib record). Bring i18n to the detailed skin.

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/trunk@601 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---
 web/opac/locale/en-CA/opac_conifer.dtd             | 14 ++++
 web/opac/locale/en-US/opac_conifer.dtd             | 14 ++++
 web/opac/locale/fr-CA/opac_conifer.dtd             | 16 ++++-
 .../skin/default/xml/rdetail/rdetail_summary.xml   | 82 +++++++++++++++-------
 4 files changed, 100 insertions(+), 26 deletions(-)

diff --git a/web/opac/locale/en-CA/opac_conifer.dtd b/web/opac/locale/en-CA/opac_conifer.dtd
index 41b271da2b..201e3410dc 100644
--- a/web/opac/locale/en-CA/opac_conifer.dtd
+++ b/web/opac/locale/en-CA/opac_conifer.dtd
@@ -1,3 +1,17 @@
+<!-- Entities for detailed item page -->
+<!ENTITY common.alternate.title "Alternate title">
+<!ENTITY common.corporate.author "Corporate author">
+<!ENTITY common.meeting.name "Meeting name">
+<!ENTITY common.issn "ISSN">
+<!ENTITY common.subjects "Subjects">
+<!ENTITY common.general.note "General note">
+<!ENTITY common.contents.note "Contents note">
+<!ENTITY common.usage.restrictions "Usage restrictions">
+<!ENTITY common.performer.note "Performer note">
+<!ENTITY common.additional.authors "Additional authors">
+<!ENTITY common.preceding.entry "Preceding entry">
+<!ENTITY common.succeeding.entry "Succeeding entry">
+
 <!ENTITY rdetail.extras.preview "Preview">
 <!ENTITY rdetail.extras.performer.notes "Performer or Participant Notes">
 <!-- custom Laurentian footer links -->
diff --git a/web/opac/locale/en-US/opac_conifer.dtd b/web/opac/locale/en-US/opac_conifer.dtd
index 914e645c21..d20f471deb 100644
--- a/web/opac/locale/en-US/opac_conifer.dtd
+++ b/web/opac/locale/en-US/opac_conifer.dtd
@@ -1,3 +1,17 @@
+<!-- Entities for detailed item page -->
+<!ENTITY common.alternate.title "Alternate title">
+<!ENTITY common.corporate.author "Corporate author">
+<!ENTITY common.meeting.name "Meeting name">
+<!ENTITY common.issn "ISSN">
+<!ENTITY common.subjects "Subjects">
+<!ENTITY common.general.note "General note">
+<!ENTITY common.contents.note "Contents note">
+<!ENTITY common.usage.restrictions "Usage restrictions">
+<!ENTITY common.performer.note "Performer note">
+<!ENTITY common.additional.authors "Additional authors">
+<!ENTITY common.preceding.entry "Preceding entry">
+<!ENTITY common.succeeding.entry "Succeeding entry">
+
 <!ENTITY rdetail.extras.preview "Preview">
 <!ENTITY rdetail.extras.performer.notes "Performer or Participant Notes">
 <!-- custom LU footer links -->
diff --git a/web/opac/locale/fr-CA/opac_conifer.dtd b/web/opac/locale/fr-CA/opac_conifer.dtd
index 4dbed0a69e..bf5c2420ac 100644
--- a/web/opac/locale/fr-CA/opac_conifer.dtd
+++ b/web/opac/locale/fr-CA/opac_conifer.dtd
@@ -1,5 +1,19 @@
+<!-- Entities for detailed item page -->
+<!ENTITY common.alternate.title "Autre titre">
+<!ENTITY common.corporate.author "Nom de collectivité">
+<!ENTITY common.meeting.name "Nom de la conférence">
+<!ENTITY common.issn "ISSN">
+<!ENTITY common.subjects "Sujets">
+<!ENTITY common.general.note "Note générale">
+<!ENTITY common.contents.note "Note structurée de sommaire">
+<!ENTITY common.usage.restrictions "Note sur les limites à la consultation">
+<!ENTITY common.performer.note "Note sur les participants ou les interprètes">
+<!ENTITY common.additional.authors "Autre auteurs">
+<!ENTITY common.preceding.entry "Liaison au document prédécesseur">
+<!ENTITY common.succeeding.entry "Liaison au document successeur">
+
 <!ENTITY rdetail.extras.preview "Preview">
-<!ENTITY rdetail.extras.performer.notes "Performer or Participant Notes">
+<!ENTITY rdetail.extras.performer.notes "Note sur les participants ou les interprètes">
 <!-- custom LU footer links -->
 <!ENTITY lu.footer.ejournals "Revues électroniques A à Z">
 <!ENTITY lu.footer.ejournals.url "http://sfx.scholarsportal.info/laurentian/az">
diff --git a/web/opac/skin/default/xml/rdetail/rdetail_summary.xml b/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
index 300a8fef76..80d0e53f56 100644
--- a/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
+++ b/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
@@ -21,11 +21,16 @@
                     </div>
 				</td>
 				<td nowrap='nowrap' class='rdetail_desc'>&common.title;</td>		
-				<td type='opac/slot-data' query='datafield[tag=245]' 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[
+                                                dojo.query('*:not([type^=opac])', 'rdetail_title').orphan();
+                                                return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+                                        ]]></script>
+                                </td>
 			</tr>
 
 			<tr class='hide_me' id='tag246'>
-				<td nowrap='nowrap' class='rdetail_desc'>Alternate title</td>
+				<td nowrap='nowrap' class='rdetail_desc'>&common.alternate.title;</td>
 				<td type='opac/slot-data' query='datafield[tag=246] > subfield[code=a]' class='rdetail_item'>
 					<script type='opac/slot-format'><![CDATA[
 						unHideMe($('tag246'));
@@ -33,17 +38,44 @@
 					]]></script>
 				</td>
 			</tr>
-			<tr>
+			<tr class='hide_me'>
 				<td nowrap='nowrap' class='rdetail_desc'>&common.author;</td>		
 				<td class='rdetail_item'>
 					<a title='&rdetail.author.search;' id='rdetail_author'> </a>
 				</td>
 			</tr>
-
+			<tr class='hide_me' id='tag100'>
+				<td nowrap='nowrap' class='rdetail_desc'>&common.author;</td>
+				<td type='opac/slot-data' query='datafield[tag=100]' class='rdetail_item'>
+					<script type='opac/slot-format'><![CDATA[
+						unHideMe($('tag100'));
+						return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+					]]></script>
+				</td>
+			</tr>
+			<tr class='hide_me' id='tag110'>
+				<td nowrap='nowrap' class='rdetail_desc'>&common.corporate.author;</td>
+				<td type='opac/slot-data' query='datafield[tag=110]' class='rdetail_item'>
+					<script type='opac/slot-format'><![CDATA[
+						unHideMe($('tag110'));
+						return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+					]]></script>
+				</td>
+			</tr>
+			<tr class='hide_me' id='tag111'>
+				<td nowrap='nowrap' class='rdetail_desc'>&common.meeting.name;</td>
+				<td type='opac/slot-data' query='datafield[tag=111]' class='rdetail_item'>
+					<script type='opac/slot-format'><![CDATA[
+						unHideMe($('tag111'));
+						return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+					]]></script>
+				</td>
+			</tr>
 			<tr class='hide_me' id='tag020'>
 				<td nowrap='nowrap' class='rdetail_desc'>&common.isbn;</td>			
 				<td type='opac/slot-data' query='datafield[tag=020]' class='rdetail_item' id='rdetail_isbn'>
 				    <script type='opac/slot-format'><![CDATA[
+					dojo.query('*:not([type^=opac])', 'rdetail_isbn').orphan();
 					unHideMe($('tag020'));
 					return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
 				    ]]></script>
@@ -51,7 +83,7 @@
 
 			</tr>
 			<tr class='hide_me' id='tag022'>
-				<td nowrap='nowrap' class='rdetail_desc'>ISSN</td>			
+				<td nowrap='nowrap' class='rdetail_desc'>&common.issn;</td>			
 				<td type='opac/slot-data' query='datafield[tag=022]' class='rdetail_item' id='rdetail_issn'>
 				    <script type='opac/slot-format'><![CDATA[
 					unHideMe($('tag022'));
@@ -71,9 +103,15 @@
 				<td class='rdetail_item' id='rdetail_pubdate'> </td>
 			</tr>
 
-			<tr>
+			<tr class='hide_me' id='tag260'>
 				<td nowrap='nowrap' class='rdetail_desc'>&common.publisher;</td>		
-				<td type='opac/slot-data' query='datafield[tag=260]' class='rdetail_item' id='rdetail_publisher'> </td> 
+				<td type='opac/slot-data' query='datafield[tag=260]' class='rdetail_item' id='rdetail_publisher'>
+				    <script type='opac/slot-format'><![CDATA[
+					dojo.query('*:not([type^=opac])', 'rdetail_publisher').orphan();
+					unHideMe($('tag260'));
+					return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+				    ]]></script>
+			    </td> 
 			</tr>
 
 
@@ -94,6 +132,7 @@
 				<td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.abstract;</td>	
 				<td type='opac/slot-data' query='datafield[tag=520]' class='rdetail_item' id='rdetail_abstract'>
 				    <script type='opac/slot-format'><![CDATA[
+					dojo.query('*:not([type^=opac])', 'rdetail_abstract').orphan();
 					unHideMe($('tag520'));
 					return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
 				    ]]></script>
@@ -104,7 +143,7 @@
             <!-- *** 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 class='hide_me' id='tag65_'>
-			 <td nowrap='nowrap' class='rdetail_desc'>Subjects</td>
+			 <td nowrap='nowrap' class='rdetail_desc'>&common.subjects;</td>
 			 <td type='opac/slot-data' query='datafield[tag^=65]' class='rdetail_item'>
 			 <script type='opac/slot-format'><![CDATA[
 				unHideMe($('tag65_'));
@@ -128,7 +167,7 @@
 			</td>
 		</tr>
 		<tr class='hide_me' id='tag500'>
-			<td nowrap='nowrap' class='rdetail_desc'>General note</td>
+			<td nowrap='nowrap' class='rdetail_desc'>&common.general.note;</td>
 			<td type='opac/slot-data' query='datafield[tag=500]' class='rdetail_item'>
 				<script type='opac/slot-format'><![CDATA[
 				unHideMe($('tag500'));
@@ -137,7 +176,7 @@
 			</td>
 		</tr>
 		<tr class='hide_me' id='tag505'>
-			<td nowrap='nowrap' class='rdetail_desc'>Contents note</td>
+			<td nowrap='nowrap' class='rdetail_desc'>&common.contents.note;</td>
 			<td type='opac/slot-data' query='datafield[tag=505]' class='rdetail_item'>
 				<script type='opac/slot-format'><![CDATA[
 				unHideMe($('tag505'));
@@ -146,7 +185,7 @@
 			</td>
 		</tr>
 		<tr class='hide_me' id='tag506'>
-			<td nowrap='nowrap' class='rdetail_desc'>Usage restrictions</td>
+			<td nowrap='nowrap' class='rdetail_desc'>&common.usage.restrictions;</td>
 			<td type='opac/slot-data' query='datafield[tag=506] > subfield[code=a]' class='rdetail_item'>
 				<script type='opac/slot-format'><![CDATA[
 				unHideMe($('tag506'));
@@ -155,7 +194,7 @@
 			</td>
 		</tr>
 		<tr class='hide_me' id='tag511'>
-			<td nowrap='nowrap' class='rdetail_desc'>Performer note</td>
+			<td nowrap='nowrap' class='rdetail_desc'>&common.performer.note;</td>
 			<td type='opac/slot-data' query='datafield[tag=511]' class='rdetail_item'>
 				<script type='opac/slot-format'><![CDATA[
 				unHideMe($('tag511'));
@@ -164,7 +203,7 @@
 			</td>
 		</tr>
 		<tr class='hide_me' id='tag700'>
-			<td nowrap='nowrap' class='rdetail_desc'>Additional authors</td>
+			<td nowrap='nowrap' class='rdetail_desc'>&common.additional.authors;</td>
 			<td type='opac/slot-data' query='datafield[tag=700]' class='rdetail_item'>
 				<script type='opac/slot-format'><![CDATA[
 				unHideMe($('tag700'));
@@ -173,7 +212,7 @@
 			</td>
 		</tr>
 		<tr class='hide_me' id='tag780'>
-			<td nowrap='nowrap' class='rdetail_desc'>Preceding entry</td>
+			<td nowrap='nowrap' class='rdetail_desc'>&common.preceding.entry;</td>
 			<td type='opac/slot-data' query='datafield[tag=780]' class='rdetail_item'>
 				<script type='opac/slot-format'><![CDATA[
 				unHideMe($('tag780'));
@@ -182,7 +221,7 @@
 			</td>
 		</tr>
 		<tr class='hide_me' id='tag785'>
-			<td nowrap='nowrap' class='rdetail_desc'>Succeeding entry</td>
+			<td nowrap='nowrap' class='rdetail_desc'>&common.succeeding.entry;</td>
 			<td type='opac/slot-data' query='datafield[tag=785]' class='rdetail_item'>
 				<script type='opac/slot-format'><![CDATA[
 				unHideMe($('tag785'));
@@ -193,18 +232,11 @@
 		<tr class='hide_me' id='rdetail_online_row'>
 			<!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
 			     *** summary screen with complex information, such as location-specific URIs (856$9). -->
-			<td nowrap='nowrap' class='rdetail_desc'>&rdetail.summary.online;
-				<span class='hide_me' type='opac/slot-data' query='datafield[tag=856] subfield[code=9]'>
-					<script type='opac/slot-format'><![CDATA[
-						// There exists at least one localized URI. Clear all links.
-						dojo.query('*:not([type^=opac])', 'rdetail_online').orphan();
-						return '';
-					]]></script>
-				</span>
-			</td>
+			<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'>
 				<script type='opac/slot-format'><![CDATA[
-					var uri = Array();
+					dojo.query('*:not([type^=opac])', 'rdetail_online').orphan();
+					var uri = new Object;
 					uri.href = item.getAttribute('href');
 					uri.label = item.getAttribute('label');
 					uri.use = item.getAttribute('use_restriction');
-- 
2.11.0