From fefe64cf55bb15ba82583bc1a6705605fabdc12e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Sat, 20 Oct 2007 16:42:04 -0500
Subject: [PATCH] More work on standardizing toolbars. Also standardizing form
 markup in /tools

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/includes/cataloging-toolbar.inc   | 59 +++++++++++++
 .../prog/en/includes/serials-toolbar.inc      | 41 +++++++--
 .../prog/en/includes/tools-labels-toolbar.inc | 25 ++++++
 .../prog/en/includes/tools-news-toolbar.inc   | 21 +++++
 .../en/includes/tools-notices-toolbar.inc     | 21 +++++
 .../en/modules/cataloguing/addbiblio.tmpl     | 38 ++++++---
 .../prog/en/modules/cataloguing/addbooks.tmpl | 31 ++-----
 .../modules/labels/label-create-layout.tmpl   | 28 +++---
 .../modules/labels/label-create-template.tmpl | 78 +++++++++--------
 .../prog/en/modules/labels/label-home.tmpl    |  5 +-
 .../prog/en/modules/labels/label-manager.tmpl | 18 +---
 .../en/modules/labels/label-templates.tmpl    |  5 +-
 .../prog/en/modules/serials/serials-home.tmpl |  3 +-
 .../modules/serials/subscription-detail.tmpl  |  3 +-
 .../prog/en/modules/tools/breeding.tmpl       | 49 +++++------
 .../prog/en/modules/tools/cleanborrowers.tmpl | 18 ++--
 .../prog/en/modules/tools/export.tmpl         | 72 ++++++++--------
 .../prog/en/modules/tools/import.tmpl         | 49 +++++------
 .../prog/en/modules/tools/inventory.tmpl      | 49 ++++++-----
 .../prog/en/modules/tools/koha-news.tmpl      | 65 ++++++--------
 .../prog/en/modules/tools/letter.tmpl         | 85 +++++++++----------
 21 files changed, 449 insertions(+), 314 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
new file mode 100644
index 0000000000..af323bc20f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
@@ -0,0 +1,59 @@
+
+
+<div id="toolbar">
+<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    $("#newmenuc").empty();
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {   
+	
+    <!-- TMPL_IF NAME="NOTMARC" -->
+	    new YAHOO.widget.Button("newrecord");
+	<!-- TMPL_ELSE -->
+	
+		var newmenu = [
+			{ text: "Default Framework", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=" },
+			<!-- TMPL_LOOP NAME="frameworkcodeloop" -->{ text: "<!-- TMPL_VAR name="frameworktext" --> Framework", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=<!-- TMPL_VAR name="value" -->"},
+<!-- /TMPL_LOOP -->
+		]
+
+	    new YAHOO.widget.Button({
+	        type: "menu",
+	        label: "New Record",
+	        name: "newmenubutton",
+	        menu: newmenu,
+	        container: "newmenuc"
+	    });  
+	}
+
+			<!-- /TMPL_IF -->
+	//]]>
+	</script>
+	
+  <span id="newmenuc">
+    <!-- TMPL_IF NAME="NOTMARC" -->
+		<a id="newrecord" href="/cgi-bin/koha/cataloging/addbiblio.pl">New Record</a>
+	<!-- TMPL_ELSE -->
+		<form name="f" action="addbiblio.pl" method="post">
+		<label for="frameworkcode">New Record with framework:</label>
+			<select name="frameworkcode" id="frameworkcode">
+				<option value="">Default</option>
+				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
+					<option value="<!-- TMPL_VAR NAME="value" -->">
+						<!-- TMPL_VAR NAME="frameworktext" -->
+					</option>
+				<!-- /TMPL_LOOP -->
+			</select>
+			<input type="submit" value="Add Record Without Search" />
+		</form>
+  
+  </span>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
index 0ab061961a..438bd5e71b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
@@ -1,10 +1,35 @@
-<div id="toolbar">
+<div id="toolbar"><script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	
+	    new YAHOO.widget.Button("newsubscription");
+	    <!-- TMPL_IF NAME="subscriptionid" -->
+		new YAHOO.widget.Button("edit");
+		new YAHOO.widget.Button("duplicate");
+	    new YAHOO.widget.Button("renew");
+	    new YAHOO.widget.Button("receive");
+	    new YAHOO.widget.Button("delete");
+		<!-- /TMPL_IF -->
+	}
+
+	//]]>
+	</script>
 <ul class="toolbar">
-	<li><a href="/cgi-bin/koha/serials/subscription-add.pl">New Subscription</a></li>
-	<!-- TMPL_IF NAME="subscriptionid" --><li><a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
-	<li><a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
-	<li><a href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
-	<li><a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
-	<li><a href="javascript:confirm_deletion()">Delete</a></li><!-- /TMPL_IF -->
+	<li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New Subscription</a></li>
+	<!-- TMPL_IF NAME="subscriptionid" --><li><a id="edit" href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
+	<li><a id="duplicate" href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
+	<li><a id="renew" href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
+	<li><a id="receive" href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
+	<li><a id="delete" href="javascript:confirm_deletion()">Delete</a></li>
+		<!-- /TMPL_IF -->
 </ul>
-<br clear="all" />    </div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc
new file mode 100644
index 0000000000..e303223de3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc
@@ -0,0 +1,25 @@
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newlabel");
+		new YAHOO.widget.Button("newtemplate");
+		new YAHOO.widget.Button("newbatch");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newlabel" href="/cgi-bin/koha/labels/label-create-layout.pl">New Layout</a></li>
+	<li><a id="newtemplate" href="/cgi-bin/koha/labels/label-create-template.pl?op=blank">New Label Template</a></li>
+	<li><a id="newbatch" href="/cgi-bin/koha/labels/label-manager.pl?op=add_batch">New Label Batch</a></li>
+</ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc
new file mode 100644
index 0000000000..373a036ee2
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc
@@ -0,0 +1,21 @@
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newentry");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New Entry</a></li>
+</ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc
new file mode 100644
index 0000000000..0f140b1903
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc
@@ -0,0 +1,21 @@
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newnotice");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newnotice" href="/cgi-bin/koha/tools/letter.pl?op=add_form">New Notice</a></li>
+</ul></div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index 33ee5e217c..d4c1a95623 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; <!-- TMPL_IF NAME="biblionumber" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript">
 //<![CDATA[
 
@@ -425,7 +426,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 	}
 </style>
 </head>
