[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes acquisitions-top.inc,1.12,1.13 cat-top.inc,1.12,1.13 circulation-top.inc,1.14,1.15 issues-top.inc,1.4,1.5 marc-top.inc,1.3,1.4 members-top.inc,1.11,1.12 opac-top.inc,1.5,1.6 parameters-top.inc,1.12,1.13 reports-top.inc,1.11,1.12

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory 
sc8-pr-cvs1:/tmp/cvs-serv25217/koha-tmpl/intranet-tmpl/default/en/includes

Modified Files:
        acquisitions-top.inc cat-top.inc circulation-top.inc 
        issues-top.inc marc-top.inc members-top.inc opac-top.inc 
        parameters-top.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-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** acquisitions-top.inc        30 Apr 2003 00:45:02 -0000      1.12
--- acquisitions-top.inc        5 May 2003 15:00:54 -0000       1.13
***************
*** 190,195 ****
  </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_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 190,195 ----
  </table>
  <BLOCKQUOTE>
! <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>

Index: cat-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** cat-top.inc 30 Apr 2003 00:45:02 -0000      1.12
--- cat-top.inc 5 May 2003 15:00:55 -0000       1.13
***************
*** 190,195 ****
  </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_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 190,195 ----
  </table>
  <BLOCKQUOTE>
! <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>

Index: circulation-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** circulation-top.inc 30 Apr 2003 00:45:02 -0000      1.14
--- circulation-top.inc 5 May 2003 15:00:55 -0000       1.15
***************
*** 191,196 ****
  </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_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 191,196 ----
  </table>
  <BLOCKQUOTE>
! <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>

Index: issues-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** issues-top.inc      18 Mar 2003 15:19:36 -0000      1.4
--- issues-top.inc      5 May 2003 15:00:55 -0000       1.5
***************
*** 325,330 ****
  </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_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 325,330 ----
  </table>
  <BLOCKQUOTE>
! <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>

Index: marc-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marc-top.inc        30 Apr 2003 00:45:02 -0000      1.3
--- marc-top.inc        5 May 2003 15:00:55 -0000       1.4
***************
*** 212,217 ****
  </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_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 212,217 ----
  </table>
  <BLOCKQUOTE>
! <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>

Index: members-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** members-top.inc     30 Apr 2003 00:45:02 -0000      1.11
--- members-top.inc     5 May 2003 15:00:55 -0000       1.12
***************
*** 190,195 ****
  </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_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 190,195 ----
  </table>
  <BLOCKQUOTE>
! <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>

Index: opac-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-top.inc        10 Mar 2003 15:18:22 -0000      1.5
--- opac-top.inc        5 May 2003 15:00:55 -0000       1.6
***************
*** 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='<TMPL_VAR 
name="themelang">/images/mouseover-mysettings.gif'"          
onMouseOut="document.mouseover.src='<TMPL_VAR 
name="themelang">/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='<TMPL_VAR 
name="themelang">/images/mouseover-mysettings.gif'"          
onMouseOut="document.mouseover.src='<TMPL_VAR 
name="themelang">/images/holder.gif'">

Index: parameters-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** parameters-top.inc  30 Apr 2003 00:45:02 -0000      1.12
--- parameters-top.inc  5 May 2003 15:00:56 -0000       1.13
***************
*** 190,195 ****
  </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_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 190,195 ----
  </table>
  <BLOCKQUOTE>
! <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>

Index: reports-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** reports-top.inc     30 Apr 2003 00:45:02 -0000      1.11
--- reports-top.inc     5 May 2003 15:00:56 -0000       1.12
***************
*** 192,197 ****
  </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_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 192,197 ----
  </table>
  <BLOCKQUOTE>
! <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>