From 5b414803fa082821c408f7f47b1aa6e79f6da29e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 26 Nov 2008 14:45:58 -0600
Subject: [PATCH] Tweaks to display of "views" tabs (MARC, ISBD, etc).

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css      | 24 +++++++++----------
 .../prog/en/modules/opac-ISBDdetail.tmpl      |  6 +++--
 .../prog/en/modules/opac-MARCdetail.tmpl      |  7 ++++--
 .../prog/en/modules/opac-detail.tmpl          |  7 +++++-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl    | 16 ++++++-------
 5 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 4f9006b5f6..9123008aef 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -196,8 +196,7 @@ h2 {
 	font-size : 131%;
 }
 
-h2.author {
-	text-indent : .5em;
+h5.author {
 }
 
 h3 {
@@ -1058,6 +1057,7 @@ width: 100%;
 /* End hide from IE-mac */
 
 .results_summary {
+	clear : both;
 	display: block;
 	font-size : 85%;
 	color: #707070;
@@ -1602,19 +1602,19 @@ ul.ui-tabs-nav li.ui-tabs-selected a, ul.ui-tabs-nav li.ui-tabs-selected span.a
 
 #views {
 	border-bottom : 1px solid #E8E8E8;
+	float : left;
+	margin-bottom : .5em;
+	padding : 0 2em 0 0.2em;
+	white-space : nowrap;
 }
 
-#views h1 {
-	display : inline;
-	margin-right : .7em;
-	margin-bottom : 1em;
-}
-
-.views {
-	white-space : nowrap;
+span.view {
+	float : left;
+	padding : 0.2em .2em 2px .2em;
 }
 
-#bibliodescriptions {
+#bibliodescriptions,
+#isbdcontents {
 	clear : left;
 	margin-top : .5em;
 }
@@ -1645,7 +1645,7 @@ a#Normalview, span#Normalview {
 	padding-left : 15px;
 }
 
-a#MARCview, a#ISBDview, a#Normalview {
+a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview {
 	background-color : #F3F3F3;
 	border-left : 1px solid #E8E8E8;
 }
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index cb8142232d..a48ef1c31f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -20,8 +20,10 @@
 	<div class="container">	
 	
 	
-    <div id="views"> <h1 style="display: inline;">ISBD</h1> <span class="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">MARC View</a> <span id="ISBDview">ISBD View</span></span></div>
-    <!-- TMPL_VAR name="ISBD" -->
+     <h1 style="float:left;margin:0 1em 1em 0;">ISBD</h1> <div id="views">
+	 <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">MARC View</a></span> <span class="view"><span id="ISBDview">ISBD View</span></span>
+</div>
+    <div id="isbdcontents"><!-- TMPL_VAR name="ISBD" --></div>
 	
 		<div id="bibliodescriptions" class="toptabs">
 	<ul>   
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index 615e3a16e0..a28f0a594f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -20,8 +20,11 @@
 </div>
 
     <div class="yui-g" style="margin-top : 1em;">
-	<div id="views"><h1 style="display: inline;">MARC View</h1> <span class="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a> <span id="MARCview">MARC View</span> <!-- TMPL_IF NAME="ISBD" --><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a><!-- /TMPL_IF --></span></div>
-    <h1><!-- TMPL_VAR NAME="bibliotitle" --> (Record no. <!-- TMPL_VAR NAME="biblionumber" -->)</h1>
+	<h1 style="float:left;margin: 0 1em 1em 0;">MARC View</h1>
+	<div id="views">
+	<span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a></span> <span class="view"><span id="MARCview">MARC View</span></span> <!-- TMPL_IF NAME="ISBD" --><span class="view"><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a></span><!-- /TMPL_IF -->
+</div>
+    <h1 style="clear:both;"><!-- TMPL_VAR NAME="bibliotitle" --> (Record no. <!-- TMPL_VAR NAME="biblionumber" -->)</h1>
 	<table id="marc">
         <!-- TMPL_LOOP name="0XX" -->
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 9c6c37e7ba..6104787a9e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -63,11 +63,16 @@
     <!-- TMPL_IF NAME="XSLTDetailsDisplay" -->
         <!-- TMPL_VAR NAME="XSLTBloc" -->
     <!-- TMPL_ELSE -->
+<<<<<<< HEAD:koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
     <div id="views">
     <h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h1> <span class="views"><span id="Normalview">Normal View</span> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a> <!-- TMPL_IF NAME="ISBD" --><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a><!-- /TMPL_IF --></span>
+=======
+    <h1><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h1>
+    <!-- TMPL_IF NAME="author" --><h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" ESCAPE="HTML" --></a></h5><!-- /TMPL_IF --> 
+    <div id="views"><span class="view"><span id="Normalview">Normal View</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></span> <!-- TMPL_IF NAME="ISBD" --><span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a></span><!-- /TMPL_IF -->
+>>>>>>> 8350c0b... Tweaks to display of "views" tabs (MARC, ISBD, etc).:koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
     </div>
 
-    <!-- TMPL_IF NAME="author" --><h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" ESCAPE="HTML" --></a></h5><!-- /TMPL_IF -->
     <span class="results_summary"><!-- TMPL_UNLESS NAME="item-level_itypes" -->
         [
         <!-- TMPL_IF name="description" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 2e0ba36fce..e3257f4fe8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -50,7 +50,6 @@
         </xsl:variable>
 
         <!-- Title Statement -->
-        <div id="views">
         <xsl:if test="marc:datafield[@tag=245]">
         <h1>
             <xsl:for-each select="marc:datafield[@tag=245]">
@@ -61,12 +60,6 @@
         </h1>
         </xsl:if>
 
-        <span class="views"><span id="Normalview">Normal View</span> 
-        <a id="MARCviewPop" href="/cgi-bin/koha/opac-showmarc.pl?id={marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="MARC" rel="gb_page_center[600,500]">MARC View</a>
-        <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="MARC">Expanded MARC View</a>
-        <a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}">Card View (ISBD)</a></span>
-        </div> 
-
         <xsl:choose>
         <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
 
@@ -117,10 +110,17 @@
         </h5>
         </xsl:when>
         </xsl:choose>
+        <div id="views">
+        <span class="view"><span id="Normalview">Normal View</span> </span>
+        <span class="view"><a id="MARCviewPop" href="/cgi-bin/koha/opac-showmarc.pl?id={marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="MARC" rel="gb_page_center[600,500]">MARC View</a></span>
+        <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="MARC">Expanded MARC View</a></span>
+        <span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}">Card View (ISBD)</a></span>
+        </div> 
+
 
         <xsl:if test="$materialTypeCode">
         <span class="results_summary"><span class="label">Type: </span>
-        <xsl:element name="img"><xsl:attribute name="src">/opac-tmpl/prog/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt">typeicon</xsl:attribute></xsl:element>
+        <xsl:element name="img"><xsl:attribute name="src">/opac-tmpl/prog/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element>
         <xsl:value-of select="$materialTypeLabel"/>
         </span>
         </xsl:if>
-- 
2.39.5