-<body>
+<body class="yui-skin-sam">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
@@ -465,15 +466,32 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 	<input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
 <!-- /TMPL_IF -->
 	
-<div id="action">
-    <!-- TMPL_IF name="biblionumber" -->
-        <input type="submit" value="Save Bibliographic Record" />
-    <!-- TMPL_ELSE -->
-        <input type="submit" value="Add Bibliographic Record" />
-    <!-- /TMPL_IF -->
-    <input type="button" value="z39.50 Search" onclick="PopupZ3950(); return false;" />
-	<label for="Frameworks">Change framework: </label><!--TMPL_VAR Name="framework" -->
-	<input type="hidden" name="op" value="addbiblio" />
+<div id="toolbar">
+
+<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("addbiblio");
+	   // this breaks z3950 search  new YAHOO.widget.Button("z3950search");
+	}
+
+	//]]>
+	</script>
+
+		<ul class="toolbar">
+			<li><input id="addbiblio" type="submit" value="Save" /></li>
+			<li><input type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950(); return false;" /></li>
+			<li id="changeframework"><label for="Frameworks">Change framework: </label><!--TMPL_VAR Name="framework" -->	<input type="hidden" name="op" value="addbiblio" /></li>
+		</ul>
 </div>
 
 <!--TMPL_IF Name="popup"-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index 8a5b770579..93ad58dd3e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -1,13 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloguing</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript">
 	$(document).ready(function() {
 	$('#header_search').tabs();
  });
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cataloging-search.inc" -->
 
@@ -17,34 +18,12 @@
    
    <div id="bd">
 	<div id="yui-main">
+	
+<!-- TMPL_INCLUDE NAME="cataloging-toolbar.inc" -->
+	
 	<!-- TMPL_IF name="noitemsfound" -->
 		No items found
 	<!-- /TMPL_IF -->
-	
-<div id="addbooks_add_without_search">
-	<!-- TMPL_IF NAME="NOTMARC" -->
-		<form action="addbiblio.pl">
-			<input type="submit" value="Add Record Without Search" />
-		</form>
-	<!-- TMPL_ELSE -->
-		<form name="f" action="addbiblio.pl" method="post">
-		<h3>Create a Blank Bibliographic Record</h3>
-		<p>
-			<label for="frameworkcode">Choose a Framework:</label>
-			<select name="frameworkcode" id="frameworkcode">
-				<option value="">Default</option>
-				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
-					<option value="<!-- TMPL_VAR NAME="value" -->">
-						<!-- TMPL_VAR NAME="frameworktext" -->
-					</option>
-				<!-- /TMPL_LOOP -->
-			</select>
-			<input type="submit" value="Add Record Without Search" />
-		</p>
-		</form>
-			<!-- /TMPL_IF -->
-</div>
-
 
 <!-- display the search results -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
index a8e404613f..e705d82340 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
@@ -16,11 +16,13 @@
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 <form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
 
-<p><label for="layoutname">Layout Name</label>
-<input type="textbox" name="layoutname" id="layoutname" size="20" value="<!-- TMPL_VAR NAME="layoutname" -->" /></p>
-
-<p><label for="tx_title">Choose Order Of Fields to Print</label></p>
+<fieldset class="rows">
+<legend>Create Layout</legend>
+<ol><li><label for="layoutname">Layout Name</label>
+<input type="text" name="layoutname" id="layoutname" size="20" value="<!-- TMPL_VAR NAME="layoutname" -->" /></li>
 
+<li><fieldset>
+<legend>Choose Order Of Fields to Print</legend>
 <table summary="fields to print">
 <tr>
         <td>
@@ -196,7 +198,7 @@
        </select>
         <label>Sub-Class</label>
         </td>
-        <td>
+        <td colspan="2">
         <select name="tx_itemcallnumber">
           <option value="0" selected="selected"></option>
         <option value="1">1</option>
@@ -213,9 +215,9 @@
         <label>Call Number</label>
         </td>
   </tr>
-</table>
+</table></fieldset></li>
 
-<p><label for="barcodetype">Choose Barcode Type</label>
+<li><label for="barcodetype">Choose Barcode Type: </label>
 <select name="barcodetype" id="barcodetype">
     <!-- TMPL_LOOP NAME="barcode_types" -->
 	<!-- TMPL_IF NAME="active" --><option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="desc" --></option>
@@ -223,9 +225,9 @@
         <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
 		<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
-</select></p>
+</select></li>
 
-<p><label for="printingtype">Choose Layout Type</label>
+<li><label for="printingtype">Choose Layout Type: </label>
 <select name="printingtype" id="printingtype">
     <!-- TMPL_LOOP NAME="printingtypes" -->
 	<!-- TMPL_IF NAME="active" -->
@@ -234,12 +236,12 @@
         <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
 	<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
