[Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/z3950/s... [rel_2_2]

Owen Leonard oleonard at athenscounty.lib.oh.us
Thu Jun 29 21:17:02 CEST 2006 

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Owen Leonard <oleonard>	06/06/29 19:17:02

Modified files:
	koha-tmpl/intranet-tmpl/default/en/z3950: searchresult.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/z3950: searchresult.tmpl 
	z3950          : search.pl 

Log message:
	 - converting hard-coded color values in z3950/search.pl to generic toggle for use with css
	 - adding missing stylesheet and templateencoding markup to npl template

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/search.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.6&r2=1.3.2.7

Patches:
Index: koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl	19 Apr 2006 18:22:04 -0000	1.4.2.2
+++ koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl	29 Jun 2006 19:17:02 -0000	1.4.2.3
@@ -34,7 +34,7 @@
 				<th class="catalogue">&nbsp;</th>
 			</tr>
 				<!-- TMPL_LOOP NAME="breeding_loop" -->
-					<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+					<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 						<td><!-- TMPL_VAR NAME="title" --></td>
 						<td><!-- TMPL_VAR NAME="author" --></td>
 						<td><!-- TMPL_VAR NAME="isbn" --></td>

Index: koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl	26 Jan 2006 13:11:55 -0000	1.2.2.2
+++ koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl	29 Jun 2006 19:17:02 -0000	1.2.2.3
@@ -6,19 +6,19 @@
 	<!-- TMPL_IF NAME="refresh" -->
 		<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
 	<!-- /TMPL_IF -->
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<!-- TMPL_IF NAME="TemplateEncoding" --><meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME="TemplateEncoding" -->"><!-- TMPL_ELSE --><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><!-- /TMPL_IF -->
 <link rel="shortcut icon" href="/intranet-tmpl/npl/en/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+	<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
-<link href="<!-- TMPL_VAR NAME="themelang" -->/includes/colors-bw.css" rel="stylesheet" type="text/css" />
 </head>
 
 <body>
 
 <div id="main-compact">
 	<h2>Z3950 Search Results</h2>
-	
+	<!-- TMPL_IF NAME="numberpending" --><h3>Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h3><!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="breeding_loop" -->
 		<table>
 			<tr>
@@ -27,10 +27,9 @@
 				<th>ISBN</th>
 				<th>coming from</th>
 				<th>&nbsp;</th>
-				<th>&nbsp;</th>
 			</tr>
 				<!-- TMPL_LOOP NAME="breeding_loop" -->
-					<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+					<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
 						<td><!-- TMPL_VAR NAME="title" --></td>
 						<td><!-- TMPL_VAR NAME="author" --></td>
 						<td><!-- TMPL_VAR NAME="isbn" --></td>
@@ -42,7 +41,7 @@
 	<!-- TMPL_ELSE -->
 				<p>Nothing found</p>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="numberpending" --><h1>Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
+	
 	<script language="javascript" type="text/javascript">
 		function Import(GetThisOne) {
 			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;

Index: z3950/search.pl
===================================================================
RCS file: /sources/koha/koha/z3950/search.pl,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -b -r1.3.2.6 -r1.3.2.7
--- z3950/search.pl	18 Feb 2006 10:06:42 -0000	1.3.2.6
+++ z3950/search.pl	29 Jun 2006 19:17:02 -0000	1.3.2.7
@@ -84,9 +84,9 @@
 for (my $i=0; $i <= $#results; $i++) {
 	my %row_data;
 	if ($i % 2) {
-		$toggle="#ffffcc";
+		$toggle=1;
 	} else {
-		$toggle="white";
+		$toggle=0;
 	}
 	$row_data{toggle} = $toggle;
 	$row_data{id} = $results[$i]->{'id'};

More information about the Koha-cvs mailing list