From 368d9107a25f06d06c200730c9114fde27fc5df3 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 5 May 2003 15:00:53 +0000
Subject: [PATCH] moving loggedinuser => loggedinusername in includes and
 Auth.pm :

The $loggedinuser in Koha is the CODE of the logged user (result of get_user_and_template subroutine).
BTW, in get_user_and_template subroutine, the TMPL_VAR loggedinuser is replaced by the NAME of the user.
This is troubleshooting.
so, I replace the name by the "loggedinusername" template variable.
If you want to add the username somewhere, just add <TMPL_VAR name="loggedinusername"> in the template.

Fixes bug #401
---
 C4/Auth.pm                                    |   2 +-
 acqui/basket.pl                               |   2 +-
 .../default/en/acqui/acqui-home.tmpl          |  10 +-
 .../default/en/acqui/basket.tmpl              |   2 +-
 .../default/en/includes/acquisitions-top.inc  |   4 +-
 .../default/en/includes/cat-top.inc           |   4 +-
 .../default/en/includes/circulation-top.inc   |   4 +-
 .../default/en/includes/issues-top.inc        |   4 +-
 .../default/en/includes/marc-top.inc          |   4 +-
 .../default/en/includes/members-top.inc       |   4 +-
 .../default/en/includes/opac-top.inc          |   2 +-
 .../default/en/includes/parameters-top.inc    |   4 +-
 .../default/en/includes/reports-top.inc       |   4 +-
 .../intranet-tmpl/default/fr/boraccount.tmpl  | 118 +++++++++---------
 .../fr/includes/acquisitions-bottom.inc       |   4 -
 .../default/fr/includes/acquisitions-top.inc  |   5 +
 .../default/fr/includes/cat-bottom.inc        |   4 -
 .../default/fr/includes/cat-top.inc           |   4 +-
 .../fr/includes/circulation-bottom.inc        |   3 -
 .../default/fr/includes/circulation-top.inc   |   4 +-
 .../default/fr/includes/issues-bottom.inc     |   4 -
 .../default/fr/includes/issues-top.inc        |   4 +-
 .../default/fr/includes/members-bottom.inc    |   4 -
 .../default/fr/includes/members-top.inc       |   4 +-
 .../default/fr/includes/opac-top.inc          |   2 +-
 .../default/fr/includes/parameters-bottom.inc |   4 -
 .../default/fr/includes/parameters-top.inc    |   4 +-
 .../default/fr/includes/reports-bottom.inc    |   4 -
 .../default/fr/includes/reports-top.inc       |   4 +-
 29 files changed, 102 insertions(+), 124 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 8d1de76250..18fd91372d 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -115,7 +115,7 @@ sub get_template_and_user {
 
 	my $borrowernumber;
 	if ($user) {
-		$template->param(loggedinuser => $user);
+		$template->param(loggedinusername => $user);
 		$template->param(sessionID => $sessionID);
 
 		$borrowernumber = getborrowernumber($user);
diff --git a/acqui/basket.pl b/acqui/basket.pl
index 30218a6d29..59c7a356c3 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -44,7 +44,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {acquisition => 1},
 			     debug => 1,
 			     });
-
+warn "LOGGED : $loggedinuser";
 my ($count,@results);
 if ($basket eq ''){
 	$basket=newbasket();
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
index 700fcd210e..d9bf29663c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
@@ -102,11 +102,11 @@
 <TABLE cellspacing=0 cellpadding=5 border=1 >
 <TR VALIGN=TOP>
 	<TD  bgcolor="ffdf61" colspan=2>
-		<b>HELP</b><br>
-		<b>Ordering:</b> <p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which  will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).</p>
-		<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.  </p>
-		<p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>
-		<p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".</p>
+		<p><b>HELP Ordering:</b></p>
+		<ul>To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.</ul>
+		<ul>Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to </ul>
+		<ul>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.  </ul>
+		<p>To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".</p>
 	</td>
 </TR>
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index d72782e6ba..c3d2d0c7f6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -1,7 +1,7 @@
 <TMPL_INCLUDE name="acquisitions-top.inc">
 
 <h1>Shopping Basket <TMPL_VAR name="basket"> for <a href=supplier.pl?id=<TMPL_VAR name="booksellerid">></a> <TMPL_VAR name="name"></h1><br />
