From bbaf605649eb52de129b02becee8b886fa4edd10 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 13 Sep 2004 15:30:52 +0000
Subject: [PATCH] css'ing readingrec

---
 .../default/en/members/readingrec.tmpl        | 100 ++--
 .../default/en/parameters/aqbookfund.tmpl     |  27 +-
 .../default/en/parameters/aqbudget.tmpl       | 310 ++++++-----
 .../default/en/parameters/stopwords.tmpl      | 315 +++++------
 .../default/en/parameters/z3950servers.tmpl   | 503 ++++++++----------
 5 files changed, 607 insertions(+), 648 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
index c90aed038b..c61100e467 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
@@ -1,54 +1,54 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
-
-<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
-<p>Member Number: <!-- TMPL_VAR NAME="bornum" --></p>
-<p>Card number: <!-- TMPL_VAR NAME="cardnumber" --></p>
-
-<!-- TMPL_IF NAME="showfulllink" -->
-<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Full output</a></p>
-<!-- /TMPL_IF -->
-
-<table cellspacing="0"  cellpadding="5" border="1">
-<tr valign="top">
-	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=title&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><b>TITLE</b></a>
-	</td>
-	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><b>AUTHOR</b></a>
-	</td>
-	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><b>DATE DUE</b></a>
-	</td>
-	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><b>RETURNED</b></a>
-	</td>
-	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-		<b>Volume</b>
-	</td>
-</tr>
-<!-- TMPL_LOOP NAME="loop_reading" -->
-<tr valign="top">
-	<td bgcolor="white"><!-- TMPL_VAR NAME="biblionumber" -->
- 		<!-- TMPL_VAR NAME="title" -->&nbsp;
-	</td>
-	<td bgcolor="white">
- 		<!-- TMPL_VAR NAME="author" -->&nbsp;
-	</td>
-	<td bgcolor="white">
-		<!-- TMPL_VAR NAME="date_due" -->&nbsp;
-	</td>
-	<td bgcolor="white">
-		<!-- TMPL_VAR NAME="returndate" -->&nbsp;
-	</td>
-	<td bgcolor="white">
-		<!-- TMPL_VAR NAME="volumeddesc" -->&nbsp;
-	</td>
-<!-- /TMPL_LOOP -->
-</table>
-
-<br>
-<a href="moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Return</a> to Member Record
-
+<div id="mainbloc">
+	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+	<p>Member Number: <!-- TMPL_VAR NAME="bornum" --></p>
+	<p>Card number: <!-- TMPL_VAR NAME="cardnumber" --></p>
+	
+	<!-- TMPL_IF NAME="showfulllink" -->
+	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Full output</a></p>
+	<!-- /TMPL_IF -->
+	
+	<table>
+	<tr>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=title&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Title</th>
+		</th>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Author</th>
+		</td>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><th>Date due</th>
+		</th>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Returned</th>
+		</th>
+		<th>
+			Volume
+		</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="loop_reading" -->
+	<tr>
+		<td><!-- TMPL_VAR NAME="biblionumber" -->
+			<!-- TMPL_VAR NAME="title" -->&nbsp;
+		</td>
+		<td>
+			<!-- TMPL_VAR NAME="author" -->&nbsp;
+		</td>
+		<td>
+			<!-- TMPL_VAR NAME="date_due" -->&nbsp;
+		</td>
+		<td>
+			<!-- TMPL_VAR NAME="returndate" -->&nbsp;
+		</td>
+		<td>
+			<!-- TMPL_VAR NAME="volumeddesc" -->&nbsp;
+		</td>
+	<!-- /TMPL_LOOP -->
+	</table>
+	
+	<br>
+	<a href="members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Return</a> to Member Record
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
index 3e5c7fdc6c..a23db9aa3d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
@@ -23,14 +23,14 @@
 			</td>
 			<td><a href="<!-- TMPL_VAR NAME="action" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Delete" title="Delete" width="32" hspace="0" vspace="0" border="0"></a></td>
 		</tr>
-		<tr valign="top" bgcolor="#99cc33">
-			<th>&nbsp;</th>
+		<tr>
+			<td>&nbsp;</td>
 			<th>Budget</th>
