[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.3,1.4 basket.tmpl,1.3,1.4

[Paul POULAIN]

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

Modified Files:
	acqui-home.tmpl basket.tmpl 
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: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.tmpl	26 Apr 2003 04:41:15 -0000	1.3
--- acqui-home.tmpl	5 May 2003 15:01:52 -0000	1.4
***************
*** 103,111 ****
  <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>
  	</td>
  </TR>
--- 103,111 ----
  <TR VALIGN=TOP>
  	<TD  bgcolor="ffdf61" colspan=2>
! 		<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>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** basket.tmpl	30 Apr 2003 00:13:12 -0000	1.3
--- basket.tmpl	5 May 2003 15:01:52 -0000	1.4
***************
*** 2,6 ****
  
  <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 />
  <CENTER>
  <!--<FORM ACTION="/cgi-bin/koha/search.pl" method=post>
--- 2,6 ----
  
  <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="loggedinusername">)<br />
  <CENTER>
  <!--<FORM ACTION="/cgi-bin/koha/search.pl" method=post>