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

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <address@hidden>   06/04/19 18:22:04

Modified files:
        koha-tmpl/intranet-tmpl/default/en: auth.tmpl intranet-main.tmpl 
        koha-tmpl/intranet-tmpl/default/en/search.marc: dictionary.tmpl 
        koha-tmpl/intranet-tmpl/default/en/value_builder: 
                                                          labs_theses.tmpl 
                                                          
unimarc_field_4XX.tmpl 
        koha-tmpl/intranet-tmpl/default/en/z3950: searchresult.tmpl 

Log message:
        Enabling TemplateEncoding system preference

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/auth.tmpl.diff?only_with_tag=rel_2_2&tr1=1.8&tr2=1.8.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl.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/search.marc/dictionary.tmpl.diff?only_with_tag=rel_2_2&tr1=1.5.2.3&tr2=1.5.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/labs_theses.tmpl.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/intranet-tmpl/default/en/value_builder/unimarc_field_4XX.tmpl.diff?only_with_tag=rel_2_2&tr1=1.3.2.2&tr2=1.3.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl.diff?only_with_tag=rel_2_2&tr1=1.4.2.1&tr2=1.4.2.2&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
diff -u /dev/null koha/koha-tmpl/intranet-tmpl/default/en/auth.tmpl:1.8.2.1
--- /dev/null   Wed Apr 19 18:22:04 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/auth.tmpl   Wed Apr 19 18:22:04 2006
@@ -0,0 +1,49 @@
+<!-- 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 -->
+
+<!-- TMPL_IF NAME="nopermission" -->
+<!-- This is what is displayed if user doesn't have permission -->
+<h2>Sorry, Koha doesn't think you have permission for this page.</h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="timed_out" -->
+<!-- This is what is displayed if login has timed out -->
+<h2>Sorry, your session has timed out.  Please login again.</h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="different_ip" -->
+<!-- This is what is displayed if user's IP has changed -->
+<h2>You are accessing Koha from a different ip address! Please login 
again.</h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="invalid_username_or_password" -->
+<!-- This is what is displayed if the username or password doesn't work -->
+<h2>You entered an incorrect username or password.  Please try again.</h2>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="loginprompt" -->
+<!-- login prompt time-->
+
+
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
+<!-- TMPL_LOOP NAME="INPUTS" -->
+  <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- 
TMPL_VAR NAME="value" -->">
+<!-- /TMPL_LOOP -->
+<table border="0" cellpadding="10" cellspacing="0" width="60%" align="center">
+    <tr><td align="center" valign="top">
+
+    <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
+    <tr><th colspan="2"><font size="+2">Koha Login</font></th></tr>
+    <tr><td>Card number:</td><td><input name="userid"></td></tr>
+    <tr><td>Password:</td><td><input type="password" name="password"></td></tr>
+    <tr><td colspan="2" align="center"><input type="submit" 
value="login"></td></tr>
+    </table>
+    </td><td align="center" valign="top">
+
+
+    </td></tr>
+</table>
+</form>
+
+
+<!-- /TMPL_IF -->
Index: koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:1.25.2.1 
koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:1.25.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:1.25.2.1 Thu Jun 
16 15:06:23 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl  Wed Apr 19 
18:22:04 2006
@@ -3,7 +3,7 @@
 <head>
        <title>WELCOME TO THE KOHA INTRANET </title>
        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR 
NAME="themelang" -->/includes/intranet-main.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 -->
 <!-- JAVASCRIPT SCRIPTS -->
        <script language="JavaScript" type="text/javascript">
                var IE = document.all?true:false;
Index: koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl:1.5.2.3 
koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl:1.5.2.4
--- koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl:1.5.2.3 
Fri Dec 30 11:11:42 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl Wed Apr 
19 18:22:04 2006
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>KOHA: Dictionary</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/value_builder/labs_theses.tmpl
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/value_builder/labs_theses.tmpl:1.1.2.2 
koha/koha-tmpl/intranet-tmpl/default/en/value_builder/labs_theses.tmpl:1.1.2.3
--- 
koha/koha-tmpl/intranet-tmpl/default/en/value_builder/labs_theses.tmpl:1.1.2.2  
    Sat Oct 15 16:45:42 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/value_builder/labs_theses.tmpl      
Wed Apr 19 18:22:04 2006
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>KOHA: Labs Thesis Selection plugin</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/value_builder/unimarc_field_4XX.tmpl
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_4XX.tmpl:1.3.2.2
 
koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_4XX.tmpl:1.3.2.3
--- 
koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_4XX.tmpl:1.3.2.2
        Thu Apr  7 10:18:09 2005
+++ 
koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_4XX.tmpl    
    Wed Apr 19 18:22:04 2006
@@ -143,7 +143,7 @@
 <!-- TMPL_ELSE -->
        <head>
                <title>KOHA:INTRANET : Biblio Search</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">
        function Help() {
Index: koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:1.4.2.1 
koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:1.4.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:1.4.2.1     
Wed Mar 30 09:54:20 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl     Wed Apr 
19 18:22:04 2006
@@ -1,6 +1,6 @@
 <HTML>
 <head>
-       <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 -->
        <!-- TMPL_IF NAME="refresh" -->
                <meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR 
NAME="refresh" -->">
        <!-- /TMPL_IF -->