-			<th>
-				<a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">
-				<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" alt="Add budget" border="0"></a>
-			</th>
-			<th>&nbsp;</th>
+			<td>
+				<a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->" class="button">
+				Add budget</a>
+			</td>
+			<td>&nbsp;</td>
 		</tr>
 		<!-- TMPL_LOOP NAME="budget" -->
 			<tr valign="top">
@@ -38,9 +38,16 @@
 				<td>
 					<!-- TMPL_VAR NAME="startdate" --> - <!-- TMPL_VAR NAME="enddate" --> : <b><!-- TMPL_VAR NAME="budgetamount" --></b>
 				</td>
-				<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edit" title="Edit" width="32" hspace="0" vspace="0" border="0"></a></td>
-				<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Delete" title="Delete" width="32" hspace="0" vspace="0" border="0"></a></td>
-	
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edit" title="Edit" width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Delete" title="Delete" width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
index 67676f158c..742fc2c18e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
@@ -1,150 +1,178 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF NAME="else" -->
-	<h1>Budget admin</h1><form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
-	<input type="text" name="searchfield" value=""><input type="reset" name="reset" value="clr"></form>
-	<!-- TMPL_IF NAME="search" -->
-	<br>You Searched for <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br>
-	<!-- /TMPL_IF -->
-	<table border="0" cellspacing="0" cellpadding="5">
-	<tr valign="top" bgcolor="#99cc33"><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Book fund</b></td><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Start date</b></td><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>End date</b></td><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Budget amount</b></td><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td></tr>
-	<!-- TMPL_LOOP NAME="budget" -->
-		<tr valign="top" bgcolor=<!-- TMPL_VAR NAME="toggle" --> >
-			<td><!-- TMPL_VAR NAME="bookfundid" --> (<!-- TMPL_VAR NAME="bookfundname" -->)</td>
-			<td><!-- TMPL_VAR NAME="startdate" --></td>
-			<td><!-- TMPL_VAR NAME="enddate" --></td>
-			<td align="right"><!-- TMPL_VAR NAME="budgetamount" --></td>
-			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
-			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="else" -->
+		<h1>Budget admin</h1><form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+		<input type="text" name="searchfield" value="">
+		<input type="submit" class="button" value="OK"></form>
+		<!-- TMPL_IF NAME="search" -->
+		<br>You Searched for <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br>
+		<!-- /TMPL_IF -->
+		<table>
+		<tr>
+			<th>Book fund</th>
+			<th>Start date</th>
+			<th>End date</th>
+			<th>Budget amount</th>
+			<th>&nbsp;</th>
+			<th>&nbsp;</th>
 		</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
-	<input type="hidden" name="op" value="add_form">
-	<br><input type="submit" class="button" value="Add Budget" title="Add Budget" alt="Add Budget"><br>
-	</form><br clear="all">
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_form" -->
-<script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
+		<!-- TMPL_LOOP NAME="budget" -->
+			<tr bgcolor=<!-- TMPL_VAR NAME="toggle" --> >
+				<td><!-- TMPL_VAR NAME="bookfundid" --> (<!-- TMPL_VAR NAME="bookfundname" -->)</td>
+				<td><!-- TMPL_VAR NAME="startdate" --></td>
+				<td><!-- TMPL_VAR NAME="enddate" --></td>
+				<td align="right"><!-- TMPL_VAR NAME="budgetamount" --></td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		</table>
+		<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+			<input type="hidden" name="op" value="add_form">
+			<br>
+			<input type="submit" class="button" value="Add Budget" title="Add Budget" alt="Add Budget">
+			<br>
+		</form>
+		<br clear="all">
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_form" -->
+	<script language="javascript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
+		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		function isNotNull(f,noalert) {
+			if (f.value.length ==0) {
+	return false;
+			}
+			return true;
 		}
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
+		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		function toUC(f) {
+			var x=f.value.toUpperCase();
+			f.value=x;
+			return true;
 		}
