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

Owen Leonard oleonard at athenscounty.lib.oh.us
Wed Apr 19 20:20:20 CEST 2006


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

Modified files:
	koha-tmpl/intranet-tmpl/default/en/includes: about-top.inc 
	                                             acquisitions-top.inc 
	                                             auth-search-top.inc 
	                                             auth-top.inc 
	                                             bull-top.inc 
	                                             cat-top.inc 
	                                             circulation-top.inc 
	                                             error-top.inc 
	                                             help-top.inc 
	                                             marc-top.inc 
	                                             members-top.inc 
	                                             neutral-top.inc 
	                                             opac-top.inc 
	                                             parameters-top.inc 
	                                             popup-top.inc 
	                                             quicksearch-top.inc 
	                                             reports-top.inc 
	                                             reportswcal-top.inc 

Log message:
	Enabling TemplateEncoding system preference

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc.diff?only_with_tag=rel_2_2&tr1=1.20.2.1&tr2=1.20.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc.diff?only_with_tag=rel_2_2&tr1=1.24.2.3&tr2=1.24.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc.diff?only_with_tag=rel_2_2&tr1=1.2.2.1&tr2=1.2.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc.diff?only_with_tag=rel_2_2&tr1=1.7.2.2&tr2=1.7.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc.diff?only_with_tag=rel_2_2&tr1=1.5.2.1&tr2=1.5.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc.diff?only_with_tag=rel_2_2&tr1=1.35.2.1&tr2=1.35.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc.diff?only_with_tag=rel_2_2&tr1=1.30.2.2&tr2=1.30.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc.diff?only_with_tag=rel_2_2&tr1=1.3&tr2=1.3.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/help-top.inc.diff?only_with_tag=rel_2_2&tr1=1.4&tr2=1.4.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc.diff?only_with_tag=rel_2_2&tr1=1.12.2.4&tr2=1.12.2.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc.diff?only_with_tag=rel_2_2&tr1=1.27.2.1&tr2=1.27.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/neutral-top.inc.diff?only_with_tag=rel_2_2&tr1=1.1&tr2=1.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc.diff?only_with_tag=rel_2_2&tr1=1.10&tr2=1.10.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc.diff?only_with_tag=rel_2_2&tr1=1.31.2.2&tr2=1.31.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/popup-top.inc.diff?only_with_tag=rel_2_2&tr1=1.3&tr2=1.3.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc.diff?only_with_tag=rel_2_2&tr1=1.25.2.1&tr2=1.25.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/reportswcal-top.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.2&tr2=1.1.2.3&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:1.20.2.1 koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:1.20.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:1.20.2.1	Thu Jul 28 15:28:56 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc	Wed Apr 19 18:20:19 2006
@@ -4,7 +4,7 @@
 <head>
 <title>KOHA: INTRANET: About</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<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 -->
 <script language="JavaScript" type="text/javascript">
 function Help() {
 	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:1.24.2.3 koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:1.24.2.4
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:1.24.2.3	Thu Jul 28 15:28:56 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc	Wed Apr 19 18:20:19 2006
@@ -15,7 +15,7 @@
 </script>
 <!-- /Additions for Calendar-system -->
 
-<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 -->
 <script language="JavaScript" type="text/javascript">
 function Help() {
 	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc:1.2.2.1 koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc:1.2.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc:1.2.2.1	Tue Apr 18 18:45:00 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc	Wed Apr 19 18:20:19 2006
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Authorities</title>
-<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 -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:1.7.2.2 koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:1.7.2.3
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:1.7.2.2	Tue Apr 18 18:45:00 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc	Wed Apr 19 18:20:19 2006
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Authorities</title>
-<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 -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:1.5.2.1 koha/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:1.5.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:1.5.2.1	Thu Jul 28 15:28:56 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc	Wed Apr 19 18:20:19 2006
@@ -4,7 +4,7 @@
 <head>
 <title>KOHA: INTRANET: Serials management</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<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 -->
 <script language="JavaScript" type="text/javascript">
 function Help() {
 	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:1.35.2.1 koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:1.35.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:1.35.2.1	Thu Jul 28 15:28:56 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc	Wed Apr 19 18:20:19 2006
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Catalogue</title>
-<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 -->
 
 <script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:1.30.2.2 koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:1.30.2.3
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:1.30.2.2	Tue Apr 18 18:45:00 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc	Wed Apr 19 18:20:19 2006
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Circulation</title>
-<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 -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc
diff -u /dev/null koha/koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:1.3.2.1
--- /dev/null	Wed Apr 19 18:20:20 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc	Wed Apr 19 18:20:19 2006
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+<title>KOHA: INTRANET: Catalogue</title>
+<!-- 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 -->
+
+<script language="JavaScript">
+<!-- Hide from old browsers
+function openWindow(targeturl, windowname) {
+newwin =
+window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
+}
+// end hiding -->
+</script>
+
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
+
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<style type="text/css">
+.catalogue {
+	background-color:#ad11ad;
+	color:#FFFFFF;
+	background-image:none;
+	text-decoration: normal;
+	}
+a.catalogue:hover {
+	background-color: #ad11ad;
+	color: #FFFFFF;
+	text-decoration: none;
+	}
+</style>
+</head>
+
+<body>
+<!-- MENUS -->
+<div id="menubar">
+	<span class="koha">KOHA</span>
+	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
+	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
+	<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
+	<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
+	<a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
+	<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
+	<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
+	<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
+	<a class="about" href="/cgi-bin/koha/about.pl">About</a>
+	<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
+</div>
+<div id="submenu">
+	<span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
+	<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">search</a>
+	<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtual shelves</a>
+	<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu2">Add biblio</a>
+	<a href="/cgi-bin/koha/maint/catmaintain.pl" class="submenu">Cat maintenance</a>
+</div>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+<!-- /TMPL_IF -->
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/help-top.inc
diff -u /dev/null koha/koha-tmpl/intranet-tmpl/default/en/includes/help-top.inc:1.4.2.1
--- /dev/null	Wed Apr 19 18:20:20 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/help-top.inc	Wed Apr 19 18:20:19 2006
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+<title>KOHA: online help</title>
+<!-- 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="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<body>
+<div id="mainbloc">
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:1.12.2.4 koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:1.12.2.5
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:1.12.2.4	Thu Jul 28 15:28:56 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc	Wed Apr 19 18:20:19 2006
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Catalogue</title>
-<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 -->
 
 <script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:1.27.2.1 koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:1.27.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:1.27.2.1	Wed Sep 14 14:21:24 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc	Wed Apr 19 18:20:19 2006
@@ -4,7 +4,7 @@
 <head>
 <title>KOHA: INTRANET: Members</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<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 -->
 <script language="JavaScript" type="text/javascript">
 function Help() {
 	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/neutral-top.inc
diff -u /dev/null koha/koha-tmpl/intranet-tmpl/default/en/includes/neutral-top.inc:1.1.2.1
--- /dev/null	Wed Apr 19 18:20:20 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/neutral-top.inc	Wed Apr 19 18:20:19 2006
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+<title>KOHA: INTRANET: Catalogue</title>
+<!-- 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 -->
+
+<script language="JavaScript">
+<!-- Hide from old browsers
+function openWindow(targeturl, windowname) {
+newwin =
+window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
+}
+// end hiding -->
+</script>
+
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
+
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<style type="text/css">
+.catalogue {
+	background-color:#ad11ad;
+	color:#FFFFFF;
+	background-image:none;
+	text-decoration: normal;
+	}
+a.catalogue:hover {
+	background-color: #ad11ad;
+	color: #FFFFFF;
+	text-decoration: none;
+	}
+</style>
+</head>
+
+<body>
+<!-- MENUS -->
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc
diff -u /dev/null koha/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:1.10.2.1
--- /dev/null	Wed Apr 19 18:20:20 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc	Wed Apr 19 18:20:19 2006
@@ -0,0 +1,78 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--Authored by rachel at katipo.co.nz 10:46 24/12/99-->
+
+<html>
+<head>
+<title>KOHA: OPAC Catalogue Search</title>
+<!-- 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 -->
+
+</head>
+<body text="black" bgcolor="white" link="#0000ff" vlink="#3366cc" Alink="#cc3300"
+marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
+
+
+
+<!--HDL Colours
+
+        Yellow = ffcc00 
+        light blue = ccccff
+        bright blue links = 0000ff
+        aubergine = 663266 
+        light green/grey = cccc99
+
+
+-->
+
+<!--------------------------MENUS---------------------------------->
+
+<table cellpadding=0 cellspacing=0 width="100%" border=0>
+<tr BGCOLOR="#339999" >
+
+        <td valign=bottom><img src="<!-- TMPL_VAR name="themelang" -->/images/inside-top-search.gif" 
+	width=349 height=50 alt="KOHA: Catalogue Search" hspace=0 vspace=0 border=0></td>
+
+
+        <td align=right><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet" 		onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img 
+	src="<!-- TMPL_VAR name="themelang" -->/images/menu-search.gif" 
+	width=71 height=30 alt="Search" hspace=0 vspace=0 border=0 name="menu-search"></a>
+	
+<!--	<a href="/member/"
+	onMouseOver="document.mouseover.src='/images/mouseover-member.gif'" 			onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="/images/menu-login.gif" 
+	width=111 height=30 alt="Member Login" hspace=0 vspace=0 border=0 name="menu-login"></a>
+-->
+	<!-- TMPL_IF NAME="loggedinusername" -->
+	    <a href="/cgi-bin/koha/userpage.pl"
+	    onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-mysettings.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'">
+	    <img src="<!-- TMPL_VAR name="themelang" -->/images/menu-mysettings.gif"
+	    width=90 height=30 alt="My Settings" hspace=0 vspace=0 border=0 name="menu-mysettings"></a>
+	<!-- TMPL_ELSE -->
+	    <a href="/join.html"
+	    onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'">
+	    <img src="<!-- TMPL_VAR name="themelang" -->/images/menu-join.gif"
+	    width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"></a>
+	<!-- /TMPL_IF -->
+	<a href="/cgi-bin/koha/mainpage.pl"
+	onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'"><img src="<!-- TMPL_VAR name="themelang" -->/images/menu-home.gif"
+	width=60 height=30 alt="Home" hspace=0 vspace=0 border=0 name="menu-home"></a></td>
+
+        </TR>
+
+
+<tr valign=top>
+
+        <td><img src="<!-- TMPL_VAR name="themelang" -->/images/inside-koha-bottom.gif"
+	width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 ></td>
+
+        <td align=right><img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif"
+	width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" ></a></td>
+
+        </TR>
+
+
+
+</TABLE>
+
+
+
+<!--------------------------MAIN BODY OF PAGE-------------------------->
+<BLOCKQUOTE>
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:1.31.2.2 koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:1.31.2.3
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:1.31.2.2	Fri Aug 26 12:25:06 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc	Wed Apr 19 18:20:19 2006
@@ -7,7 +7,7 @@
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions -->
 
-<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 -->
 <!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/popup-top.inc
diff -u /dev/null koha/koha-tmpl/intranet-tmpl/default/en/includes/popup-top.inc:1.3.2.1
--- /dev/null	Wed Apr 19 18:20:20 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/popup-top.inc	Wed Apr 19 18:20:19 2006
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+<title>popup</title>
+<!-- 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="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+
+</head>
+
+<body>
+<!-- NO MENUS for popup-top -->
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:1.1.2.1 koha/koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:1.1.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:1.1.2.1	Tue Jan 18 22:07:44 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc	Wed Apr 19 18:20:19 2006
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>popup</title>
-<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="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 <script language="javascript" type="text/javascript">
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:1.25.2.1 koha/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:1.25.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:1.25.2.1	Thu Jul 28 15:28:56 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc	Wed Apr 19 18:20:19 2006
@@ -4,7 +4,7 @@
 <head>
 <title>KOHA: INTRANET: Reports</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<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 -->
 <script language="JavaScript" type="text/javascript">
 function Help() {
 	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/reportswcal-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/reportswcal-top.inc:1.1.2.2 koha/koha-tmpl/intranet-tmpl/default/en/includes/reportswcal-top.inc:1.1.2.3
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/reportswcal-top.inc:1.1.2.2	Tue Sep 27 16:19:37 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/reportswcal-top.inc	Wed Apr 19 18:20:19 2006
@@ -8,7 +8,7 @@
 <!-- End of additions -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 
-<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 -->
 <!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>





More information about the Koha-cvs mailing list