-(Our Reference: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, authorised by: <TMPL_VAR name="authorisedby">)<br />
+(Our Reference: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, authorised by: <TMPL_VAR name="loggedinusername">)<br />
 <CENTER>
 <!--<FORM ACTION="/cgi-bin/koha/search.pl" method=post>
 <b>Search ISBN, Title or Author:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc
index ed094e0373..d1af97ba78 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc
@@ -189,8 +189,8 @@ a.about:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<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>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
index dfdd5b88bf..6925c467cf 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
@@ -189,8 +189,8 @@ a.about:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<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>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
index ab7536c78e..a3d65544d2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
@@ -190,8 +190,8 @@ a.about:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<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>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc
index 8ff0dcb8c8..edea48549c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc
@@ -324,8 +324,8 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 	</TR>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<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>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc
index 562dcbf598..4d1a578bab 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc
@@ -211,8 +211,8 @@ a.about:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<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>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
index 385699b7e9..e3bec8a360 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
@@ -189,8 +189,8 @@ a.about:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<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>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc
index 13d7dd6445..db6152645d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc
@@ -39,7 +39,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 	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=loggedinuser>
+	<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"
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc
index a7efb05426..f71166d6c6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc
@@ -189,8 +189,8 @@ a.about:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<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>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc
index e239dac245..f9ee185ed2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc
@@ -191,8 +191,8 @@ a.about:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<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>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl b/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
index 4fc975455f..bac0bb5cea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
@@ -1,59 +1,59 @@
-<HTML>
-
-<!-- startmenu (member)
-     this  includes the head-container and <body>
-     including this via var contradicts the separation of code and design
-     a solution via tmpl_include would be better -->
-
-<TMPL_VAR NAME=startmenumember>
-
-<!-- The manual invoice and credit buttons --> <FONT SIZE=6><em>Compte de<TMPL_VAR NAME=firstname> 
-<TMPL_VAR NAME=surname></em></FONT> 
-<P>
-<a href="/cgi-bin/koha/maninvoice.pl?bornum=<TMPL_VAR NAME=bornum>"><image src=/images/create-man-invoice.gif border=0></a>
-&nbsp;
-<a href="/cgi-bin/koha/mancredit.pl?bornum=<TMPL_VAR NAME=bornum>"><image src=/images/create-man-credit.gif border=0></a>
-<center>
-<p>
-
-<!-- The table with the account items -->
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-
-  <TR VALIGN=TOP>
-      <td  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2><B>AMENDES 
-		&amp; FRAIS</b></TD>
-      <td  bgcolor="99cc33" background="/images/background-mem.gif" colspan=1><B>MONTANT</b></TD>
-      <td  bgcolor="99cc33" background="/images/background-mem.gif" colspan=1><B>SOLDE 
-		</b></TD>
-  </TR>
-
-  <TMPL_LOOP NAME=accounts>
-
-    <tr VALIGN=TOP>
-      <td><TMPL_VAR NAME=date></td>
-      <td><TMPL_VAR NAME=description><TMPL_IF NAME=printtitle> <TMPL_VAR NAME=title></TMPL_IF></td>
-      <td><TMPL_VAR NAME=amount></td>
-      <td><TMPL_VAR NAME=amountoutstanding></td>
-    </tr>
-
-  </TMPL_LOOP>
-
-  <tr VALIGN=TOP  >
-      <td></td>
-    <td colspan=2><b>Total d&ucirc;</b></td>
-    <td><b><TMPL_VAR NAME=total></b></td>
-  </tr>
-
-</table>
-
-<br clear=all>
-<p>&nbsp;  </p>
-
-<!-- endmenu (member) -->
-
-<TMPL_VAR NAME=member>
-
-
-</center></body></HTML>
-
+<HTML>
+
+<!-- startmenu (member)
+     this  includes the head-container and <body>
+     including this via var contradicts the separation of code and design
+     a solution via tmpl_include would be better -->
+
+<TMPL_VAR NAME=startmenumember>
+
+<!-- The manual invoice and credit buttons --> <FONT SIZE=6><em>Compte de<TMPL_VAR NAME=firstname> 
+<TMPL_VAR NAME=surname></em></FONT> 
+<P>
+<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=bornum>"><image src=<TMPL_VAR name="themelang">/images/create-man-invoice.gif border=0></a>
+&nbsp;
+<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=bornum>"><image src=<TMPL_VAR name="themelang">/images/create-man-credit.gif border=0></a>
+<center>
+<p>
+
+<!-- The table with the account items -->
+
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
+
+  <TR VALIGN=TOP>
+      <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>AMENDES
+		&amp; FRAIS</b></TD>
+      <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=1><B>MONTANT</b></TD>
+      <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=1><B>SOLDE
+		</b></TD>
+  </TR>
+
+  <TMPL_LOOP NAME=accounts>
+
+    <tr VALIGN=TOP>
+      <td><TMPL_VAR NAME=date></td>
+      <td><TMPL_VAR NAME=description><TMPL_IF NAME=printtitle> <TMPL_VAR NAME=title></TMPL_IF></td>
+      <td><TMPL_VAR NAME=amount></td>
+      <td><TMPL_VAR NAME=amountoutstanding></td>
+    </tr>
+
+  </TMPL_LOOP>
+
+  <tr VALIGN=TOP  >
+      <td></td>
+    <td colspan=2><b>Total d&ucirc;</b></td>
+    <td><b><TMPL_VAR NAME=total></b></td>
+  </tr>
+
+</table>
+
+<br clear=all>
+<p>&nbsp;  </p>
+
+<!-- endmenu (member) -->
+
+<TMPL_VAR NAME=member>
+
+
+</center></body></HTML>
+
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc
index 8010ccd91e..efe6198b02 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc
@@ -4,10 +4,6 @@
 <p> &nbsp; </p>
 
 </BLOCKQUOTE>