-</select></p>
-<p>
-<label for="startlabel">Start printing from Label number:<input type="textbox" name="startlabel" id="startlabel" size="2" value="1" /></label></p>
+</select></li>
+<li>
+<label for="startlabel">Start printing from Label number: </label> <input type="text" name="startlabel" id="startlabel" size="2" value="1" /></li>
 
 
-<p><label for="guidebox">Draw Guide Boxes<input type="checkbox" id="guidebox" name="guidebox" value="1" /></label></p>
+<li><label for="guidebox">Draw Guide Boxes: </label><input type="checkbox" id="guidebox" name="guidebox" value="1" /></li></ol></fieldset>
 <p>		<input type="hidden" name="op" value="add_layout" />
         <input type="submit" value="Submit" /></p>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
index b89dccc94f..db9be7c538 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
@@ -5,7 +5,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels &rsaquo; Create Label Template</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -15,46 +15,54 @@
 
 <form name="input" action="/cgi-bin/koha/labels/label-create-template.pl" method="get">
 
-<h3>Create Label Template</h3>
+<fieldset class="rows">
+<legend>Create Label Template</legend>
 
+<ol>
 
+<li><label for="tmpl_code">Template Code:</label> <input type="text"  size="40" name="tmpl_code" id="tmpl_code" /></li>
+<li><label for="tmpl_desc">Template Description:</label> <textarea cols="40" rows="3" name="tmpl_desc" id="tmpl_desc"></textarea></li>
 
-<h3>Template Settings</h3>
-<table>
-
-Template Code: <input type="text"  size="40" name="tmpl_code" /><br />
-Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc" ></textarea><br />
-
-<tr>
-        <td>Page Width:</td><td><input type="text"  size="2" name="page_width" /></td>
-        <td>Page Height:</td><td><input type="text" size="2" name="page_height" /></td>
-</tr>
-<tr>
-        <td>Label Width:</td><td><input type="text"  size="2" name="label_width" /></td>
-        <td>Label Height:</td><td><input type="text" size="2" name="label_height" /></td>
-</tr>
-<tr>
-        <td>Top Page Margin:</td><td><input type="text" size="2" name="topmargin" /></td>
-        <td>Left Page Margin:</td><td><input type="text" size="2" name="leftmargin" /></td>
-</tr>
-<tr>
-        <td>Number of Columns:</td><td><input type="text" size="2" name="cols" /></td>
-        <td>Number of Rows:</td><td><input type="text" size="2" name="rows" /></td>
-</tr>
-<tr>
-        <td>Gap between Columns:</td><td><input type="text" size="2" name="colgap" /></td>
-        <td>Gap between Rows:</td><td><input type="text" size="2" name="rowgap" /></td>
-</tr>
-</table>
-
-
-Units: <select name="units">
+<li><label for="units">Units: </label><select id="units" name="units">
     <!-- TMPL_LOOP NAME="units" -->
         <option value="<!-- TMPL_VAR NAME="unit" -->"><!-- TMPL_VAR NAME="desc" --></option>
     <!-- /TMPL_LOOP -->
-</select>
-Font Size: <input type="textbox" name="fontsize"  size="1" value="" />
-Active: <input type="checkbox" name="active" />
+</select></li>
+<li>
+        <label for="page_width">Page Width:</label><input type="text"  size="2" name="page_width" id="page_width" />
+</li>
+<li>
+        <label for="page_height">Page Height:</label><input type="text" size="2" name="page_height" id="page_height" />
+</li>
+<li>
+        <label for="label_width">Label Width:</label><input type="text"  size="2" name="label_width" id="label_width" />
+</li>
+<li>
+        <label for="label_height">Label Height:</label><input type="text" size="2" name="label_height" id="label_height" />
+</li>
+<li>
+        <label for="topmargin">Top Page Margin:</label><input type="text" size="2" name="topmargin" id="topmargin" />
+</li>
+<li>
+        <label for="leftmargin">Left Page Margin:</label><input type="text" size="2" name="leftmargin" id="leftmargin" />
+</li>
+<li>
+        <label for="cols">Number of Columns:</label><input type="text" size="2" name="cols" id="cols" />
+</li>
+<li>
+        <label for="rows">Number of Rows:</label><input type="text" size="2" name="rows" id="rows" />
+</li>
+<li>
+        <label for="colgap">Gap between Columns:</label><input type="text" size="2" name="colgap" id="colgap" />
+</li>
+<li>
+        <label for="rowgap">Gap between Rows:</label><input type="text" size="2" name="rowgap" id="rowgap" />
+</li>
+
+<li class="radio"><label for="fontsize">Font Size:</label> <input type="textbox" id="fontsize" name="fontsize"  size="1" value="" /></li>
+<li class="radio"><label for="active">Active: </label><input type="checkbox" id="active" name="active" /></li>
+</ol>
+</fieldset>
         <input type="hidden" name="op" value="create" />
         <input type="submit" value="Save" />
         <input type="reset" value="Reset" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index b85f93b022..221359cb58 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
@@ -13,6 +14,7 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
+<!-- TMPL_INCLUDE NAME="tools-labels-toolbar.inc" -->
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
 <!-- TMPL_IF NAME="layout_loop" -->
@@ -59,7 +61,6 @@
 </table>
 </form>
 <!-- /TMPL_IF -->
