[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes masthead-user.inc,1.1,1.1.2.1 masthead.inc,1.1,1.1.2.1 masthead_adv.inc,1.1,1.1.2.1

Owen Leonard oleonard at users.sourceforge.net
Thu Mar 17 22:47:54 CET 2005


Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12140/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	masthead-user.inc masthead.inc masthead_adv.inc 
Log Message:
Several formatting changes.  Adding block of member's information, including link to 'my book lists' (virtual shelves) when user is logged in

Index: masthead-user.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** masthead-user.inc	20 Oct 2004 19:15:06 -0000	1.1
--- masthead-user.inc	17 Mar 2005 21:47:51 -0000	1.1.2.1
***************
*** 2,6 ****
  <h1>Library Catalog Search</h1>
  <div class="menu"><form action="/cgi-bin/koha/opac-search.pl" method="post">
! <a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag</a> | <label for="value">Search the Catalog</label>
    <input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="type" value="opac" />
--- 2,6 ----
  <h1>Library Catalog Search</h1>
  <div class="menu"><form action="/cgi-bin/koha/opac-search.pl" method="post">
! <p><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag</a></p> <p><label for="value">Search the Catalog</label>
    <input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="type" value="opac" />
***************
*** 9,17 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></div>
! <div class="menu"><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
! 	<a href="/cgi-bin/koha/opac-account.pl">your account</a>  | 
! 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">log out</a>
    </ul>
  </div>
  </div>
\ No newline at end of file
--- 9,29 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></p></div>
! <!-- <div class="menu"><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
! 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a> | <a href="/cgi-bin/koha/opac-shelves.pl">My Book Lists</a> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">log out</a>
    </ul>
+ </div> -->
+ <!-- TMPL_IF NAME="loggedinusername" --><div id="members">
+ 	<ul>
+ 		<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
+ 		<li><a href="/cgi-bin/koha/opac-shelves.pl">My Book Lists</a></li>
+ 		<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
+ 		<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
+ 	</ul>	
  </div>
+ <!-- TMPL_ELSE -->
+ 	<div id="members">
+ 		<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
+ 	</div>
+ <!-- /TMPL_IF -->
  </div>
\ No newline at end of file

Index: masthead.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** masthead.inc	20 Oct 2004 19:15:06 -0000	1.1
--- masthead.inc	17 Mar 2005 21:47:51 -0000	1.1.2.1
***************
*** 2,6 ****
  <h1>Library Catalog Search</h1>
  <div class="menu"><form action="/cgi-bin/koha/opac-search.pl" method="post">
! <a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a> | <label for="value">Search the Catalog</label>
    <input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="type" value="opac" />
--- 2,6 ----
  <h1>Library Catalog Search</h1>
  <div class="menu"><form action="/cgi-bin/koha/opac-search.pl" method="post">
! <p><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a></p> <p><label for="value">Search the Catalog</label>
    <input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="type" value="opac" />
***************
*** 9,15 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></div>
! <TMPL_IF NAME="loggedinusername">
! <div class="menu"><span class="loggedin">You are logged in as <TMPL_LOOP NAME="USER_INFO"><a href="/cgi-bin/koha/opac-user.pl"><TMPL_VAR NAME="title"> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></a></TMPL_LOOP></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div>
! </TMPL_IF>
  </div>
\ No newline at end of file
--- 9,27 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></p></div>
! <!-- <!-- TMPL_IF NAME="loggedinusername" -->
! <div class="menu"><span class="loggedin">You are logged in as <!-- TMPL_LOOP NAME="USER_INFO" --><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a><!-- /TMPL_LOOP --></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div><!-- /TMPL_IF --> -->
! <!-- TMPL_IF NAME="loggedinusername" --><div id="members">
! 	<ul>
! 		<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
! 		<li><a href="/cgi-bin/koha/opac-shelves.pl">My Book Lists</a></li>
! 		<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
! 		<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
! 	</ul>	
! </div>
! <!-- TMPL_ELSE -->
! 	<div id="members">
! 		<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
! 	</div>
! <!-- /TMPL_IF -->
  </div>
\ No newline at end of file

Index: masthead_adv.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** masthead_adv.inc	20 Oct 2004 19:15:06 -0000	1.1
--- masthead_adv.inc	17 Mar 2005 21:47:51 -0000	1.1.2.1
***************
*** 2,7 ****
  <h1>Library Catalog Search</h1>
  <div class="menu"><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a></div>
! <TMPL_IF NAME="loggedinusername">
! <div class="menu"><span class="loggedin">You are logged in as <TMPL_LOOP NAME="USER_INFO"><a href="/cgi-bin/koha/opac-user.pl"><TMPL_VAR NAME="title"> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></a></TMPL_LOOP></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div>
! </TMPL_IF>
  </div>
\ No newline at end of file
--- 2,21 ----
  <h1>Library Catalog Search</h1>
  <div class="menu"><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a></div>
! <!-- <!-- TMPL_IF NAME="loggedinusername" -->
! <div class="menu"><span class="loggedin">You are logged in as <!-- TMPL_LOOP NAME="USER_INFO" --><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a><!-- /TMPL_LOOP --></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div>
! <!-- /TMPL_IF --> -->
! 
! <!-- TMPL_IF NAME="loggedinusername" --><div id="members">
! 	<ul>
! 		<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
! 		<li><a href="/cgi-bin/koha/opac-shelves.pl">My Book Lists</a></li>
! 		<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
! 		<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
! 	</ul>	
! </div>
! <!-- TMPL_ELSE -->
! 	<div id="members">
! 		<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
! 	</div>
! <!-- /TMPL_IF -->
  </div>
\ No newline at end of file





More information about the Koha-cvs mailing list