-
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc
index 5f7f2a39d3..fac3706ee4 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc
@@ -174,3 +174,8 @@ a.parameters:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
+<TMPL_IF NAME="loggedinusername">
+	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<TMPL_ELSE>
+    <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
+</TMPL_IF>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc
index 712e5b0b46..e02daddb4b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc
@@ -4,10 +4,6 @@
 
 </BLOCKQUOTE>
 
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc
index 685537361d..0d91d3cbf7 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc
@@ -174,8 +174,8 @@ a.parameters:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<TMPL_IF NAME="loggedinusername">
+	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
 </TMPL_IF>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc
index bb7b3055dc..eb82104565 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc
@@ -3,9 +3,6 @@
 
 </BLOCKQUOTE>
 
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc
index 986ee2d98d..363fd9c6de 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc
@@ -174,8 +174,8 @@ a.parameters:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<TMPL_IF NAME="loggedinusername">
+	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
 </TMPL_IF>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc
index 0dd3f41614..3888552b1d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc
@@ -4,10 +4,6 @@
 
 </BLOCKQUOTE>
 
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc
index ddd1f7acc4..f2243afca7 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc
@@ -325,8 +325,8 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<TMPL_IF NAME="loggedinusername">
+	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
 </TMPL_IF>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc
index 35e8a4b096..5e4f53c4bf 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc
@@ -4,10 +4,6 @@
 
 </BLOCKQUOTE>
 
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc
index cc0d243856..4740381c8d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc
@@ -174,8 +174,8 @@ a.parameters:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<TMPL_IF NAME="loggedinusername">
+	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
 </TMPL_IF>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc
index 645abdcb25..65e1cd828a 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc
@@ -39,7 +39,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 	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=loggedinuser>
+	<TMPL_IF NAME=loggedinusername>
 	    <a href="/cgi-bin/koha/userpage.pl"
 	    onMouseOver="document.mouseover.src='/images/mouseover-mysettings.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'">
 	    <img src="/images/menu-mysettings.gif"
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc
index 712e5b0b46..e02daddb4b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc
@@ -4,10 +4,6 @@
 
 </BLOCKQUOTE>
 
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc
index 37f96f047f..c42dca36f9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc
@@ -174,8 +174,8 @@ a.parameters:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<TMPL_IF NAME="loggedinusername">
+	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
 </TMPL_IF>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc
index 712e5b0b46..e02daddb4b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc
@@ -4,10 +4,6 @@
 
 </BLOCKQUOTE>
 
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc
index 356a53939a..b0d0053332 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc
@@ -176,8 +176,8 @@ a.parameters:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<TMPL_IF NAME="loggedinusername">
+	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
 </TMPL_IF>
-- 
2.39.5