-<p><a href="/cgi-bin/koha/labels/label-create-layout.pl">Create New Layout</a></p>
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
index d3beaf7851..06ff803bff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
@@ -1,12 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript">
 function Plugin(batch_id) {
 	window.open("label-item-search.pl?batch_id="+batch_id+"",'FindABibIndex','width=600,height=460,toolbar=no,scrollbars=yes');
 }
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
@@ -18,23 +19,11 @@ function Plugin(batch_id) {
 	<div id="yui-main">
 	<div class="yui-b">
 
+<!-- TMPL_INCLUDE NAME="tools-labels-toolbar.inc" -->
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
 <!-- TMPL_UNLESS NAME="batch_id" -->
-<div class="details">
-<a class="button" href="/cgi-bin/koha/labels/label-manager.pl?op=add_batch">Create New Batch</a> 
 
-<!-- <form style="padding: 3px 30px; border-left: 1px solid black;border-right: 1px solid black;margin: 0 20px;" name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
-<select name="batch_id">
-    <!-- TMPL_LOOP NAME="batches" -->
-        <option value="<!-- TMPL_VAR NAME="batch_id" -->" <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->>
-        <!-- TMPL_VAR NAME="batch_id" --></option>
-    <!-- /TMPL_LOOP -->
-</select>
-<input type="submit" value="Open Existing Batch">
-</form>
--->
-</div>
 <!-- TMPL_IF NAME="batches" -->
 <h2>Label Batches</h2>
 <table>
@@ -69,7 +58,6 @@ function Plugin(batch_id) {
 
 <!-- TMPL_ELSE -->
 <div class="details">
-<br /> 
 
         <a class="button" href="#" onclick="Plugin(<!-- TMPL_VAR NAME="batch_id" -->); return false;">Add item(s) to batch</a> &nbsp;&nbsp;&nbsp;&nbsp;
 		<a class="button" href="/cgi-bin/koha/labels/label-manager.pl?batch_id=">Return to batch summary</a>&nbsp;&nbsp;&nbsp;&nbsp;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
index 91ca3817d9..651cd8d9f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
@@ -13,6 +14,7 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
+<!-- TMPL_INCLUDE NAME="tools-labels-toolbar.inc" -->
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
 <!-- TMPL_IF NAME="resultsloop" -->
@@ -59,7 +61,6 @@
 </form>
 <!-- /TMPL_IF -->
 
-<a href="/cgi-bin/koha/labels/label-create-template.pl?op=blank">Create New Label Template</a>
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
index 62585e0b45..94850966da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials <!-- TMPL_VAR name="biblionumber" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 2f58c6b06e..f963d5dfce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Details for Subscription #<!-- TMPL_VAR name="subscriptionid" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript" language="javascript">
 <!--
 
@@ -92,7 +93,7 @@ function popup(subscriptionid) {
 -->
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl
index 7e3cd21f60..7e4cc7729b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl
@@ -15,7 +15,6 @@
 	<div class="yui-b">
 
 <h1>MARC acquisition system</h1>
-<h4>Import into the reservoir</h4>
 
 <!-- TMPL_IF name="uploadmarc" -->
 <p>Import results :</p>
@@ -35,32 +34,34 @@
 	<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
 </ul>
 <form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
-<table>
-	<tr>
-		<th scope="row"><label for="uploadmarc">Select the file to import: </label></th>
-		<td>
+<fieldset class="rows"><legend>Import into the reservoir</legend><ol>
+	<li>
+		<label for="uploadmarc">Select the file to import: </label>
+		
 			<input type="file" id="uploadmarc" name="uploadmarc" />
-		</td>
-	</tr>
-	<tr>
-		<th scope="row"><label for="filename">Name of this import: </label></th>
-		<td>
+		
+	</li>
+	<li>
+		<label for="filename">Name of this import: </label>
+		
 			<input type="text" id="filename" name="filename" />
-		</td>
-	</tr>
-	<tr>
-		<th scope="row"><label for="syntax">Character encoding: </label></th>
-		<td>
+		
+	</li>
+	<li>
+		<label for="syntax">Character encoding: </label>
+		
 			<select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
-		</td>
-	</tr>
-	<tr>
-		<th scope="row" rowspan="2">If ISBN is already in the reservoir: </th>
-		<td><input type="radio" name="overwrite_biblio" value="0" checked="checked" />Ignore this one, keep the existing one</td></tr>
-<tr><td>
-			<input type="radio" name="overwrite_biblio" value="1" />Overwrite the existing one with this</td>
-	</tr>
-</table><input type="submit" value="Import" />
+		
+	</li></ol></fieldset>
+	<fieldset class="rows">
+	<legend>If ISBN is already in the reservoir: </legend>
+	<ol>
+	<li class="radio">
+		<input type="radio" name="overwrite_biblio" id="keep" value="0" checked="checked" /> <label for="keep">Ignore this one, keep the existing one</label></li>
+<li class="radio">
+			<input type="radio" name="overwrite_biblio" id="overwrite" value="1" /> <label for="overwrite">Overwrite the existing one with this</label>
+	</li>
+</ol></fieldset><input type="submit" value="Import" />
 </form>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
index c146e8a70c..edc13b4f93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
@@ -58,8 +58,8 @@
     <fieldset>
     <legend>What do you want to do ?</legend>
         <p><input id="checkborrower" type="checkbox" name="checkbox" value="borrower" checked="checked" />
-        Delete borrower who has not borrowed since:
-        <input size="10" id="date1" name="filterdate1" value="<!-- TMPL_VAR NAME="filterdate1"-->" type="text" /></p>
+        <label for="checkborrower">Delete borrower who has not borrowed since:</label>
+        <input size="10" id="date1" name="filterdate1" value="<!-- TMPL_VAR NAME="filterdate1"-->" type="text" />
             <script type="text/javascript">
                 Calendar.setup(
                  {
@@ -67,12 +67,11 @@
                      ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                  }
                 );
-            </script>
+            </script></p>
         
-        <br />
         <p><input id="checkissue" type="checkbox" name="checkbox" value="issue" checked="checked" />
-        Anonymize issue history older than
-        <input size="10" id="date2" name="filterdate2" value="<!-- TMPL_VAR NAME="filterdate2"-->" type="text" /></p>
+        <label for="checkissue">Anonymize issue history older than</label>
+        <input size="10" id="date2" name="filterdate2" value="<!-- TMPL_VAR NAME="filterdate2"-->" type="text" />
             <script type="text/javascript">
                 Calendar.setup(
                  {
@@ -80,10 +79,9 @@
                      ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                  }
                 );
-            </script>
-            
-            <br />
-            <input type="submit" value="OK" />
+            </script></p>
+
+            <input type="submit" value="Submit" />
             
             <!-- hidden here -->
             <input type="hidden" name="step2" value="1" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
index a48c332c6e..53a1dd1161 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
@@ -19,21 +19,19 @@
 </p>
 
 <form method="post" action="/cgi-bin/koha/tools/export.pl">
-    <fieldset>
-    <legend>
-        Select Records to Export
-    </legend>
-        <p>
-            <label for="start">from biblio number</label>
+    <fieldset class="rows">
+    <legend> Select Records to Export </legend>
+        <ol><li>
+            <label for="start">From biblio number: </label>
             <input id="start" type="text" name="StartingBiblionumber" size="5" />
-        </p>
-        <p>
-            <label for="end">to biblio number :</label>
+        </li>
+        <li>
+            <label for="end">To biblio number: </label>
             <input id="end" type="text" name="EndingBiblionumber" size="5" />
-        </p>
+        </li>
         
-        <p>
-            <label for="itemtype" >Document type</label>
+        <li>
+            <label for="itemtype">Document type: </label>
             <select name="itemtype" id="itemtype">
                 <option value="">-- All --</option>
                 <!-- TMPL_LOOP NAME="itemtypeloop" -->
@@ -44,10 +42,10 @@
 <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
             </select>
-        </p>
+        </li>
         
-        <p>
-            <label for="branch">Library</label>
+        <li>
+            <label for="branch">Library: </label>
             <select id="branch" name="branch">
             <option value="">-- All --</option>
                 <!-- TMPL_LOOP name="branchloop" -->
@@ -57,45 +55,43 @@
 				<!-- /TMPL_IF -->
                     <!-- /TMPL_LOOP -->
                 </select>
-        </p>
-        <p>
-            <label for="startcn">from itemcallnumber</label>
+        </li>
+        <li>
+            <label for="startcn">From itemcallnumber: </label>
             <input id="startcn" type="text" name="start_callnumber" size="5" />
-        </p>
-        <p>
-            <label for="endcn">to itemcallnumber : </label>
+        </li>
+        <li>
+            <label for="endcn">To itemcallnumber: </label>
             <input id="endcn" type="text" name="end_callnumber" size="5" />
-        </p>
+        </li></ol>
     </fieldset>
-    <fieldset>
-    <legend>
-        Options
-    </legend>
-        <p>
+    <fieldset class="rows">
+    <legend> Options</legend>
+<ol>        <li>
         <label for="dont_export_item">Don't export items</label>
         <input id="dont_export_item" type="checkbox" name="dont_export_item" />
-        </p>
-        <p>
+        </li>
+        <li>
         <label for="dont_export_fields">Don't export fields</label>
         <input id="dont_export_fields" type="text" name="dont_export_fields" />
         <i>seperate by a blank. (e.g.: 100a 200 606)</i>
-        </p>
+        </li></ol>
     </fieldset>
-    <fieldset>
+    <fieldset class="rows">
     <legend>
         Output format
     </legend>
-        <p>
-            <label for="output_format">into </label>
+        <ol><li>
+            <label for="output_format">File format: </label>
             <select id="output_format" name="output_format">
                 <option value="marc">marc</option>
                 <option value="xml">xml</option>
             </select>
-            format.
-        </p>
-        <p>
-        <label for="filename">Filename:</label><input id="filename" type="text" name="filename" value="koha.mrc" />
-        </p>
+            
+        </li>
+        <li>
+        <label for="filename">File name:</label><input id="filename" type="text" name="filename" value="koha.mrc" />
+        </li></ol>
     </fieldset>
     <input type="hidden" name="op" value="export" />
     <input type="submit" value="Export" class="button" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl
index 3974865aa8..062f3c5b90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl
@@ -15,7 +15,6 @@
 	<div class="yui-b">
 
 <h1>MARC acquisition system</h1>
-<h4>Import into the reservoir</h4>
 
 <!-- TMPL_IF name="uploadmarc" -->
 <p>Import results :</p>
@@ -35,32 +34,34 @@
 	<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
 </ul>
 <form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
-<table>
-	<tr>
-		<th scope="row"><label for="uploadmarc">Select the file to import: </label></th>
-		<td>
+<fieldset class="rows">
+<legend>Import into the reservoir</legend><ol>
+	<li>
+		<label for="uploadmarc">Select the file to import: </label>
+		
 			<input type="file" id="uploadmarc" name="uploadmarc" /><br />
-		</td>
-	</tr>
-	<tr>
-		<th scope="row"><label for="filename">Name of this import: </label></th>
-		<td>
+		
+	</li>
+	<li>
+		<label for="filename">Name of this import: </label>
+		
 			<input type="text" id="filename" name="filename" />
-		</td>
-	</tr>
-	<tr>
-		<th scope="row"><label for="syntax">Character encoding: </label></th>
-		<td>
+		
+	</li>
+	<li>
+		<label for="syntax">Character encoding: </label>
+		
 			<select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
-		</td>
-	</tr>
-	<tr>
-		<th scope="row" rowspan="2">If ISBN is already in the reservoir: </th>
-		<td><input type="radio" id="overwrite_bibliono" name="overwrite_biblio" value="0" checked="checked" /><label for="overwrite_bibliono">Ignore this one, keep the existing one</label></td></tr>
-<tr><td>
-			<input type="radio" id="overwrite_biblioyes" name="overwrite_biblio" value="1" /><label for="overwrite_biblioyes">Overwrite the existing one with this</label></td>
-	</tr>
-</table><input type="submit" value="Import" />
+		
+	</li>
+</ol></fieldset>
+	<fieldset class="rows">
+	<legend>If ISBN is already in the reservoir:</legend><ol><li class="radio">
+		 
+		<input type="radio" id="overwrite_bibliono" name="overwrite_biblio" value="0" checked="checked" /><label for="overwrite_bibliono">Ignore this one, keep the existing one</label></li>
+<li class="radio">
+			<input type="radio" id="overwrite_biblioyes" name="overwrite_biblio" value="1" /><label for="overwrite_biblioyes">Overwrite the existing one with this</label>
+	</li></ol></fieldset><input type="submit" value="Import" />
 </form>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index a0c19cb6be..3828a643dc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -17,9 +17,9 @@
 
     <h1>Inventory/Stocktaking</h1>
     <form method="post" action="/cgi-bin/koha/tools/inventory.pl">
-        <fieldset>
+        <fieldset class="rows">
         <legend>Select items you want to check</legend>
-        <p>
+        <ol><li>
         <label for="branchloop">Branch</label><select id="branchloop" name="branchcode">
         <!-- TMPL_LOOP NAME="branchloop" -->
             <!-- TMPL_IF name="selected" -->
@@ -29,15 +29,15 @@
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
         </select>
-        </p>
-        <p>
-            <label for="minlocation">Item Location (items.itemcallnumber) between</label> 
-                <input type="text" name="minlocation" id="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" /> 
-            <label for="maxlocation">and</label> 
+        </li>
+        <li>
+            <label for="minlocation">Item location between: </label> 
+                <input type="text" name="minlocation" id="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" /> (items.itemcallnumber)  </li>
+           <li><label for="maxlocation">...and: </label> 
                 <input type="text" name="maxlocation" id="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
-        </p>
+        </li>
         <!-- TMPL_IF NAME="authorised_values" -->
-        <p>
+        <li>
             <label for="locationloop">Item Location (items.location) is</label> 
         <select id="locationloop" name="location">
                 <option value="">Filter location</option>
@@ -48,9 +48,9 @@
                 <option value="<!-- TMPL_VAR NAME='authorised_value' -->"><!-- TMPL_VAR NAME='lib' --></option>
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
-        </select>        </p>
+        </select>        </li>
         <!-- /TMPL_IF -->
-        <p><label for="datelastseen">Not seen since:</label>
+        <li><label for="datelastseen">Not seen since:</label>
             <input type="text" id="datelastseen" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
             <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="datelastseen_button" alt="Show Calendar" />
             <script type="text/javascript">
@@ -62,23 +62,22 @@
             }
             );
             </script>
-        </p>
-        <p><label for="pagesize">Show:</label>
-            <input type="text" id="pagesize" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5" />
-            <label for="offset"> items beginning at offset</label>
+        </li>
+        <li><label for="pagesize">Show: </label>
+            <input type="text" id="pagesize" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5" /> items</li>
+          <li><label for="offset">Beginning at offset: </label>
             <input type="text" id="offset" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5" />
-        </p>
-        <p>
+        </li></ol>
+  </fieldset>
             <input type="hidden" name="op" value="do_it" />
-            <input type="submit" value="OK" class="button" />
-        </p>
-        </fieldset>
+            <input type="submit" value="Submit" class="button" />
     </form>
     <form name="barcodefile" method="post" action="/cgi-bin/koha/tools/inventory.pl">
-        <fieldset>
+        <fieldset class="rows">
             <legend>Use a barcode file</legend>
-            <p><label for="uploadbarcodes">Barcode file name :</label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></p>
-            <p><label for="setdate">Set datelastseen to :</label> <input type="text" id="setdate" name="setdate" />
+			<ol>
+            <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
+            <li><label for="setdate">Set date last seen to :</label> <input type="text" id="setdate" name="setdate" />
              <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="setdate_button" alt="Show Calendar" />
             <script type="text/javascript">
             Calendar.setup(
@@ -89,9 +88,9 @@
             }
             );
             </script>
