[Koha-cvs] koha koha-tmpl/opac-tmpl/css/en/opac-main.tmpl ... [rel_2_2]

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	paul poulain <tipaul at savannah.gnu.org>	06/03/08 13:15:05

Modified files:
	koha-tmpl/opac-tmpl/css/en: opac-main.tmpl 
	opac           : opac-main.pl 

Log message:
	adding opacreadinghistory support in default css templates as well

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl.diff?only_with_tag=rel_2_2&tr1=1.16.2.10&tr2=1.16.2.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-main.pl.diff?only_with_tag=rel_2_2&tr1=1.16.2.6&tr2=1.16.2.7&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
diff -u koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:1.16.2.10 koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:1.16.2.11
--- koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:1.16.2.10	Wed Mar  8 13:08:36 2006
+++ koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl	Wed Mar  8 13:15:05 2006
@@ -69,8 +69,9 @@
 			<a href="/cgi-bin/koha/opac-user.pl" class="button">
 				My details
 			</a>
-			<a href="/cgi-bin/koha/opac-readingrecord.pl" class="button">My reading history</a>
-			
+			<!-- TMPL_IF name="opacreadinghistory" -->
+				<a href="/cgi-bin/koha/opac-readingrecord.pl" class="button">My reading history</a>
+			<!-- /TMPL_IF -->
 			<a href="/cgi-bin/koha/opac-main.pl?logout.x=1" class="button">
 				Log Out
 			</a>
@@ -82,16 +83,18 @@
 	<!-- TMPL_ELSE -->
 		<p><a href="/cgi-bin/koha/opac-user.pl">Log in to Koha</a> to have personal options.</p>
 	<!-- /TMPL_IF -->
-	<form action="/cgi-bin/koha/changelanguage.pl" method="post">
-		<p>
-			<select name="language">
-				<TMPL_LOOP NAME="languages">
-					<option value="<TMPL_VAR NAME="language">"><TMPL_VAR NAME="language"></option>
-				</TMPL_LOOP>
-			</select>
-			<input type="submit" value="Change Language" class="button" />
-		</p>
-	</form>
+	<!-- TMPL_IF name="opaclanguagesdisplay" -->
+		<form action="/cgi-bin/koha/changelanguage.pl" method="post">
+			<p>
+				<select name="language">
+					<TMPL_LOOP NAME="languages">
+						<option value="<TMPL_VAR NAME="language">"><TMPL_VAR NAME="language"></option>
+					</TMPL_LOOP>
+				</select>
+				<input type="submit" value="Change Language" class="button" />
+			</p>
+		</form>
+	<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="opaccredits" -->
 	<p class="copyright"><!-- TMPL_VAR NAME="opaccredits" --></p>
 <!-- TMPL_ELSE -->
Index: koha/opac/opac-main.pl
diff -u koha/opac/opac-main.pl:1.16.2.6 koha/opac/opac-main.pl:1.16.2.7
--- koha/opac/opac-main.pl:1.16.2.6	Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-main.pl	Wed Mar  8 13:15:05 2006
@@ -63,6 +63,7 @@
 				LibraryName => C4::Context->preference("LibraryName"),
 				OpacNav => C4::Context->preference("OpacNav"),
 				opaccredits => C4::Context->preference("opaccredits"),
+				opacreadinghistory => C4::Context->preference("opacreadinghistory"),
 				opacsmallimage => C4::Context->preference("opacsmallimage"),
 				opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
 				opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),