-	if (maybenull==0 && v.value=='') {
-		return false;
-	}
-	return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
+		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		function isNum(v,maybenull) {
+		var n = new Number(v.value);
+		if (isNaN(n)) {
+			return false;
+			}
+		if (maybenull==0 && v.value=='') {
 			return false;
 		}
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (!(isNotNull(window.document.Aform.budgetamount,1))) {
-			_alertString += "\n- " + _("Budget missing");
+		return true;
+		}
+		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		function isDate(f) {
+			var t = Date.parse(f.value);
+			if (isNaN(t)) {
+				return false;
+			}
 		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2  = _("Form not submitted because of the following problem(s)");
-			alertString2 += "\n------------------------------------------------------------------------------------\n";
-			alertString2 += _alertString;
-			alert(alertString2);
+		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		function Check(f) {
+			var ok=1;
+			var _alertString="";
+			var alertString2;
+			if (!(isNotNull(window.document.Aform.budgetamount,1))) {
+				_alertString += "\n- " + _("Budget missing");
+			}
+			if (_alertString.length==0) {
+				document.Aform.submit();
+			} else {
+				alertString2  = _("Form not submitted because of the following problem(s)");
+				alertString2 += "\n------------------------------------------------------------------------------------\n";
+				alertString2 += _alertString;
+				alert(alertString2);
+			}
 		}
-	}
-	</script>
-<h1><!-- TMPL_VAR NAME="header" --></h1>
-<form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
-<input type="hidden" name="op" value="add_validate">
-<input type="hidden" name="checked" value="0">
-<table>
-
-<!-- TMPL_IF NAME="modify" -->
-	<tr><td>Book fund</td><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
-	<tr><td>Book fund name</td><td><!-- TMPL_VAR NAME="bookfundname" --></td></tr>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="adding" -->
-	<tr><td>Bookfund</td><td><input type="hidden" name="bookfundid" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
-<!-- /TMPL_IF -->
-
-<tr><td>Start date <i>(<!-- TMPL_VAR NAME="dateformat" -->)</i></td><td><input type="text" name="startdate" size="11" value="<!-- TMPL_VAR NAME="startdate" -->">&nbsp;</td></tr>
-<tr><td>End date <i>(<!-- TMPL_VAR NAME="dateformat" -->)</i></td><td><input type="text" name="enddate" size="11" value="<!-- TMPL_VAR NAME="enddate" -->"></td></tr>
-<tr><td>Budget amount</td><td><input type="text" name="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->"></td></tr>
-<tr><td>&nbsp;</td><td><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->"><input type="button" value="OK" onclick="Check(this.form)"></td></tr>
-</table>
-</form>
-<br clear="all">
-<p> &nbsp; </p>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-Data recorded
-<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
-<input type="submit" value="OK">
-</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<table border="0" cellspacing="0" cellpadding="5">
-	<tr valign="top" bgcolor="#99cc33">
-		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-			<b>Book fund</b>
-		</td>
-		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-			<b><!-- TMPL_VAR NAME="bookfundid" --></b>
-		</td>
-	</tr>
-
-	<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->">
-	<tr>
-		<td>Start date</td>
-		<td><!-- TMPL_VAR NAME="startdate" --></td>
-	</tr>
-	<tr>
-		<td>End date</td><td><!-- TMPL_VAR NAME="enddate" --></td>
-	</tr>
-	<tr>
-		<td>budgetamount</td><td><!-- TMPL_VAR NAME="budgetamount" --></td>
-	</tr>
-	<tr>
-		<td colspan="2" align="center">CONFIRM DELETION</td>
-	</tr>
-	<tr>
-		<td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="NO"></form></td>
-	</tr>
-</table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-Data deleted
-<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
-<input type="submit" value="OK">
-</form>
-<!-- /TMPL_IF -->
-
+		</script>
+	<h1><!-- TMPL_VAR NAME="header" --></h1>
+	<div id="bloc25">
+		<form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="checked" value="0">
+		<!-- TMPL_IF NAME="modify" -->
+			<p>
+				<label class="label100">Book fund</label><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" -->
+			</p>
+			<p>
+				<label class="label100">Book fund name</label><!-- TMPL_VAR NAME="bookfundname" -->
+			</p>
+		<!-- /TMPL_IF -->
+		
+		<!-- TMPL_IF NAME="adding" -->
+			<p>
+				<label class="label100">Bookfund</label><input type="hidden" name="bookfundid" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" -->
+			</p>
+		<!-- /TMPL_IF -->
+		
+		<p>
+			<label class="label100">Start date <i>(<!-- TMPL_VAR NAME="dateformat" -->)</i></label><input type="text" name="startdate" size="11" value="<!-- TMPL_VAR NAME="startdate" -->">
+		</p>
+		<p>
+			<label class="label100">End date <i>(<!-- TMPL_VAR NAME="dateformat" -->)</i></label><input type="text" name="enddate" size="11" value="<!-- TMPL_VAR NAME="enddate" -->">
+		</p>
+		<p>
+			<label class="label100">Budget amount</label><input type="text" name="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->">
+		</p>
+		<p><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->"><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
+		</form>
+	</div>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_validate" -->
+	Data recorded
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="OK">
+	</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+	<table border="0" cellspacing="0" cellpadding="5">
+		<tr valign="top" bgcolor="#99cc33">
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>Book fund</b>
+			</td>
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b><!-- TMPL_VAR NAME="bookfundid" --></b>
+			</td>
+		</tr>
+	
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->">
+		<tr>
+			<td>Start date</td>
+			<td><!-- TMPL_VAR NAME="startdate" --></td>
+		</tr>
+		<tr>
+			<td>End date</td><td><!-- TMPL_VAR NAME="enddate" --></td>
+		</tr>
+		<tr>
+			<td>budgetamount</td><td><!-- TMPL_VAR NAME="budgetamount" --></td>
+		</tr>
+		<tr>
+			<td colspan="2" align="center">CONFIRM DELETION</td>
+		</tr>
+		<tr>
+			<td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="NO"></form></td>
+		</tr>
+	</table>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+	Data deleted
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="OK">
+	</form>
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl
index 701d6f8a11..83241beaa4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl
@@ -1,176 +1,145 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF NAME="add_form" -->
-        <script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-   return false;
-                }
-                return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=='') {
-                return false;
-        }
-        return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                        return false;
-                }
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.word.value.length==0) {
-                        _alertString += "\n- " + _("word missing");
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2  = _("Form not submitted because of the following problem(s)");
-                        alertString2 += "\n------------------------------------------------------------------------------------\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </script>
-
-        <!-- TMPL_IF NAME="searchfield" -->
-                <h1>Modify word</h1>
-        <!-- TMPL_ELSE -->
-                <h1>Add word</h1>
-        <!-- /TMPL_IF -->
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate">
-         
-        <table>
-        
-        <!-- TMPL_IF NAME="searchfield" -->
-                <tr>
-                        <td>Word</td>
-                        <td>
-                                <input type="hidden" name="word" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-        <!-- TMPL_ELSE -->
-                <tr>
-                        <td>Word</td>
-                        <td>
-                                <input type="text" name="word" size="80" maxlength="250" onblur="toUC(this)">
-                        </td>
-                </tr>
-        <!-- /TMPL_IF -->
-                <tr>
-                        <td> </td>
-                        <td><input type="button" value="OK" onclick="Check(this.form)"></td>
-                </tr>
-        </table>
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-        Data recorded
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK">
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-        <table border="0" cellspacing="0" cellpadding="5">
-                <tr bgcolor="#99cc33">
-                        <td background="/images/background-mem.gif"><b>Word</b></td>
-                        <td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
-                </tr>
-
-                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                        <input type="hidden" name="op" value="delete_confirmed">
-                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-
-                <tr>
-                        <td colspan="2" align="center">CONFIRM DELETION</td>
-                </tr>
-                <tr>
-                        <td>
-                                <input type="submit" value="YES">
-                                </form>
-                        </td>
-                        <td>
-                                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                                        <input type="submit" value="NO">
-                                </form>
-                        </td>
-                </tr>
-	</table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-        Data deleted
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="submit" value="OK">
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-        <h2>Stop words admin</h2>
-	<b>NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-                <input type="reset" name="reset" value="clr">
-        </form>
-
-        <!-- TMPL_IF NAME="searchfield" -->
-                You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
-        <!-- /TMPL_IF -->
-
-        <table border="0" cellspacing="0" cellpadding="5">
-                <tr bgcolor="#99cc33">
-                        <td background="/images/background-mem.gif"><b>Word</b></td>
-                        <td background="/images/background-mem.gif"> </td>
-                </tr>
-                <!-- TMPL_LOOP NAME="loop" -->
-                <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-                        <td><!-- TMPL_VAR NAME="word" --></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="word" -->">Delete</a></td>
-                </tr>
-                <!-- /TMPL_LOOP -->
-        </table>
-
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form">
-
-        <!-- TMPL_IF NAME="offsetgtzero" -->
-                <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
-        <!-- /TMPL_IF -->
-
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-        <!-- TMPL_IF NAME="ltcount" -->
-                <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>
-        <!-- /TMPL_iF -->
-
-        <br>
-        <input type="submit" class="button" value="Add Stop word" alt="Add Stop word" >
-        <br>
-        </form>
-<!-- /TMPL_IF -->
-
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+		<script language="javascript" type="text/javascript">
+			function _(s) { return s } // dummy function for gettext
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isNotNull(f,noalert) {
+					if (f.value.length ==0) {
+						return false;
+					}
+					return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function toUC(f) {
+				var x=f.value.toUpperCase();
+				f.value=x;
+				return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isNum(v,maybenull) {
+			var n = new Number(v.value);
+			if (isNaN(n)) {
+					return false;
+					}
+			if (maybenull==0 && v.value=='') {
+					return false;
+			}
+			return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isDate(f) {
+					var t = Date.parse(f.value);
+					if (isNaN(t)) {
+							return false;
+					}
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function Check(f) {
+					var ok=1;
+					var _alertString="";
+					var alertString2;
+					if (f.word.value.length==0) {
+							_alertString += "\n- " + _("word missing");
+					}
+					if (_alertString.length==0) {
+							document.Aform.submit();
+					} else {
+							alertString2  = _("Form not submitted because of the following problem(s)");
+							alertString2 += "\n------------------------------------------------------------------------------------\n";
+							alertString2 += _alertString;
+							alert(alertString2);
+					}
+			}
+			</script>
+	
+			<!-- TMPL_IF NAME="searchfield" -->
+					<h1>Modify word</h1>
+			<!-- TMPL_ELSE -->
+					<h1>Add word</h1>
+			<!-- /TMPL_IF -->
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
+			<!-- TMPL_IF NAME="searchfield" -->
+				<p>
+					<label>Word</label>
+					<label>
+						<input type="hidden" name="word" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+					</label>
+				</p>
+			<!-- TMPL_ELSE -->
+				<p>
+					<label>Word</label>
+					<input type="text" name="word" size="80" maxlength="250" onblur="toUC(this)">
+				</p>
+			<!-- /TMPL_IF -->
+					<p>
+						<td><input type="button" value="OK" onclick="Check(this.form)" class="button"></td>
+					</p>
+			</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_validate" -->
+			Data recorded
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
+			</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<p>CONFIRM DELETION of <!-- TMPL_VAR NAME="searchfield" --></p>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed">
+			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+			<input type="submit" value="YES" class="button">
+		</form>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="NO" class="button">
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+			Data deleted
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="OK" class="button">
+			</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="else" -->
+		<h1 class="parameters">Stop words admin</h1>
+		<b>NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+					<input type="submit" name="ok" value="OK" class="button">
+			</form>
+	
+			<!-- TMPL_IF NAME="searchfield" -->
+					You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
+			<!-- /TMPL_IF -->
+	
+			<table class="small">
+				<tr>
+					<th>Word</th>
+					<th> </th>
+				</tr>
+				<!-- TMPL_LOOP NAME="loop" -->
+					<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+						<td><!-- TMPL_VAR NAME="word" --></td>
+						<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="word" -->" class="button">Delete</a></td>
+					</tr>
+				<!-- /TMPL_LOOP -->
+			</table>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="add_form">
+				<!-- TMPL_IF NAME="offsetgtzero" -->
+						<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->" class="button">&lt;&lt; Prev</a>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="ltcount" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->" class="button">Next &gt;&gt;</a>
+				<!-- /TMPL_iF -->
+				<input type="submit" class="button" value="Add Stop word" alt="Add Stop word">
+			</form>
+	<!-- /TMPL_IF -->
+</div>
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
index e84caa4731..aa11352ed2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
@@ -1,289 +1,244 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF NAME="add_form" -->
-        <script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-                    return false;
-                }
-                return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=='') {
-                return false;
-        }
-        return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                       return false;                       
-                }
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.searchfield.value.length==0) {
-                        _alertString += "\n- " + _("site name missing");
-                }
-                if (f.host.value.length==0) {
-                        _alertString += "\n- " + _("host missing");
-                }
-                if (f.port.value.length==0) {
-                        _alertString += "\n- " + _("port missing");
-                }
-                if (f.db.value.length==0) {
-                        _alertString += "\n- " + _("database missing");
-                }
-                if (isNaN(f.port.value)) {
-                        _alertString += "\n- " + _("port must be a number");
-                }
-                if (isNaN(f.rank.value)) {
-                        _alertString += "\n- " + _("rank must be a number");
-                }
-                if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
-                        _alertString += "\n- " + _("checked must be 0 or 1");
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2  = _("Form not submitted because of the following problem(s)");
-                        alertString2 += "\n------------------------------------------------------------------------------------\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </script>
-
-        <!-- TMPL_IF NAME="searchfield" -->
-                <h1>Modify Z39.50 Server</h1>
-        <!-- TMPL_ELSE -->
-                <h1>Add Z39.50 server</h1>
-        <!-- /TMPL_IF -->
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate">
-                
-        <table>
-        
-        <!-- TMPL_IF NAME="searchfield" -->
-                <tr>
-                        <td>Z39.50 Server</td>
-                        <td>
-                                <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-        <!-- TMPL_ELSE -->
-                <tr>
-                        <td>Z39.50 Server</td>
-                        <td>
-                                <input type="text" name="searchfield" size="100" maxlength="100" onblur="toUC(this)">
-                        </td>
-                </tr>
-        <!-- /TMPL_IF -->
-
-		<tr>
-			<td>Hostname</td>
-			<td>
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+		<script language="javascript" type="text/javascript">
+			function _(s) { return s } // dummy function for gettext
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isNotNull(f,noalert) {
+					if (f.value.length ==0) {
+						return false;
+					}
+					return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function toUC(f) {
+					var x=f.value.toUpperCase();
+					f.value=x;
+					return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isNum(v,maybenull) {
+			var n = new Number(v.value);
+			if (isNaN(n)) {
+					return false;
+					}
+			if (maybenull==0 && v.value=='') {
+					return false;
+			}
+			return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isDate(f) {
+					var t = Date.parse(f.value);
+					if (isNaN(t)) {
+						return false;                       
+					}
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function Check(f) {
+					var ok=1;
+					var _alertString="";
+					var alertString2;
+					if (f.searchfield.value.length==0) {
+							_alertString += "\n- " + _("site name missing");
+					}
+					if (f.host.value.length==0) {
+							_alertString += "\n- " + _("host missing");
+					}
+					if (f.port.value.length==0) {
+							_alertString += "\n- " + _("port missing");
+					}
+					if (f.db.value.length==0) {
+							_alertString += "\n- " + _("database missing");
+					}
+					if (isNaN(f.port.value)) {
+							_alertString += "\n- " + _("port must be a number");
+					}
+					if (isNaN(f.rank.value)) {
+							_alertString += "\n- " + _("rank must be a number");
+					}
+					if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
+							_alertString += "\n- " + _("checked must be 0 or 1");
+					}
+					if (_alertString.length==0) {
+							document.Aform.submit();
+					} else {
+							alertString2  = _("Form not submitted because of the following problem(s)");
+							alertString2 += "\n------------------------------------------------------------------------------------\n";
+							alertString2 += _alertString;
+							alert(alertString2);
+					}
+			}
+		</script>
+		<!-- TMPL_IF NAME="searchfield" -->
+				<h1>Modify Z39.50 Server</h1>
+		<!-- TMPL_ELSE -->
+				<h1>Add Z39.50 server</h1>
+		<!-- /TMPL_IF -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
+			<!-- TMPL_IF NAME="searchfield" -->
+				<p>
+					<label class="label100">Z39.50 Server</label>
+					<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+				</p>
+			<!-- TMPL_ELSE -->
+				<p>
+					<label class="label100">Z39.50 Server</label>
+					<input type="text" name="searchfield" size="100" maxlength="100" onblur="toUC(this)">
+				</p>
+			<!-- /TMPL_IF -->
+			<p>
+				<label class="label100">Hostname</label>
 				<input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->">
-			</td>
-		</tr>
-		<tr>
-			<td>Port</td>
-			<td>
+			</p>
+			<p>
+				<label class="label100">Port</label>
 				<input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)">
-			</td>
-		</tr>
-		<tr>
-			<td>Database</td>
-			<td>
+			</p>
+			<p>
+				<label class="label100">Database</label>
 				<input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->">
-			</td>
-		</tr>
-		<tr>
-			<td>Userid</td>
-			<td>
+			</p>
+			<p>
+				<label class="label100">Userid</label>
 				<input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->">
-			</td>
-		</tr>
-		<tr>
-			<td>Password</td>
-			<td>
+			</p>
+			<p>
+				<label class="label100">Password</label>
 				<input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->">
-			</td>
-		</tr>
-		<tr>
-			<td>Checked (searched by default)</td>
-			<td>
-				<input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)">  
-		<tr>
-			<td>Rank (display order)</td>
-			<td>
+			</p>
+			<p>
+				<label class="label100">Checked (searched by default)</label>
+				<input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)">
+			</p>
+			<p>
+				<label class="label100">Rank (display order)</label>
 				<input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)">