-</p>
-            <p><input type="submit" value="OK" class="button" /></p>
+</li></ol>
         </fieldset>
+            <p><input type="submit" value="Submit" class="button" /></p>
     </form>
     <!--TMPL_IF Name="Number" --><p><!--TMPL_VAR Name="Number"--> items modified : datelastseen set to <!--TMPL_VAR Name="date"--></p><!-- /TMPL_IF-->
     <!--TMPL_IF Name="errorfile" --><p class="error"><!--TMPL_VAR Name="errorfile"--> can't be opened</p><!-- /TMPL_IF-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
index 5f40e7e850..2569a73436 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -2,27 +2,28 @@
 <title>Koha &rsaquo; Tools &rsaquo; Koha News</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
+<!-- TMPL_UNLESS NAME="add_form" --><!-- TMPL_INCLUDE NAME="yui-toolbars.inc" --><!-- /TMPL_UNLESS -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/tools-home.pl">Tools</a> &rsaquo; Koha News</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/tools-home.pl">Tools</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/tools/koha-news.pl">Koha News</a> &rsaquo; Add News Item<!-- TMPL_ELSE -->Koha News<!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
-   
+<!-- TMPL_IF NAME="add_form" --><div id="doc" class="yui-t7"><!-- TMPL_ELSE --><div id="doc3" class="yui-t2"><!-- /TMPL_IF -->
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
+ 
+<!-- TMPL_UNLESS NAME="add_form" --><!-- TMPL_INCLUDE NAME="tools-news-toolbar.inc" --><!-- /TMPL_UNLESS -->
 
