From 0bc6382e5e35bc3b1a7fcce2f57de76f8f58c3d1 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 22 Dec 2003 09:14:21 +0000
Subject: [PATCH] fix for #675

---
 koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc   | 5 +++++
 koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl        | 6 ------
 koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl    | 6 ------
 koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl       | 6 ------
 koha-tmpl/opac-tmpl/default/en/opac-search.tmpl        | 7 -------
 koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl | 2 +-
 koha-tmpl/opac-tmpl/default/en/opac-user.tmpl          | 6 ------
 koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl    | 6 ------
 koha-tmpl/opac-tmpl/default/en/subject.tmpl            | 7 -------
 9 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc b/koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc
index bb7326b37b..ad72233c7a 100644
--- a/koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc
+++ b/koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc
@@ -58,3 +58,8 @@ a.white {
 
 <!-------------------------MAIN BODY OF PAGE-------------------------->
 <BLOCKQUOTE>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.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 -->
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
index 04358e45ff..28f69c7771 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
@@ -1,11 +1,5 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 
-<!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href="/cgi-bin/koha/opac-user.pl">Members Home</a>][<a href="/cgi-bin/koha/opac-main.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 -->
-
 <!-- TMPL_UNLESS NAME="norequests" -->
 <p align="right"><a href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Request</a></p>
 <!-- /TMPL_UNLESS -->
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl
index be1c3598cd..dbd299ee8a 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl
@@ -1,11 +1,5 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <center>
-<!-- TMPL_IF NAME="loggedinuser" -->
-    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.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 -->
-
 
 <br>
 <!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
index 813c3e840f..11cf7dbcd0 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
@@ -2,12 +2,6 @@
 
 <center>
 
-<!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.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 -->
-
 <!-- TMPL_IF NAME="message" -->
 	<table  cellpadding=5 cellspacing=0 border=1 >
 	<tr bgcolor="#fecc99" >
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
index a6a6f4d769..7268ddc9ab 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
@@ -1,12 +1,5 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 
-<!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.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 -->
-
-
 <CENTER>
 <FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" method=get>
 <TABLE >
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
index be184411aa..eb7814e958 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
@@ -3,7 +3,7 @@
 <center>
 
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
+    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.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 -->
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
index 34484638ae..5eccb58af6 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
@@ -19,12 +19,6 @@
 	</tr>
 </table>
 
-
-
-<font size=6><em>Hi <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></em></font>
-[<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Logout</a>]<p>
-
-
 <!-- TMPL_IF NAME="amountoverfive" -->
 	<table cellpadding=5 cellspacing=0 border=1>
 		<tr bgcolor="#fecc99">
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl
index bd73b5479e..757225091c 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl
@@ -1,11 +1,5 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 
-<!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/opac-main.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 -->
-
 <i>Please, change what's needed. An email will be sent to the library.<br/>
 Your changes won't appear until the library has validated them.</i><br/><br/>
 
diff --git a/koha-tmpl/opac-tmpl/default/en/subject.tmpl b/koha-tmpl/opac-tmpl/default/en/subject.tmpl
index 2a6b109a31..5f69922036 100644
--- a/koha-tmpl/opac-tmpl/default/en/subject.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/subject.tmpl
@@ -1,12 +1,5 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 
-
-<!-- TMPL_IF NAME="loggedinuser" -->
-    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=./logout.pl>Log Out</a>]</p>
-<!-- TMPL_ELSE -->
-    <p align=left><a href=./userpage.pl>Log In</a> to Koha</p>
-<!-- /TMPL_IF -->
-
 <center>
 
 <table border=0 cellspacing=0 cellpadding=2>
-- 
2.39.5