fix for #675

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 bb7326b..ad72233 100644 (file)
--- 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 04358e4..28f69c7 100644 (file)
--- 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 be1c359..dbd299e 100644 (file)
--- 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 813c3e8..11cf7db 100644 (file)
--- 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 a6a6f4d..7268ddc 100644 (file)
--- 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 be18441..eb7814e 100644 (file)
--- 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 3448463..5eccb58 100644 (file)
--- 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 bd73b54..7572250 100644 (file)
--- 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 2a6b109..5f69922 100644 (file)
--- 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>