-			</td>
-		</tr>
-		<tr>
-			<td>Syntax (z3950 can send records in various format. Choose one)</td>
-			<td>
+			</p>
+			<p>
+				<label class="label100">Syntax (z3950 can send records in various format. Choose one)</label>
 				<select name="syntax">
 					<option value="MARC21">MARC21</option>
 					<option value="UNIMARC">UNIMARC</option>
 				</select>
-			</td>
-		</tr>
-		<tr>
-			<td> </td>
-			<td>
-				<input type="button" value="OK" onclick="Check(this.form)">
-			</td>
-		</tr>
-        </table>
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-        Data recorded
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK">
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-	<!-- TMPL_VAR NAME="reqsel" -->
+			</p>
+			<input type="button" value="OK" onclick="Check(this.form)" class="button">
+		</form>
+	<!-- /TMPL_IF -->
 	
-        <table border="0" cellspacing="0" cellpadding="5">
-                <tr bgcolor="#99cc33">
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-                                <b>Site</b>
-                        </td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-                                <!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                        <input type="hidden" name="op" value="delete_confirmed">
-                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-                <tr>
-                        <td>Hostname</td>
-                        <td><!-- TMPL_VAR NAME="host" --></td>
-                </tr>
-                <tr>
-                        <td>Port</td>
-                        <td><!-- TMPL_VAR NAME="port" --></td>
-                </tr>
-                <tr>
-                        <td>Database</td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                </tr>
-                <tr>
-                        <td>Userid</td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                </tr>
-                <tr>
-                        <td>Password</td>
-                        <td><!-- TMPL_VAR NAME="password" --></td>
-                </tr>
-                <tr>
-                        <td>Checked</td>
-                        <td><!-- TMPL_VAR NAME="checked" --></td>
-                </tr>
-                <tr>
-                        <td>Rank</td>
-                        <td><!-- TMPL_VAR NAME="rank" --></td>
-                </tr>
-                <tr>
-                        <td colspan="2" align="center">CONFIRM DELETION</td>
-                </tr>
-                <tr>
-                        <td><input type="submit" value="YES"></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td>
-                </tr>
-	</table>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-        Data deleted
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="submit" value="OK">
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-        <h2>Z39.50 Servers admin</h2>
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
-                <input type="reset" name="reset" value="clr">
-        </form>
-
-        <!-- TMPL_IF NAME="searchfield" -->
-                You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
-        <!-- /TMPL_IF -->
-
-        <table border="0" cellspacing="0" cellpadding="5">
-                <tr bgcolor="#99cc33">
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Site</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Hostname</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Port</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Database</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Userid</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Password</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Checked</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Rank</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Syntax</b></td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
-                        <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
-                </tr>
-                <!-- TMPL_LOOP NAME="loop" -->
-                <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-                        <td><!-- TMPL_VAR NAME="name" --></td>
-                        <td><!-- TMPL_VAR NAME="host" --></td>
-                        <td><!-- TMPL_VAR NAME="port" --></td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                        <td><!-- TMPL_VAR NAME="password" --></td>
-                        <td><!-- TMPL_VAR NAME="checked" --></td>
-                        <td><!-- TMPL_VAR NAME="rank" --></td>
-                        <td><!-- TMPL_VAR NAME="syntax" --></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edit" title="edit" border="0" ></a></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Delete" title="delete" border="0" ></a></td>
+	<!-- TMPL_IF NAME="add_validate" -->
+		Data recorded
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK" class="button">
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<!-- TMPL_VAR NAME="reqsel" -->
+			<table>
+			<tr>
+				<th>Site</th>
+				<th><!-- TMPL_VAR NAME="searchfield" --></th>
 			</tr>
