more little changes from hlt

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-account.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-account.tmpl
index ad1c037..9341bb4 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-account.tmpl
@@ -1,7 +1,8 @@
 <TMPL_INCLUDE NAME="members-top.inc">
 
 <TMPL_LOOP NAME="BORROWER_INFO">
-<FONT SIZE=6><em>Account for <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></em></FONT><P>
+<FONT SIZE=6><em>Account for <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></em></FONT>
+[<a href=/cgi-bin/koha/opac-user.pl>Home</a>][<a href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]<p>
 </TMPL_LOOP>
 <center>
 <p>

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
index 81a1a23..753c65d 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
@@ -75,7 +75,7 @@ cellspacing=0 cellpadding=0 border=0 >
        alt=" " hspace=0 vspace=0>\r
        <p>\r
        <TMPL_IF NAME="loggedinuser">\r
-           <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Home</a>][<a href="/cgi-bin/koha/logout.pl">Log Out</a>]</p>\r
+           <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href="/cgi-bin/koha/logout.pl">Log Out</a>]</p>\r
        <TMPL_ELSE>\r
            <p align=left><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>\r
        </TMPL_IF>\r

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
index fd2bb45..39c4e10 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl
@@ -3,7 +3,7 @@
 <center>
 
 <TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Home</a>][<a href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
+    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-logout.pl>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>
@@ -12,8 +12,8 @@
 <table  cellpadding=5 cellspacing=0 border=1 >
 <tr bgcolor="#fecc99" >
 <td><font face="arial,helvetica" color="red" size=+1><B>
-<TMPL_IF NAME="too_much_oweing">Sorry, you cannot make reseves because you owe <TMPL_VAR NAME="too_much_oweing">, which is too much.  </TMPL_IF>
-<TMPL_IF NAME="too_many_reserves">Sorry, you cannot make reseves because you already have <TMPL_VAR NAME="too_many_reserves">, more than enough.  </TMPL_IF>
+<TMPL_IF NAME="too_much_oweing">Sorry, you cannot make reserves because you owe <TMPL_VAR NAME="too_much_oweing">.  </TMPL_IF>
+<TMPL_IF NAME="too_many_reserves">Sorry, you cannot make more than <TMPL_VAR NAME="too_many_reserves"> reserves. </TMPL_IF>
 <TMPL_IF NAME="already_reserved">You already have a reserve placed on this item.</TMPL_IF>
 <TMPL_IF NAME="no_items_selected">You must select at least on item type!</TMPL_IF>
 </B></font><P></td></tr></table>
@@ -28,7 +28,7 @@ Reserve page for item: <b><TMPL_VAR NAME="title"> ( <TMPL_VAR NAME="author"> )</
 </p>
 <p> There are <b><TMPL_VAR NAME="rank"></b> reserves already on this item. </p>
 <p>
-Please select the item type you want to reserve:
+Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you.
 <p>
 
 <FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
@@ -67,7 +67,7 @@ Please select the branch from which you want to collect the item:
 <TMPL_IF NAME="item_types_selected">
 
 <p>
-Please confirm:
+Please confirm that you wish to request an item of these types:
 <p>
 
 <FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
@@ -90,6 +90,10 @@ Please confirm:
 Which is to be picked up from <b><TMPL_VAR NAME="branchname"></b>.<br>
 <input type="hidden" name="bib" value="<TMPL_VAR NAME='branch'>">
 
+<TMPL_IF NAME="fee">
+<br>Note there will be a reserve charge of <b>$<TMPL_VAR NAME="fee"></b><br>
+</TMPL_IF>
+
 <font size=4 face="arial,helvetica"><INPUT type="submit" value="Place Reserve"></font>
 
 </FORM>

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
index 051c9ee..68cf782 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
@@ -1,7 +1,7 @@
 <TMPL_INCLUDE NAME="opac-top.inc">\r
 \r
 <TMPL_IF NAME="loggedinuser">\r
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Home</a>][<a href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>\r
+    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>\r
 <TMPL_ELSE>\r
     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>\r
 </TMPL_IF>\r

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
index 28a08eb..d6deafa 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
@@ -3,7 +3,7 @@
 <center>
 
 <TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Home</a>][<a href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
+    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-logout.pl>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/opac-tmpl/default/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
index da76874..5a7b0b6 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
@@ -27,21 +27,31 @@ Are any of our records incorrect? Have you moved recently, got a new phone numbe
 [<a href="/cgi-bin/koha/opac-logout.pl">Logout</a>]<p>
 
 
-
+<TMPL_IF NAME="amountoverfive">
 <table cellpadding=5 cellspacing=0 border=1>
 <tr bgcolor="#fecc99">
 <td>
-<TMPL_IF NAME="amountoverfive">
 <font face="arial,helvetica" color="red" size=+2><B>You have Outstanding charges and fines of <TMPL_VAR NAME="amountoutstanding"></B></font>
-<TMPL_ELSE>
-  <TMPL_IF NAME="amountoverzero">
-  <td><font face="arial,helvetica" size=+2><B>You have Outstanding charges and fines of <TMPL_VAR NAME="amountoutstanding"></B></font>
-  <TMPL_ELSE>
-  <td><font face="arial,helvetica" size=+2><B>You have a credit of <TMPL_VAR NAME="amountoutstanding"></B></font>
-  </TMPL_IF>
+</td></tr></table>
+
 </TMPL_IF>
-<a href='/cgi-bin/koha/opac-account.pl'>View Accounts</a>
+
+<TMPL_IF NAME="amountoverzero">
+<table cellpadding=5 cellspacing=0 border=1>
+<tr bgcolor="#fecc99">
+<td>
+<td><font face="arial,helvetica" size=+2><B>You have Outstanding charges and fines of <TMPL_VAR NAME="amountoutstanding"></B></font>
 </td></tr></table>
+</TMPL_IF>
+
+<TMPL_IF NAME"amountlessthanzero">
+<table cellpadding=5 cellspacing=0 border=1>
+<tr bgcolor="#fecc99">
+<td>
+<td><font face="arial,helvetica" size=+2><B>You have a credit of <TMPL_VAR NAME="amountoutstanding"></B></font>
+</td></tr></table>
+</TMPL_IF>
+<a href='/cgi-bin/koha/opac-account.pl'>View Accounts</a>
 
 </TMPL_LOOP>