[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en includes/opac-c... [rel_2_2]

Owen Leonard oleonard at athenscounty.lib.oh.us
Fri Apr 28 20:46:30 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	Owen Leonard <oleonard at savannah.gnu.org>	06/04/28 18:46:30

Modified files:
	koha-tmpl/opac-tmpl/npl/en/includes: opac-colors.css 
	                                     opac-layout.css 
	koha-tmpl/opac-tmpl/npl/en: opac-MARCdetail.tmpl 

Log message:
	Bug fixing. New 'hide-marc' system preference wasn't working here. Copying over structure from CSS template with only minor modifications. Also copying styles from CSS-template stylesheet. That will hopefully make coordinated upgrades a little easier.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css.diff?only_with_tag=rel_2_2&tr1=1.1.2.2&tr2=1.1.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css.diff?only_with_tag=rel_2_2&tr1=1.1.2.3&tr2=1.1.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.7&tr2=1.1.2.8&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css
diff -u koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css:1.1.2.2 koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css:1.1.2.3
--- koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css:1.1.2.2	Mon Apr 10 21:48:28 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css	Fri Apr 28 18:46:30 2006
@@ -415,4 +415,25 @@
 
 #itemReviews dt {
         border-bottom: 1px solid #ddd;
+}
+
+div.tabbloc {
+	background-color:transparent;
+}
+
+div.tab {
+	background-color:transparent;
+}
+
+div.tab p {
+	border-top: 1px solid #D8DEB8;
+	border-bottom: 1px solid White;
+}
+
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
+	color:#000066;
+	background-color:#EEEEEE;
+}
+
+.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
 }
\ No newline at end of file
Index: koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css
diff -u koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css:1.1.2.3 koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css:1.1.2.4
--- koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css:1.1.2.3	Tue Apr 11 21:27:21 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css	Fri Apr 28 18:46:30 2006
@@ -803,3 +803,34 @@
         background: url(../images/bluestars.png) top left no-repeat;
 }
 
+div.tabbloc {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 80%;
+}
+
+div.tab {
+	display: block;
+	float:left;
+	margin-right:0px;
+	width:100%;
+}
+
+div.tab p {
+	margin : 0;
+	padding : 3px 0;
+}
+
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
+	font-weight:bold;
+	clear : both;
+	margin : 0;
+	padding : 2px 0;
+}
+
+.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
+	clear : both;
+	font-weight : bold;
+	float:left;
+	width: 12em;
+	margin-left:30px;
+}
\ No newline at end of file
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl:1.1.2.7 koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl:1.1.2.8
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl:1.1.2.7	Thu Apr 27 17:02:20 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl	Fri Apr 28 18:46:30 2006
@@ -21,109 +21,230 @@
 <!-- TMPL_IF name="opacbookbag" -->
 <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form><!-- /TMPL_IF -->
 
-		<table><!-- TMPL_LOOP name="0XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+<div class="tabbloc">
+	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
+		<!-- TMPL_LOOP name="0XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="1XX" id="1XX" class="tab">
 		<!-- TMPL_LOOP name="1XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="2XX" id="2XX" class="tab">
 		<!-- TMPL_LOOP name="2XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="3XX" id="3XX" class="tab">
 		<!-- TMPL_LOOP name="3XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="4XX" id="4XX" class="tab">
 		<!-- TMPL_LOOP name="4XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="5XX" id="5XX" class="tab">
 		<!-- TMPL_LOOP name="5XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->"></a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="6XX" id="6XX" class="tab">
 		<!-- TMPL_LOOP name="6XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="7XX" id="7XX" class="tab">
 		<!-- TMPL_LOOP name="7XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="8XX" id="8XX" class="tab">
 		<!-- TMPL_LOOP name="8XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
+	</div>
 
+	<div name="9XX" id="9XX" class="tab">
 		<!-- TMPL_LOOP name="9XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</table>
-<!-- TMPL_IF NAME="item_header_loop" -->
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_IF name="link" -->
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->"title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+					<!-- /TMPL_IF --><br class="clear" />
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="10XX" id="10XX" class="tab">
+		<h2>Items</h2>
 		<table>
-		<caption>Copies</caption>
 				<tr>
 					<!-- TMPL_LOOP name="item_header_loop" -->
 						<th>
@@ -136,10 +257,22 @@
 						<!-- TMPL_VAR name="item_value" -->
 					</tr>
 				<!-- /TMPL_LOOP -->
-		</table><!-- TMPL_ELSE -->
-		<table>
-			<tr><td>No copies available.</td></tr>
 		</table>
-	<!-- /TMPL_IF -->
+	</div>
 </div>
+<script language="JavaScript" type="text/javascript">
+function active(numlayer)
+{
+	for (i=0; i <= 10 ; i++ ) {
+		ong = i+"XX";
+		link = "link"+i;
+		if (numlayer==i) {
+			document.getElementById(ong).style.visibility="visible";
+		} else {
+			document.getElementById(ong).style.visibility="hidden";
+		}
+	}
+}
+</script>
+
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->





More information about the Koha-cvs mailing list