-                <!-- /TMPL_LOOP -->
-	</table>
-
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form">
-                        
-        <!-- TMPL_IF NAME="offsetgtzero" -->
-                <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
-        <!-- /TMPL_IF -->
-        
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-        <!-- TMPL_IF NAME="ltcount" -->
-                <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>
-        <!-- /TMPL_iF -->
-                
-        <br>
-        <input type="submit" class="button" alt="Add Z39.50 server" value="Add Z39.50 server">
-        <br>
-        </form>
-
-<!-- /TMPL_IF -->
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+			<tr>
+				<td>Hostname</td>
+				<td><!-- TMPL_VAR NAME="host" --></td>
+			</tr>
+			<tr>
+				<td>Port</td>
+				<td><!-- TMPL_VAR NAME="port" --></td>
+			</tr>
+			<tr>
+				<td>Database</td>
+				<td><!-- TMPL_VAR NAME="db" --></td>
+			</tr>
+			<tr>
+				<td>Userid</td>
+				<td><!-- TMPL_VAR NAME="userid" --></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td><!-- TMPL_VAR NAME="password" --></td>
+			</tr>
+			<tr>
+				<td>Checked</td>
+				<td><!-- TMPL_VAR NAME="checked" --></td>
+			</tr>
+			<tr>
+				<td>Rank</td>
+				<td><!-- TMPL_VAR NAME="rank" --></td>
+			</tr>
+			<tr>
+				<td colspan="2" align="center">CONFIRM DELETION</td>
+			</tr>
+			<tr>
+				<td><input type="submit" value="YES"></form></td>
+				<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td>
+			</tr>
+		</table>
+	<!-- /TMPL_IF -->
 
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+			Data deleted
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="OK">
+			</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="else" -->
+			<h1 class="parameters">Z39.50 Servers admin</h1>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+				<input type="submit" name="ok" value="OK" class="button">
+			</form>
+			<!-- TMPL_IF NAME="searchfield" -->
+				You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
+			<!-- /TMPL_IF -->
+			<table>
+				<tr>
+					<th>Site</th>
+					<th>Hostname</th>
+					<th>Port</th>
+					<th>Database</th>
+					<th>Userid</th>
+					<th>Password</th>
+					<th>Checked</th>
+					<th>Rank</th>
+					<th>Syntax</th>
+					<th> </td>
+					<th> </td>
+				</tr>
+				<!-- TMPL_LOOP NAME="loop" -->
+				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+					<td><!-- TMPL_VAR NAME="name" --></td>
+					<td><!-- TMPL_VAR NAME="host" --></td>
+					<td><!-- TMPL_VAR NAME="port" --></td>
+					<td><!-- TMPL_VAR NAME="db" --></td>
+					<td><!-- TMPL_VAR NAME="userid" --></td>
+					<td><!-- TMPL_VAR NAME="password" --></td>
+					<td><!-- TMPL_VAR NAME="checked" --></td>
+					<td><!-- TMPL_VAR NAME="rank" --></td>
+					<td><!-- TMPL_VAR NAME="syntax" --></td>
+					<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edit" title="edit" border="0" ></a></td>
+					<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Delete" title="delete" border="0" ></a></td>
+				</tr>
+				<!-- /TMPL_LOOP -->
+		</table>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
+			<!-- TMPL_IF NAME="offsetgtzero" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->" class="button">&lt;&lt; Prev</a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ltcount" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->" class="button">Next &gt;&gt;</a>
+			<!-- /TMPL_iF -->
+			<input type="submit" class="button" alt="Add Z39.50 server" value="Add Z39.50 server">
+		</form>
+	
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
-- 
2.39.5