From 3ea7d1e1ba1f8dda4e81fb187cb161741554a0a8 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 26 Jan 2004 10:46:35 +0000
Subject: [PATCH] TEMPLATE fixes. Many fixes : * replacing "X  Y" by "X Y" (2
 spaces between 2 words by 1 only) * updating some strings to ease
 translation.

ONLY FOR TRANSLATION PURPOSES.
---
 .../default/en/acqui.simple/addbiblio.tmpl    |  2 +-
 .../default/en/acqui.simple/additem.tmpl      |  2 +-
 .../default/en/acqui/acqui-home.tmpl          | 11 ++--
 .../default/en/acqui/basket.tmpl              | 10 +--
 .../default/en/acqui/newbiblio.tmpl           |  9 +--
 .../default/en/catalogue/catalogue-home.tmpl  |  8 +--
 .../default/en/catalogue/detail.tmpl          | 64 +++++++------------
 .../default/en/catalogue/searchresults.tmpl   |  2 +-
 .../default/en/members/memberentry.tmpl       | 31 ++++-----
 .../default/en/members/members-home.tmpl      | 11 +---
 .../default/en/members/moremember.tmpl        | 36 ++++++-----
 .../intranet-tmpl/default/en/newmember.tmpl   | 12 ++--
 .../default/en/parameters/admin-home.tmpl     |  8 +--
 .../default/en/parameters/thesaurus.tmpl      | 12 ++--
 .../intranet-tmpl/default/en/request.tmpl     |  5 +-
 .../default/en/search.marc/search.tmpl        |  4 +-
 .../default/en/thesaurus_popup.tmpl           |  3 +
 17 files changed, 112 insertions(+), 118 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
