[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/includes acquisitions-bottom.inc,1.2,1.3 acquisitions-top.inc,1.5,1.6 cat-bottom.inc,1.2,1.3 cat-top.inc,1.6,1.7 circulation-bottom.inc,1.2,1.3 circulation-top.inc,1.6,1.7 issues-bottom.inc,1.2,1.3 issues-top.inc,1.2,1.3 members-bottom.inc,1.2,1.3 members-top.inc,1.6,1.7 opac-top.inc,1.2,1.3 parameters-bottom.inc,1.2,1.3 parameters-top.inc,1.5,1.6 reports-bottom.inc,1.2,1.3 reports-top.inc,1.6,1.7
Paul POULAIN
tipaul at users.sourceforge.net
Mon May 5 17:01:32 CEST 2003
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv25217/koha-tmpl/intranet-tmpl/default/fr/includes
Modified Files:
acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc
cat-top.inc circulation-bottom.inc circulation-top.inc
issues-bottom.inc issues-top.inc members-bottom.inc
members-top.inc opac-top.inc parameters-bottom.inc
parameters-top.inc reports-bottom.inc reports-top.inc
Log Message:
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
Index: acquisitions-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acquisitions-bottom.inc 5 Feb 2003 17:14:22 -0000 1.2
--- acquisitions-bottom.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 5,12 ****
</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">
--- 5,8 ----
Index: acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acquisitions-top.inc 10 Apr 2003 14:05:13 -0000 1.5
--- acquisitions-top.inc 5 May 2003 15:00:54 -0000 1.6
***************
*** 175,176 ****
--- 175,181 ----
</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>
Index: cat-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cat-bottom.inc 5 Feb 2003 17:14:22 -0000 1.2
--- cat-bottom.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 5,12 ****
</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">
--- 5,8 ----
Index: cat-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** cat-top.inc 10 Apr 2003 14:05:13 -0000 1.6
--- cat-top.inc 5 May 2003 15:00:54 -0000 1.7
***************
*** 175,180 ****
</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_ELSE>
<p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
--- 175,180 ----
</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>
Index: circulation-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** circulation-bottom.inc 5 Feb 2003 17:14:23 -0000 1.2
--- circulation-bottom.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 4,10 ****
</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">
--- 4,7 ----
Index: circulation-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** circulation-top.inc 10 Apr 2003 14:05:14 -0000 1.6
--- circulation-top.inc 5 May 2003 15:00:54 -0000 1.7
***************
*** 175,180 ****
</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_ELSE>
<p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
--- 175,180 ----
</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>
Index: issues-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** issues-bottom.inc 5 Feb 2003 17:14:23 -0000 1.2
--- issues-bottom.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 5,12 ****
</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">
--- 5,8 ----
Index: issues-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** issues-top.inc 1 Apr 2003 13:46:59 -0000 1.2
--- issues-top.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 326,331 ****
</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_ELSE>
<p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
--- 326,331 ----
</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>
Index: members-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** members-bottom.inc 5 Feb 2003 17:14:24 -0000 1.2
--- members-bottom.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 5,12 ****
</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> ||
--- 5,8 ----
Index: members-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** members-top.inc 10 Apr 2003 14:05:14 -0000 1.6
--- members-top.inc 5 May 2003 15:00:54 -0000 1.7
***************
*** 175,180 ****
</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_ELSE>
<p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
--- 175,180 ----
</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>
Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-top.inc 5 Feb 2003 17:14:25 -0000 1.2
--- opac-top.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 40,44 ****
width=111 height=30 alt="Member Login" hspace=0 vspace=0 border=0 name="menu-login"></a>
-->
! <TMPL_IF NAME=loggedinuser>
<a href="/cgi-bin/koha/userpage.pl"
onMouseOver="document.mouseover.src='/images/mouseover-mysettings.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">
--- 40,44 ----
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='/images/mouseover-mysettings.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">
Index: parameters-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** parameters-bottom.inc 5 Feb 2003 17:14:25 -0000 1.2
--- parameters-bottom.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 5,12 ****
</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">
--- 5,8 ----
Index: parameters-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** parameters-top.inc 10 Apr 2003 14:05:15 -0000 1.5
--- parameters-top.inc 5 May 2003 15:00:54 -0000 1.6
***************
*** 175,180 ****
</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_ELSE>
<p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
--- 175,180 ----
</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>
Index: reports-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** reports-bottom.inc 5 Feb 2003 17:14:25 -0000 1.2
--- reports-bottom.inc 5 May 2003 15:00:54 -0000 1.3
***************
*** 5,12 ****
</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">
--- 5,8 ----
Index: reports-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** reports-top.inc 10 Apr 2003 14:05:15 -0000 1.6
--- reports-top.inc 5 May 2003 15:00:54 -0000 1.7
***************
*** 177,182 ****
</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_ELSE>
<p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
--- 177,182 ----
</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>
More information about the Koha-cvs
mailing list