-
-<div id="koha-news_main" class="searchresults">
-    <h1> OPAC and Koha News</h1>
-    <!-- TMPL_IF name="add_form" -->
+<!-- TMPL_IF name="add_form" -->
         <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
             <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
             <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
-            <p>
+			<fieldset class="rows">
+			<legend>OPAC and Koha News</legend>
+           <ol> <li>
             <label for="lang">Language</label>
             <select id="lang" name="lang">
                 <option value="koha">Librarian interface</option>
@@ -30,12 +31,12 @@
                     <!-- TMPL_IF name="selected" --><option value="<!-- TMPL_VAR name="language" -->" selected="selected"><!-- TMPL_VAR name="language" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="language" -->"><!-- TMPL_VAR name="language" --></option><!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
             </select>
-            </p>
-            <p>
+            </li>
+            <li>
                 <label for="title">Title</label>
                 <input id="title" size="30" type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
-            </p>
-            <p>
+            </li>
+            <li>
                 <label for="expirationdate">Expiration date</label>
                 <input id="expirationdate" type="text" name="expirationdate" value="<!-- TMPL_VAR NAME="expirationdate" -->" />
                 <script type="text/javascript">
@@ -46,28 +47,27 @@
                     }
                     );
                 </script>
-            </p>
-            <p>
+            </li>
+            <li>
                 <label for="number">Appear in position </label>
                 <!-- TMPL_IF NAME="number"-->
                     <input id="number" size="3" name="number" type="text" checked="checked" />
                 <!-- TMPL_ELSE -->
                     <input id="number" size="3" name="number" type="text" />
                 <!-- /TMPL_IF -->