index da6212090f..7017654248 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
 <!--STYLE TYPE="text/css" MEDIA=screen>
 	table {	font-family:Arial;
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
index 6d8384fd40..accc4f7bac 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <STYLE TYPE="text/css" MEDIA=screen>
 	table {	font-family:Arial;
 	font-weight:normal;
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
index 8eb4dc35e0..94f395f697 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
@@ -69,7 +69,7 @@
 		<table cellspacing=0 cellpadding=2 border=1>
 			<tr>
 				<td><b>Budgets</B></TD>
-				<TD><b>Total</B></TD>
+				<TD><b> Total</B></TD>
 				<TD><b>Spent</B></TD>
 				<TD><b>Comtd</B></TD>
 				<TD><b>Avail</B></TD>
@@ -84,15 +84,16 @@
 				</TR>
 			<!-- /TMPL_LOOP -->
 			<tr>
-				<td><b>Total</b></TD>
+				<td><b> Total</b></TD>
 				<TD align=right><b><!-- TMPL_VAR name="total" --></b></TD>
 				<TD align=right><b><!-- TMPL_VAR name="totspent" --></b></TD>
 				<TD align=right><b><!-- TMPL_VAR name="totcomtd" --></b></TD>
 				<TD align=right><b><!-- TMPL_VAR name="totavail" --></b></TD>
 			</TR>
-		</table><br>
-		Use your reload button [ctrl + r] to get the most recent figures.
-		Committed figures are approximate only, as exchange rates will affect the amount actually paid.
+		</table>
+		<p>
+		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
+		</p>
 	</TD>
 </TR>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index 8549335131..f6a3ab2d4c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -1,20 +1,20 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<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 />
+<h1>Shopping Basket <b><!-- TMPL_VAR name="basket" --> </b>for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
+(Our Reference: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b>, authorised by: <!-- TMPL_VAR name="loggedinusername" -->)<br />
 <CENTER>
 <p>
 <table border=0 cellspacing=0 cellpadding=5>
 	<tr valign=top bgcolor="#ffdf61">
 		<td width="5%"><b>Order</b></td>
-		<td width="10%"><b>Publisher</b></td>
+		<td width="10%"><b> Publisher</b></td>
 		<td width="10%"><b>Isbn</b></td>
 		<td width="30%"><b>Title</b></td>
 		<td width="20%"><b>Author</b></td>
 		<td width="5%"><b>$ rrp</b></td>
 		<td width="7%"><b>$est</b></td>
 		<td width="7%"><b>Qty</b></td>
-		<td width="7%"><b>Total</b></td>
+		<td width="7%"><b> Total</b></td>
 	</tr>
 	<!-- TMPL_LOOP name="books_loop" -->
 		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
@@ -34,7 +34,7 @@
 	<tr valign=top bgcolor=white>
 		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
   			<b>HELP</b><br>
-			To change any of the catalogue or accounting information attached to an order,  click on the title.<br>
+			To change any of the catalogue or accounting information attached to an order, click on the title.<br>
 		</td>
   		<td><b>SubTotal</b></td>
   		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
index 950c3c7a51..49725ffb49 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
@@ -84,7 +84,7 @@ Shopping Basket For: <!-- TMPL_VAR name="name" -->
 		<td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" ></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Publisher</td>
+		<TD> Publisher</td>
 		<td><input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" ></td>
 	</tr>
 	<TR VALIGN=TOP>
@@ -152,7 +152,8 @@ Shopping Basket For: <!-- TMPL_VAR name="name" -->
 		<td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD colspan=2><input type=image  name=submit src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" border=0 align=right>	</td>
+		<TD colspan=2>
+		<input type="submit" value="OK" class="button">
 	</tr>
 </table>
 </form>
@@ -160,8 +161,8 @@ Shopping Basket For: <!-- TMPL_VAR name="name" -->
 <table>
 <tr><td bgcolor=#cccc99  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>HELP</B><br>
 <UL>
-<LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>
-<LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also  be entered into the database as the quantity received.
+<LI>Bold fields must be filled in to create a new bibilo and item.<p>
+<LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.
 </UL>
 </td></tr></table>
 <p> &nbsp; </p>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
index 126f5fd36f..b58e56f664 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
@@ -26,7 +26,7 @@
 		<TD  bgcolor="#ad11ad" background="/images/background-mem.gif" colspan=2>
 			<span style="color:#FFFFFF;">
 				<b>HELP</b><br>
-				<b>Searching:</b>Using more fields for your search (eg Keyword + author + class) will slow it down.<p>
+				<b>Search :</b>Using more fields for your search will slow it down.<p>
 			</span>
 		</td>
 	</TR>
@@ -63,7 +63,7 @@
 	<TD>Class</TD>
 		<td>
 			<select name="class" size="1">
-			<option value="">Any
+			<option value=""> Any
 			<!-- TMPL_VAR name="classlist" -->
 			</select>
 		</td>
@@ -90,10 +90,10 @@
 				<tr align="center">
 					<td>
 						<input type="hidden" name="type" value="intra">
-						<INPUT TYPE="image"  alt="Start Search" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" BORDER=0 >
+						<input type="submit" class="button" value="Start search">
 					</td>
 					<td>
-						<INPUT TYPE="reset"  VALUE= "Clear">
+						<INPUT TYPE="reset"  VALUE= "Clear" class="button">
 					</td>
 					<td>
 						<a href=/cgi-bin/koha/shelves.pl>Virtual Bookshelves</a>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
index 9fecd5bc3f..735cf4b69b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
@@ -24,23 +24,25 @@
 		<td>
 			<br/><a href="MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">MARC</a><br/><br/>
 			<FONT SIZE=2  face="arial, helvetica">
-			<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
-			<!-- TMPL_IF name="author" --><b>Author:</b> <a href=/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
-			<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+			<!-- TMPL_IF name="isbn" --><b>ISBN:</b><a href="/cgi-bin/koha/opac-searchresults.pl?isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="ISBN" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="author" --><b>Author:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
 			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br/>
-			<!-- TMPL_IF name="collection" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br/>
-			<!-- TMPL_IF name="subject" --><b>Subject:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subject" --><br/>
-			<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br/>
-			<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br/>
-			<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br/>
-			<!-- TMPL_IF name="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br/>
-			<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br/>
-			<!-- TMPL_IF name="url" --><b>URL:</b> <a hre="<!-- TMPL_VAR name="url" --><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
-			<b>total number of Items:</b> <!-- TMPL_VAR NAME="count" -->
-			<p>
+			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
+			<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF name="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
 			</font>
 		</td>
 	</tr>
@@ -57,19 +59,17 @@
 <center>
 <table border=0 cellspacing=0 cellpadding=2>
 	<tr bgcolor="#cccc99" background="/images/background-mem.gif">
-		<td>Item Type</td>
-		<td>Class</td>
-		<td>Location</td>
-		<td>Date Due</td>
-		<td>Last Seen</td>
-		<td>Barcode</td>
+		<th>Item Type</th>
+		<th>Location</th>
+		<th>Date Due</th>
+		<th>Last Seen</th>
+		<th>Barcode</th>
 		<td>Volume</td>
 	</tr>
 	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="description" --></td>
-			<td><a href=/cgi-bin/koha/search.pl?dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE=URL -->><!-- TMPL_VAR NAME="class" --></a></td>
-			<td><!-- TMPL_VAR NAME="branchname" --></td>
+			<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="bulk" --> <!-- TMPL_VAR NAME="bulk" --><!-- /TMPL_IF --></td>
 			<td><!-- TMPL_VAR NAME="datedue" --></td>
 			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 			<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
@@ -95,22 +95,6 @@
 	<!-- /TMPL_LOOP -->
 </table>
 <p>
-<table border="0" cellspacing="0" cellpadding="5" width=70%>
-	<tr valign="top">
-		<td bgcolor="99cc33" background="/images/background-mem.gif" colspan="2">
-			<p><b>HELP</b><br>
-			<b>Update Biblio for all Items:</b> Click on the <b>Modify</b>
-			button [left] to amend the biblio.  Any changes you make will update
-			the record for <b>all</b> the items listed above. <p>
-			<b>Updating the Biblio for only ONE or SOME Items:</b>
-			If some of the items listed above need a different biblio, or are on the
-			wrong biblio, you must use the
-			<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">acquisitions</a>
-			process to fix this. You will need to "re-order" the items, and delete them
-			from this biblio.<p />
-		</td>
-	</tr>
-</table>
 </center>
 <br clear=all>
 <p />
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
index 276a2198b5..061cdf27f8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
@@ -84,7 +84,7 @@
 </table>
 
 <br>
-Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.
+Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.
 <hr>
 
 Try another <a href=/cgi-bin/koha/catalogue-home.pl>search</a>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 5e1fd97e14..3a780af3ad 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -1,6 +1,12 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<h1><!-- TMPL_VAR NAME=header --></h1><br>
+<h1>
+<!-- TMPL_IF NAME=addAction -->
+	Add Member
+<!-- TMPL_ELSE -->
+	Update Member Details
+<!-- /TMPL_IF -->
+</h1><br>
 
 <form action=/cgi-bin/koha/newmember.pl method=post>
 	<input type=hidden name=joining value="<!-- TMPL_VAR NAME=dateenrolled -->">
@@ -29,9 +35,9 @@
 	<tr valign=top bgcolor=white>
 		<td><FONT SIZE=2>Title</FONT></td>
 		<td><FONT SIZE=2>Initials</FONT></td>
-		<td><FONT SIZE=2><b>Given Names*</b></FONT></td>
-		<td><FONT SIZE=2><b>Surname*</b></FONT></td>
-		<td><FONT SIZE=2>Prefered Name</FONT></td>
+		<td><FONT SIZE=2><b> Given Names*</b></FONT></td>
+		<td><FONT SIZE=2><b> Surname*</b></FONT></td>
+		<td><FONT SIZE=2> Prefered Name</FONT></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td><!-- TMPL_VAR name="Mr" -->
@@ -112,13 +118,8 @@
 			<input type=text name=streetcity size=20 value="<!-- TMPL_VAR NAME=streetcity -->"></td>
 	</tr>
 
-
-	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>MEMBER CONTACT DETAILS</b></td>
-	</tr>
-
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=2 ><FONT SIZE=2>Phone (Home)</td>
+		<td COLSPAN=2 ><FONT SIZE=2>Phone home</td>
 		<td><FONT SIZE=2>Fax</td>
 		<td><FONT SIZE=2>Email</td>
 		<td><FONT SIZE=2>Text Messaging</td>
@@ -132,7 +133,7 @@
 
 
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=2 ><FONT SIZE=2>Phone (Daytime)</td>
+		<td COLSPAN=2 ><FONT SIZE=2>Phone daytime</td>
 		<td></td>
 		<td></td>
 		<td></td>
@@ -150,7 +151,7 @@
 	</tr>
 
 	<tr valign=top bgcolor=white>
-		<td   COLSPAN=3 ><FONT SIZE=2><b>Name*</b></td>
+		<td   COLSPAN=3 ><FONT SIZE=2><b> Surname*</b></td>
 		<td><FONT SIZE=2>Phone</td>
 		<td><FONT SIZE=2><b>Relationship*</b></td>
 	</tr>
@@ -167,7 +168,7 @@
 	</tr>
 
 	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Notes</font></td>
+		<td><FONT SIZE=2> Notes</font></td>
 		<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=altnotes --></textarea></td>
 	</tr>
 
@@ -177,7 +178,7 @@
 	</tr>
 
 	<tr valign=top >
-		<td><FONT SIZE=2>Notes</font></td>
+		<td><FONT SIZE=2> Notes</font></td>
 		<td COLSPAN=4><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=borrowernotes --></textarea></td>
 	</tr>
 
@@ -198,7 +199,7 @@
 		<td></td>
 		<td>
 			<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
-			<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" ALT="Add New Member" border=0 >
+			<input type="submit" value="save" class="button">
 		</td>
 	</tr>
 	</table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
index 6731a77563..abf1f55716 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
@@ -3,25 +3,18 @@
 <h1>Members</h1><P>
 
 
-<img src="<!-- TMPL_VAR name="themelang" -->/images/numbers-mem-1.gif"   WIDTH=45  HEIGHT=44   ALT="1"
-hspace=5 align=left BORDER=0>
-
 <table border=1 cellspacing=0 cellpadding=10 height="100" >
 <tr VALIGN=TOP  >
 <td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><FORM ACTION="/cgi-bin/koha/member.pl" method=post><FONT SIZE=4>
-<b>Member Search</B> 
+<b>Member Search</B>
 </FONT>
 <INPUT TYPE="text" size=50 name=member >
-<p>Renew Items, view add, modify and delete records, all by starting with this search. Type a borrower name, part of a name,  or number in the field above and hit the enter key to activate search</p>
+<p>Renew Items, view add, modify and delete records, all by starting with this search. Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
 </td></form><tr>
 </table>
 
 <P>
 
-<img src="<!-- TMPL_VAR name="themelang" -->/images/numbers-mem-2.gif"   WIDTH=45  HEIGHT=44   ALT="2" 
-hspace=5 align=left BORDER=0>
-
-
 <table border=1 cellspacing=0 cellpadding=10 height="100" >
 <tr VALIGN=TOP  >
 <td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><FONT SIZE=4>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index c58329c46c..59e8a842fb 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -13,22 +13,12 @@
 
 	<tr VALIGN=TOP  >
 	<TD>
-		<!-- TMPL_IF name="IS_ADULT" -->
-			<p align=right>
-			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
-				<INPUT TYPE="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
-				<input type=hidden name=type value=Add>
-				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
-			</form>
-			</P>
-		<!-- /TMPL_IF -->
-		<br>
 		<FONT SIZE=2  face="arial, helvetica"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF --><p>
 		Card Number: <!-- TMPL_VAR NAME="cardnumber" --><BR>
 		Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><BR>
 		<!-- TMPL_UNLESS name="I" -->Home Address: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR name="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><BR>
-		Phone (Home): <!-- TMPL_VAR NAME="phone" --><BR><!-- /TMPL_UNLESS -->
-		Phone (Daytime): <!-- TMPL_VAR NAME="phoneday" --><BR>
+		Phone home: <!-- TMPL_VAR NAME="phone" --><BR><!-- /TMPL_UNLESS -->
+		Phone daytime: <!-- TMPL_VAR NAME="phoneday" --><BR>
 		Fax: <!-- TMPL_VAR NAME="faxnumber" --><BR>
 		E-mail: <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
 		Text messaging: <!-- TMPL_VAR NAME="textmessaging" --><p>
@@ -66,6 +56,16 @@
 		<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
 		<p align=right>
 		</font>
+		<!-- TMPL_IF name="IS_ADULT" -->
+			<p align=right>
+			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
+				<INPUT TYPE="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
+				<input type=hidden name=type value=Add>
+				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
+			</form>
+			</P>
+		<!-- /TMPL_IF -->
+		<br>
 		<!-- TMPL_IF name="I" -->
 			<form action=/cgi-bin/koha/imemberentry.pl method=post>
 				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
@@ -114,8 +114,12 @@
 	<TD colspan=2 align=right>
 		<p>
 			<br>
-			<a class="button" href=/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->>View Account</a>
-			<a class="button" href=/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->>Pay Fines</a>
+			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+				View Account
+			</a>
+			<a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+				Pay Fines
+			</a>
 			<br><br>
 		</p>
 	</td>
@@ -219,7 +223,9 @@
 </table>
 <br />
 <br />
-<a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
+<a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+	Reading Record
+</a>
 <script>
 function confirm_deletion() {
 	var is_confirmed = confirm('do you confirm deletetion ?');
diff --git a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
index 3bc3f16c26..479958b156 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
@@ -95,7 +95,11 @@
 				<B>Sex</B>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="sex" -->
+				<!-- TMPL_IF Name="sex" -->
+					Male
+				<!-- TMPL_ELSE -->
+					Female
+				<!-- /TMPL_IF -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
@@ -126,7 +130,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Phone (Home)</B>
+				<B>Phone home</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="phone" -->
@@ -134,7 +138,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Phone (Daytime)</B>
+				<B>Phone daytime</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="phoneday" -->
@@ -223,7 +227,7 @@
 		</form>
 <!-- TMPL_ELSE -->
 	<h1>ERROR</H1>
-	<p>The following  fields have a forbidden value. Please push the back button and try again : </p>
+	<p>The following fields have a forbidden value. Please push the back button and try again : </p>
 	<!-- TMPL_IF name="cardnumber" -->
 		Cardnumber<br/>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
index d9731bc6f1..38ab2ef5fd 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
@@ -37,7 +37,7 @@
 <tr><td>&nbsp;</td></tr>
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/authorised_values.pl>Authorised values</a></td>
-	<td>Define categories and authorised values for them.  Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
+	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
 </tr>
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/thesaurus.pl>Thesaurus</a></td>
@@ -80,14 +80,14 @@
 </tr>
 </table>
 <table cellspacing=5 cellpadding=1 width=80%>
-	<th colspan=2>Export</th>
+	<th colspan=2> Export</th>
 	<tr>
 		<td valign="top" width="25%"><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></td>
-		<td>Exporting in MARC format.</td>
+		<td> Exporting in MARC format.</td>
 	</tr>
 	<th colspan=2>Import</th>
 	<tr valign="top">
-		<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records</a> in Breeding Farm</td>
+		<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records in Breeding Farm</a></td>
 		<td>The breeding farm is a table where imported MARC records are stored. A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm.
 		</td>
 	</tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
index fd193cca6b..b74869560d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
@@ -133,21 +133,23 @@
 	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type=hidden name=op value=add_form>
 	</table>
-	<table width=40%>
+	<br/>
+	<table width=40% height="80">
 		<tr>
-			<td width=50%><!-- TMPL_VAR name="previous" --></td>
-			<td width=50%><!-- TMPL_VAR name="next" --></td>
+			<td width=50%><a href="<!-- TMPL_VAR name="previous" -->" class="button">Previous</a></td>
+			<td width=50%><a href="<!-- TMPL_VAR name="next" -->" class="button"> Next</a></td>
 		</tr>
 	</table>
-
+	<br/>
 	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type="hidden" name="op" value="add_form">
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
 	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
 	<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->">
-	<br><input type=submit class="button"  value="Add Thesaurus entry" title="Add Thesaurus entry" ALT="Add Thesaurus entry"><br>
+	<br><input type=submit class="button"  value="Add" title="Add Thesaurus entry" ALT="Add Thesaurus entry"><br>
 	</form>
 
+
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/request.tmpl b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
index 9fde83d060..1ca2d4f56c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
@@ -1,7 +1,6 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
 <form action="placerequest.pl" method=post>
-<INPUT TYPE="image" name="submit"  VALUE="request" height=42  WIDTH=187 BORDER=0 src="<!-- TMPL_VAR name="themelang" -->/images/place-request.gif" align=right >
 <input type=hidden name=biblio value="<!-- TMPL_VAR Name="bib" -->">
 <input type=hidden name=type value=str8>
 <input type=hidden name=title value="<!-- TMPL_VAR Name="title" -->">
@@ -36,11 +35,11 @@
 		<td><!-- TMPL_VAR Name=date --></td>
 		<td><!-- TMPL_VAR name="CGIbranch" --></td>
 		<td>
-			<input type=checkbox name=request value=any>Next Available,<br>(or choose from list below)
+			<input type=checkbox name=request value=any>Next Available, or choose from list below
 		</td>
 	</tr>
 </table>
-
+<INPUT type="submit" value="request" class="button">
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 <TR VALIGN=TOP>
diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
index bba6f7d5ac..7c089c6d27 100644
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
@@ -66,8 +66,8 @@
 
 	<table width="90%">
 	<tr>
-	<td align="left" width="33%"><input type="button" value="Add criteria" onClick="AddStatement()"></td>
-	<td align="middle" width="33%"><input type="submit" value="Search"></td>
+	<td align="left" width="33%"><input type="button" value="Add criteria" onClick="AddStatement()" class="button"></td>
+	<td align="middle" width="33%"><input type="submit" value="Start search" class="button"></td>
 	<td align="right" width="33%">Results per page :
 		<select align="right" name="resultsperpage" size="1">
 			<option value="20">20</option>
diff --git a/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl b/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
index eceb228827..38454d2839 100644
--- a/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
@@ -9,6 +9,7 @@
 		<p>
 			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
 			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
 			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 			<input type="hidden" name="op" value="search">
 			<input type="submit" value="Search">
@@ -18,6 +19,7 @@
 	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
 	<!-- TMPL_VAR name="select_list" -->
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
 	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 	<input type="hidden" name="op" value="select">
 	<input type="hidden" name="result" value="<!-- TMPL_VAR name="result" -->">
@@ -27,6 +29,7 @@
 <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
 	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
 	<input type="hidden" name="op" value="add">
 	insert a new authority : <input type="text" name="insert">
 	<input type="submit" name="NEW" value="NEW">
-- 
2.39.5