-            </p>
-            <p>News</p>
-            <textarea name="new" cols="75" rows="10"><!-- TMPL_VAR NAME="new" --></textarea>
-            <p>
+            </li>
+            <li><label for="new">News</label>
+            <textarea name="new" id="new"  cols="75" rows="10"><!-- TMPL_VAR NAME="new" --></textarea></li>
+            </ol>
+			</fieldset>
+  
                 <input class="button" type="submit" value="Save" />
                 <input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/tools/opac-news.pl'" />
-            </p>
         </form>
-		</div>
     <!-- TMPL_ELSE -->
-        <div id="koha-news_filter">
-            <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" />
-            <label>Language</label>
-            <select name="lang">
+        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl">
+            <label for="lang">Language</label>
+            <select name="lang" id="lang">
             <option value="">All</option>
             <option value="koha">Librarian interface</option>
                 <!-- TMPL_LOOP name="lang_list" -->
@@ -82,10 +82,8 @@
             </select>
             <input type="submit" class="button" value="Filter" />
             </form>
-        </div>
         <!-- TMPL_IF NAME="opac_news_count" -->
-        <div id="koha-news_list">
-            <form name="del_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" onsubmit="return confirm('Are you sure you want to delete the selected news?')">
+        <form name="del_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" onsubmit="return confirm('Are you sure you want to delete the selected news?')">
                 <table>
                     <tr>
                         <th>&nbsp;</th>
@@ -121,21 +119,14 @@
                 <input type="hidden" name="op" value="del" />
                 <input type="submit" class="button" value="Delete selected" />
             </form>
-			</div>
         <!-- TMPL_ELSE -->
             <p>No news loaded</p>
         <!-- /TMPL_IF -->
-        <div id="action">
-          <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">Add news</a>
-        </div>
-		</div>
     <!-- /TMPL_IF -->
-
-
 </div>
 </div>
-<div class="yui-b">
+<!-- TMPL_UNLESS NAME="add_form" --><div class="yui-b">
 <!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
-</div>
+</div><!-- /TMPL_UNLESS -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
index 0e8c8a6d1e..3e50846cf3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -1,23 +1,24 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Tools &rsaquo; Notices<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF name="modify" --> &rsaquo; Modify notice<!-- TMPL_ELSE --> &rsaquo; Add notice<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> &rsaquo; Notice added<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> &rsaquo; Confirm Deletion<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <!-- TMPL_IF NAME="add_form" -->
 	<script type="text/javascript">
 	//<![CDATA[
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
 		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)) {
@@ -28,14 +29,14 @@
 		}
 		return true;
 		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
 		function isDate(f) {
 			var t = Date.parse(f.value);
 			if (isNaN(t)) {
 				return false;
 			}
 		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
 		function Check(f) {
 			var ok=1;
 			var _alertString="";
@@ -94,24 +95,25 @@
 		</script>
 	<!-- /TMPL_IF -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="letters-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/tools-home.pl">Tools</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF name="modify" --><a href="/cgi-bin/koha/tools/letter.pl">Noticess</a> &rsaquo; Modify notice<!-- TMPL_ELSE --> <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Add notice<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Notice added<!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Confirm Deletion<!-- TMPL_ELSE -->Notices<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
+<!-- TMPL_IF NAME="add_form" --><div id="doc" class="yui-t7"><!-- TMPL_ELSE --><div id="doc3" class="yui-t2"><!-- /TMPL_IF -->
    
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
 
 	<!-- TMPL_IF NAME="else" -->
+<!-- TMPL_INCLUDE NAME="tools-notices-toolbar.inc" -->
 		
 		<!-- TMPL_IF NAME="search" -->
-		<br />You Searched for <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br />
+		<p>You Searched for <b><!-- TMPL_VAR NAME="searchfield" --></b></p>
 		<!-- /TMPL_IF -->
-		<table>
+		<!-- TMPL_IF NAME="letter" --><table>
 		<tr>
 			<th>Module</th>
 			<th>Code</th>
@@ -133,26 +135,21 @@
 			</tr>
 		<!-- /TMPL_LOOP -->
 		</table>
-		<form action="/cgi-bin/koha/tools/letter.pl" method="post">
-			<input type="hidden" name="op" value="add_form" />
-			<p>
-			<input type="submit" class="button" value="Add Notice" title="Add Notice" alt="Add Notice" />
-			</p>
-		</form>
+		<!-- /TMPL_IF -->
+
 	<!-- /TMPL_IF -->
 	
 	<!-- TMPL_IF NAME="add_form" -->
 	
-	<!-- TMPL_IF name="modify" -->
-			<h2>Modify letter</h2>
-		<!-- TMPL_ELSE -->
-			<h2>Add letter</h2>
-		<!-- /TMPL_IF -->
+	
 		<form action="/cgi-bin/koha/tools/letter.pl" name="Aform" method="post">
 		<input type="hidden" name="op" value="add_validate" />
 		<input type="hidden" name="checked" value="0" />
+		<fieldset class="rows">
+		<legend><!-- TMPL_IF name="modify" -->Modify letter<!-- TMPL_ELSE -->Add letter<!-- /TMPL_IF --></legend>
+		<ol>
 		<!-- TMPL_IF NAME="modify" -->
-			<p>
+			<li>
 				<label for="module">Koha module:</label>
 				<select name="module" id="module">
                                     <!--TMPL_IF Name="catalogue"-->
@@ -186,14 +183,14 @@
                                     <option value="members">Members</option>
                                     <!--/TMPL_IF-->
 				</select>
-			</p>
-			<p>
-				<label for="code">Code:</label><input type="hidden" id="code" name="code" value="<!-- TMPL_VAR NAME="code" -->" /><!-- TMPL_VAR NAME="code" -->
-			</p>
+			</li>
+			<li>
+				<span class="label">Code:</span><input type="hidden" id="code" name="code" value="<!-- TMPL_VAR NAME="code" -->" /><!-- TMPL_VAR NAME="code" -->
+			</li>
 		<!-- /TMPL_IF -->
 		
 		<!-- TMPL_IF NAME="adding" -->
-			<p>
+			<li>
 				<label for="module">Koha module:</label>
 				<select name="module" id="module" onchange="javascript:window.location.href = unescape(window.location.pathname)+'?op=add_form&amp;module='+this.value+'&amp;content='+window.document.forms['Aform'].elements['content'].value;">
 						<!--TMPL_IF Name="catalogue"-->
@@ -227,31 +224,33 @@
 						<option value="members">Members</option>
 						<!--/TMPL_IF-->
 				</select>
-			</p>
-			<p>
+			</li>
+			<li>
 				<label for="code">Code:</label><input type="text" id="code" name="code" size="20" maxlength="20" />
-			</p>
+			</li>
 		<!-- /TMPL_IF -->
 		
-		<p>
+		<li>
 			<label for="name">Name:</label><input type="text" id="name" name="name" size="60" value="<!-- TMPL_VAR NAME="name" -->" />
-		</p>
-		<p>
-			<label for="title">Title (mail subject):</label><input type="text" id="title" name="title" size="60" value="<!-- TMPL_VAR NAME="title" -->" />
-		</p>
-		<p>
-			<label for="SQLfieldname">Content (mail content):</label>
-		</p>
-		<p>		
+		</li>
+		<li>
+			<label for="title">Message Subject:</label><input type="text" id="title" name="title" size="60" value="<!-- TMPL_VAR NAME="title" -->" />
+		</li>
+		<li>
+			<label for="SQLfieldname">Message Body:</label>
+		</li>
+		<li>		
 		<select name="SQLfieldname" id="SQLfieldname" size="9">
 			<!-- TMPL_LOOP name="SQLfieldname" -->
 				<option value="<!-- TMPL_VAR name="value"-->"><!-- TMPL_VAR name="text"--></option>
 			<!-- /TMPL_LOOP -->
 		</select>
         <input type="button" name="insert" value="&gt;&gt;" onclick="insertValueQuery()" title="Insert" />
-        <textarea name="content" cols="100" rows="15"><!-- TMPL_VAR NAME="content" --></textarea>
-		</p>
-		<p><input type="button" value="OK" onclick="Check(this.form)" class="button" /></p>
+        <textarea name="content" cols="80" rows="15"><!-- TMPL_VAR NAME="content" --></textarea>
+		</li>
+		</ol>
+		</fieldset>
+		<p><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></p>
 		</form>
 	<!-- /TMPL_IF -->
 	
@@ -300,8 +299,8 @@
 
 </div>
 </div>
-<div class="yui-b">
+<!-- TMPL_UNLESS NAME="add_form" --><div class="yui-b">
 <!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
-</div>
+</div><!-- /TMPL_UNLESS -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.20.1