From c3ac60db88556aa4a6f9dbfc7d01034e0bc698f9 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 14 Sep 2007 15:24:39 -0500
Subject: [PATCH] More template cleanup, resident search forms, breadcrumbs
 menus

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 .../prog/en/css/staff-global.css              |  6 ++-
 .../prog/en/includes/cataloging-search.inc    | 25 +++++++++++
 .../prog/en/includes/label-status.inc         |  6 +--
 .../prog/en/includes/labels-menu.inc          |  5 +++
 .../prog/en/includes/tools-menu.inc           | 15 +++++++
 .../prog/en/modules/catalogue/detail.tmpl     |  2 +-
 .../prog/en/modules/cataloguing/addbooks.tmpl | 23 ++++------
 .../en/modules/labels/label-bib-search.tmpl   |  3 --
 .../modules/labels/label-create-layout.tmpl   | 43 ++++++++++---------
 .../modules/labels/label-create-template.tmpl | 11 +++--
 .../en/modules/labels/label-edit-layout.tmpl  | 12 ++++--
 .../modules/labels/label-edit-template.tmpl   | 22 +++++-----
 .../prog/en/modules/labels/label-home.tmpl    | 28 ++++++------
 .../prog/en/modules/labels/label-manager.tmpl | 19 ++++----
 .../en/modules/labels/label-templates.tmpl    | 11 +++--
 .../en/modules/reviews/reviewswaiting.tmpl    | 11 ++---
 .../en/modules/suggestion/acceptorreject.tmpl | 13 +++---
 .../prog/en/modules/tools/breeding.tmpl       | 14 +++---
 .../prog/en/modules/tools/cleanborrowers.tmpl | 43 +++++++++----------
 .../prog/en/modules/tools/export.tmpl         | 23 +++++-----
 .../prog/en/modules/tools/holidays.tmpl       |  1 -
 .../prog/en/modules/tools/import.tmpl         | 10 ++---
 .../prog/en/modules/tools/inventory.tmpl      |  8 ++--
 .../prog/en/modules/tools/itemslost.tmpl      | 10 ++---
 .../prog/en/modules/tools/koha-news.tmpl      | 10 ++---
 .../prog/en/modules/tools/letter.tmpl         | 10 ++---
 .../prog/en/modules/tools/overduerules.tmpl   | 10 ++---
 .../prog/en/modules/tools/tools-home.tmpl     | 10 ++---
 .../prog/en/modules/tools/viewlog.tmpl        | 10 ++---
 29 files changed, 233 insertions(+), 181 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 7b81c50ca4..c3775c83df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -46,6 +46,10 @@ h6 {
 	font-weight : bold;
 }
 
+p {
+	margin: .5em 0 .5em 0;
+}
+
 strong {
 	font-weight : bold;
 }
@@ -254,7 +258,7 @@ div#header_search ul.link-tabs li.off a {
 	padding : 0.1em .5em .2em .5em;
 }
 
-div#circ_search,div#catalog_search,div#patron_search,div#subscription_search {
+div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search {
 	border : 0;
 	border-bottom : 1px solid #FF9900;
 	padding : 0 0 .2em 0;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
new file mode 100644
index 0000000000..9fee1fdb99
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -0,0 +1,25 @@
+<!-- Begin Circulation Resident Search Box -->
+<div id="header_search">
+<div id="addbooks_search">
+	<p class="tip">Search the catalog:</p>
+	<form name="search" action="addbooks.pl">
+        <input type="text" name="q"  size="40" class="focus" />
+        <input type="submit" value="Search" />
+	</form>
+</div>
+	<div id="circ_search">
+	<p class="tip">Enter patron card number or partial name:</p>
+	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+			<label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+	<input name="branch" value="CPL" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+	<input value="Submit" type="submit" />
+	</form>
+	</div>	
+			<ul>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#addbooks_search">Search the Catalog</a></li>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			</ul>	
+</div>
+<!-- End Circulation Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
index 88d85edfcb..6cce2e5073 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
@@ -1,7 +1,7 @@
 <div class="details" style="width: 43%">
 <table>
-<tr><th>Layout:</th><td><!-- TMPL_IF NAME="active_layout_name" --><!-- TMPL_VAR NAME="active_layout_name" --><!-- TMPL_ELSE --><span class="error">Select a Label Layout</span><!-- /TMPL_IF --> </td></tr>
-<tr><th>Template: </th><td><!-- TMPL_IF NAME="active_template_name" --><!-- TMPL_VAR NAME="active_template_name" --><!-- TMPL_ELSE --><span class="error">Select a Label Template</span><!-- /TMPL_IF --> </td></tr>
-<tr><th>Batch: </th><td><!-- TMPL_IF NAME="batch_id" --><!-- TMPL_VAR NAME="batch_id" --><!-- TMPL_ELSE --><span class="error">Select items to print</span><!-- /TMPL_IF --> </td></tr>
+<tr><th>Layout:</th><td><!-- TMPL_IF NAME="active_layout_name" --><!-- TMPL_VAR NAME="active_layout_name" --><!-- TMPL_ELSE --><span class="error">No Layout Specified: Select a Label Layout</span><!-- /TMPL_IF --> </td></tr>
+<tr><th>Template: </th><td><!-- TMPL_IF NAME="active_template_name" --><!-- TMPL_VAR NAME="active_template_name" --><!-- TMPL_ELSE --><span class="error">No Template Specified: Select a Label Template</span><!-- /TMPL_IF --> </td></tr>
+<tr><th>Batch: </th><td><!-- TMPL_IF NAME="batch_id" --><!-- TMPL_VAR NAME="batch_id" --><!-- TMPL_ELSE --><span class="error">No Batch Specified: Select items to print</span><!-- /TMPL_IF --> </td></tr>
 </table>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
new file mode 100644
index 0000000000..08b4508eea
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
@@ -0,0 +1,5 @@
+<ul>
+	<li><a href="/cgi-bin/koha/labels/label-home.pl">Label Layouts</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-templates.pl">Label Templates</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-manager.pl">Create or Print Label Batches</a></li>
+</ul>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
new file mode 100644
index 0000000000..a6a3ffbaac
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -0,0 +1,15 @@
+<ul>
+	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools Home</a></li>
+	<li><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></li>
+	<li><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></li>
+	<li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></li>
+	<li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean borrowers</a></li>
+	<li><a href="/cgi-bin/koha/tools/itemslost.pl">Items lost</a></li>
+	<li><a href="/cgi-bin/koha/tools/export.pl">Export</a></li>
+	<li><a href="/cgi-bin/koha/tools/import.pl">Import</a></li>
+	<li><a href="/cgi-bin/koha/tools/letter.pl">Letters</a></li>
+	<li><a href="/cgi-bin/koha/tools/breeding.pl">Reservoir</a></li>
+	<li><a href="/cgi-bin/koha/labels/labels-home.pl">Labels</a></li>
+	<li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue Rules</a></li>
+	<li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
+</ul>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 02a8d6b5fc..1f96b33bf4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -232,7 +232,7 @@ function confirm_deletion(count) {
 </div>
 </div>
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 8958c5eef2..7bef6899fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -1,10 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloguing</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript">
+	$(document).ready(function() {
+	$('#header_search').tabs();
+ });
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
+<!-- TMPL_INCLUDE NAME="cataloging-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Cataloguing</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -12,28 +19,16 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-	<h1>Koha &rsaquo; Catalogue Maintenance</h1>
 	<!-- TMPL_IF name="noitemsfound" -->
 		No items found
 	<!-- /TMPL_IF -->
 	
-<h3>Search Existing Records</h3>
-<div id="addbooks_search">
-	<form name="search" action="addbooks.pl">
-		<p>
-        <label for="q">Search the catalog: </label>
-        <input id="q" type="text"  size="25" name="q" class="focus" />
-        <input type="submit" value="Search" />
-        </p>
-	</form>
-</div>
 <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 -->
-		<br />
 		<form name="f" action="addbiblio.pl" method="post">
 		<h3>Create a Blank Bibliographic Record</h3>
 		<p>
@@ -56,7 +51,6 @@
 <!-- display the search results -->
 
 <!-- TMPL_IF NAME="total"-->
-<br />
 <!-- TMPL_VAR NAME="total"--> Results found in catalogue.
 <!-- TMPL_VAR name='pagination_bar'-->
 <div class="searchresults">
@@ -170,5 +164,4 @@
 </div>
 </div>
 </div>
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl
index cf8ca21ac2..44260ddd26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl
@@ -31,8 +31,5 @@
 	</div>
 </form>
 </div>
-</div>
-</div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 0b9903ff49..abbedcc647 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
@@ -1,28 +1,30 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels &rsaquo; Create Layout</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-labels.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/labels/label-home.pl">Labels</a> &rsaquo; Create Layout</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 <form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
 
-<h3>Layout Name</h3>
-<input type="textbox" name="layoutname"  size="20" value="<!-- TMPL_VAR NAME="layoutname" -->" />
+<p><label for="layoutname">Layout Name</label>
+<input type="textbox" name="layoutname" id="layoutname" size="20" value="<!-- TMPL_VAR NAME="layoutname" -->" /></p>
 
-<h3>Choose Order Of Fields to Print</h3>
+<p><label for="tx_title">Choose Order Of Fields to Print</label></p>
 
 <table summary="fields to print">
 <tr>
         <td>
-        <select name="tx_title">
+        <select name="tx_title" id="tx_title">
         <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -213,18 +215,18 @@
   </tr>
 </table>
 
-<h3>Choose Barcode Type</h3>
-<select name="barcodetype">
+<p><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>
 	<!-- TMPL_ELSE -->
         <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
 		<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
-</select>
+</select></p>
 
-<h3>Choose Layout Type</h3>
-<select name="printingtype">
+<p><label for="printingtype">Choose Layout Type</label>
+<select name="printingtype" id="printingtype">
     <!-- TMPL_LOOP NAME="printingtypes" -->
 	<!-- TMPL_IF NAME="active" -->
         <option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="desc" --></option>
@@ -232,19 +234,20 @@
         <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
 	<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
-</select>
-
-<h3>Start printing from Label number:<input type="textbox" name="startlabel"  size="2" value="1" /></h3>
+</select></p>
+<p>
+<label for="name="startlabel">Start printing from Label number:<input type="textbox" name="startlabel" id="startlabel" size="2" value="1" /></label></p>
 
 
-<h3>Draw Guide Boxes<input type="checkbox" name="guidebox" value="1" /></h3>
-        <input type="submit" value="Submit" />
-		<input type="hidden" name="op" value="add_layout" />
+<p><label for="guidebox">Draw Guide Boxes<input type="checkbox" id="guidebox" name="guidebox" value="1" /></label></p>
+<p>		<input type="hidden" name="op" value="add_layout" />
+        <input type="submit" value="Submit" /></p>
 </form>
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 e2d517c1c8..b89dccc94f 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
@@ -3,13 +3,15 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <form name="input" action="/cgi-bin/koha/labels/label-create-template.pl" method="get">
 
@@ -60,7 +62,8 @@ Active: <input type="checkbox" name="active" />
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
index 01d41ccf9c..86ad6c77d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
@@ -3,13 +3,15 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
 
@@ -251,9 +253,11 @@
         <input type="hidden" name="layout_id" value="<!-- TMPL_VAR NAME="layout_id" -->" />
 </p>
 </form>
+
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
index f5b922b527..7b78193dfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
@@ -3,24 +3,27 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <form name="input" action="/cgi-bin/koha/labels/label-save-template.pl" method="get">
 
 <h3>Edit Label Template</h3>
 
 <h3>Template Settings</h3>
-<table>
 
-Template ID: <!-- TMPL_VAR NAME="tmpl_id" --> <br />
+<p>Template ID: <!-- TMPL_VAR NAME="tmpl_id" --> <br />
 Template Code: <input type="text"  size="40" name="tmpl_code" value="<!-- TMPL_VAR NAME="tmpl_code" -->" /><br />
-Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc"><!-- TMPL_VAR NAME="tmpl_desc" --></textarea><br />
+Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc"><!-- TMPL_VAR NAME="tmpl_desc" --></textarea><br /></p>
+
+<table>
 
 <tr>
         <td>Page Width:</td><td><input type="text"  size="4" name="page_width"  value="<!-- TMPL_VAR NAME="page_width" -->" /></td>
@@ -42,8 +45,6 @@ Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_d
         <td>Gap between Columns:</td><td><input type="text" size="4" name="colgap"  value="<!-- TMPL_VAR NAME="colgap" -->" /></td>
         <td>Gap between Rows:</td><td><input type="text" size="4" name="rowgap"  value="<!-- TMPL_VAR NAME="rowgap" -->" /></td>
 
-
-
 </tr>
 </table>
 
@@ -66,15 +67,16 @@ Active:
 <input type="checkbox" name="active" />
 <!-- /TMPL_IF -->
         <input type="hidden" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->" />
-<p>
 <p>
         <input type="submit" value="Save" />
         <input type="reset" value="Reset" />
 </p>
 </form>
+
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 31c1b2ef69..b85f93b022 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
@@ -3,13 +3,15 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
@@ -42,19 +44,18 @@
         <td>
                 <a href="/cgi-bin/koha/label-home.pl?op=delete_layout&layout_id=<!-- TMPL_VAR NAME="id"-->">Delete</a>
         </td>
-<td>
-<input type="radio" name="layout_id" value="<!-- TMPL_VAR NAME="id" -->"  
-                <!-- TMPL_IF NAME="active" -->
- checked
-                <!-- /TMPL_IF -->
- >
+<td> <!-- TMPL_IF NAME="active" -->
+<input type="radio" name="layout_id" value="<!-- TMPL_VAR NAME="id" -->" checked="checked" />
+<!-- TMPL_ELSE -->
+<input type="radio" name="layout_id" value="<!-- TMPL_VAR NAME="id" -->" />
+<!-- /TMPL_IF -->
         </td>
 </tr>
 
 <!-- /TMPL_LOOP -->
-<tr><td colspan="7" align="right">
-     <input type="submit" value="Set Active Layout">
-        <input type="hidden" name=op value="set_active_layout">
+<tr><td colspan="7">
+     <input type="submit" value="Set Active Layout" />
+        <input type="hidden" name=op value="set_active_layout" />
 </table>
 </form>
 <!-- /TMPL_IF -->
@@ -62,7 +63,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 9276d3f364..d3beaf7851 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
@@ -8,13 +8,15 @@ function Plugin(batch_id) {
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
@@ -107,13 +109,8 @@ function Plugin(batch_id) {
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
-
-
-
-
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 a4574cd103..bbf989808e 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
@@ -3,13 +3,15 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
@@ -61,7 +63,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
index dd15f9b770..76d96b9d6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
@@ -4,13 +4,15 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-reviews.inc" -->
+<!--TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Reviews Waiting for Approval</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>Reviews</h1>
 
@@ -43,8 +45,8 @@
             <!-- TMPL_VAR NAME="review" -->
         </td>
         <td>
-            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=<!-- TMPL_VAR NAME="reviewid" -->">Approve</a> |
-            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=<!-- TMPL_VAR NAME="reviewid" -->">Delete</a>
+            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&amp;reviewid=<!-- TMPL_VAR NAME="reviewid" -->">Approve</a> |
+            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&amp;reviewid=<!-- TMPL_VAR NAME="reviewid" -->">Delete</a>
         </td>
     </tr>
     <!-- /TMPL_LOOP -->
@@ -57,5 +59,4 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
index 8f547de1a4..a2563305ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Suggestion Management</title>
+<title>Koha &rsaquo; Suggestions Management</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/JavaScript">
  // <![CDATA[
@@ -42,14 +42,15 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Suggestions Management</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
     <h1>Suggestions Management</h1>
     
@@ -63,7 +64,7 @@
     <!-- TMPL_IF NAME="suggestions_loop" -->
     <b>Waiting suggestion,</b> accept or reject these suggestions with a reason.
     <form name="f" method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
-    <input type="hidden" name="op" value="aorr_confirm">
+    <input type="hidden" name="op" value="aorr_confirm" />
     <table>
         <tr>
             <th>Status</th>
@@ -113,7 +114,7 @@
             </tr>
         <!-- /TMPL_LOOP -->
         </table>
-        <input type="submit" value="Change Status">
+        <input type="submit" value="Change Status" />
 </form>
 <!-- TMPL_ELSE -->
     <b>No waiting suggestion to accept or reject.</b>
@@ -196,6 +197,4 @@
 </div>
 </div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 23ae7f546f..7e3cd21f60 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl
@@ -1,17 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Cataloging &rsaquo; MARC Import</title>
+<title>Koha &rsaquo; Tools &rsaquo; MARC Import</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>  &rsaquo; Marc Import</i></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>MARC acquisition system</h1>
 <h4>Import into the reservoir</h4>
@@ -38,7 +39,7 @@
 	<tr>
 		<th scope="row"><label for="uploadmarc">Select the file to import: </label></th>
 		<td>
-			<input type="file" id="uploadmarc" name="uploadmarc" /><br />
+			<input type="file" id="uploadmarc" name="uploadmarc" />
 		</td>
 	</tr>
 	<tr>
@@ -65,7 +66,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 b81a6e5856..4fff318006 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
@@ -1,13 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Tools &rsaquo; Clean Borrowers</title>
+<title>Koha &rsaquo; Tools &rsaquo; Clean Patron Records</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
-<!-- End of additions --><!-- Additions to enable Calendar system -->
-<script type="text/javascript" src="<!-- TMPL_VAR name='themelang' -->/lib/calendar/calendar.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name='themelang' -->/lib/calendar/calendar-en.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name='themelang' -->/lib/calendar/calendar-setup.js"></script>
-<!-- End of additions -->
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <script type="text/javascript" language="JavaScript">
 // <![CDATA[
         /**
@@ -45,16 +39,17 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>  &rsaquo; Clean Patron Records</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
-<h1>Delete some old borrowers/Anonymize some issue history</h1>
+<h1>Delete some old patrons/Anonymize some issue history</h1>
 
 <!-- TMPL_IF NAME="step1" -->
 <!-- step 1 START -->
@@ -88,10 +83,11 @@
             </script>
             
             <br />
-            <input type="submit" value=" OK " style="float:right;" />
+            <input type="submit" value="OK" />
             
             <!-- hidden here -->
             <input type="hidden" name="step2" value="1" />
+			</fieldset>
     </form>
 </div>
 <!-- step 1 END -->
@@ -103,7 +99,7 @@
     <fieldset>
         <legend>Warnings</legend>
         <b>
-        <!-- TMPL_IF NAME="totalToDelete" --><!-- TMPL_VAR NAME="totalToDelete" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> borrowers will be deleted.
+        <!-- TMPL_IF NAME="totalToDelete" --><!-- TMPL_VAR NAME="totalToDelete" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> patrons will be deleted.
         <br />
         <!-- TMPL_IF NAME="totalToAnonymize" --><!-- TMPL_VAR NAME="totalToAnonymize" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> issue history will be anonymized.
 
@@ -111,23 +107,23 @@
         <br />
         <form name="f2" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post" onsubmit="return checkForm2(this);">
             <!-- TMPL_IF NAME="totalToDelete" -->
-                What do you want to do for deleted members ?<br />
-                <label for="delete">Delete completly theses members</label>
+                What do you want to do for deleted patrons ?<br />
+                <label for="delete">Delete completly theses patrons</label>
                 <input id="delete" type="radio" name="radio" value="delete" checked="checked" />
                 
-                <label for="trash">Move to trash theses members</label>
+                <label for="trash">Move to trash theses patrons</label>
                 <input id="trash" type="radio" name="radio" value="trash" />
                 <input type="hidden" name="do_delete" value="<!-- TMPL_VAR NAME="totalToDelete" -->" />
                 <br />
             <!-- /TMPL_IF -->
             <!--TMPL_IF NAME="totalToAnonymize"-->
                 <br />
-                Are you sure you want to anonymize issue history for <!-- TMPL_VAR NAME="totalToAnonymize"--> borrowers ?
+                Are you sure you want to anonymize issue history for <!-- TMPL_VAR NAME="totalToAnonymize"--> patrons ?
                 <input type="hidden" name="do_anonym" value="<!-- TMPL_VAR NAME="totalToAnonymize" -->" />
             <!-- /TMPL_IF -->
             <br /><br />
             <a href="JavaScript:back();" title="go back">Cancel</a>
-            <input type="submit" value=" OK " style="float:right;" />
+            <input type="submit" value=" OK " />
             
             <input type="hidden" name="step3" value="1" />
             <input type="hidden" name="filterdate1" value="<!-- TMPL_VAR NAME="filterdate1" -->" />
@@ -145,13 +141,13 @@
           <b>
           <!-- TMPL_IF NAME="do_delete" -->
                 <!-- TMPL_IF NAME="trash" -->
-                    <!-- TMPL_VAR NAME="TotalDel" --> borrowers have been successfuly moved to trash.
+                    <!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfuly moved to trash.
                 <!-- TMPL_ELSE -->
-                    <!-- TMPL_VAR NAME="TotalDel" --> borrowers have been successfuly deleted.
+                    <!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfuly deleted.
                 <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="do_anonym" -->
-                All user which issue's history older than <!-- TMPL_VAR NAME="filterdate1" --> has been anonimized.
+                All patrons whose issue history older than <!-- TMPL_VAR NAME="filterdate1" --> has been anonimized.
             <!-- /TMPL_IF -->
           </b>
     </div>
@@ -161,7 +157,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 d42dea656f..eeed23c3f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
@@ -1,19 +1,19 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; MARC biblio export</title>
+<title>Koha &rsaquo; MARC Export</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; MARC Export</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
-<h1>Select biblios to export</h1>
 <p>
     <b>Note : The items are exported by this tool unless specified.</b>
 </p>
@@ -21,20 +21,20 @@
 <form method="post" action="/cgi-bin/koha/tools/export.pl">
     <fieldset>
     <legend>
-        Records
+        Select Records to Export
     </legend>
         <p>
             <label for="start">from biblio number</label>
             <input id="start" type="text" name="StartingBiblionumber" size="5" />
-        <p>
         </p>
+        <p>
             <label for="end">to biblio number :</label>
             <input id="end" type="text" name="EndingBiblionumber" size="5" />
         </p>
         
         <p>
-            <label for="itemtypes" >Document type</label>
-            <select name="itemtype">
+            <label for="itemtype" >Document type</label>
+            <select name="itemtype" id="itemtype">
                 <option value="">-- All --</option>
                 <!-- TMPL_LOOP NAME="itemtypeloop" -->
 				<!-- TMPL_IF name="selected" -->
@@ -94,7 +94,7 @@
             format.
         </p>
         <p>
-        <label for="filename">Filename:</label><input id="filename" tyle=text" name="filename" value="koha.mrc" />
+        <label for="filename">Filename:</label><input id="filename" type="text" name="filename" value="koha.mrc" />
         </p>
     </fieldset>
     <input type="hidden" name="op" value="export" />
@@ -103,7 +103,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
index 9405774802..37b2750836 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
@@ -4,7 +4,6 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
 <!-- ******************************** FLAT PANELS ******************************************* -->
 <!-- *****           Makes all the flat panel to deal with holidays                     ***** -->
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 8bc50cee7e..0d26d43ed3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl
@@ -4,13 +4,12 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
-
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>MARC acquisition system</h1>
 <h4>Import into the reservoir</h4>
@@ -64,7 +63,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 cf74e93ce5..30bcec5bb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -17,7 +17,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
     <h1>Inventory/Stocktaking</h1>
     <form method="post">
@@ -173,8 +173,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
index 6e7ec18d2e..5625d8ce94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
@@ -4,14 +4,13 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>Items lost</h1>
 
@@ -130,7 +129,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 cf08ea553a..809222db96 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
@@ -11,14 +11,13 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
-
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 <div id="koha-news_main" class="searchresults">
@@ -149,7 +148,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- 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 bb99ed0ca7..47932582d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -4,14 +4,13 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 	<!-- TMPL_IF NAME="else" -->
 		<form action="/cgi-bin/koha/tools/letter.pl" method="post">
@@ -304,7 +303,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
index 2e3c8d5d49..82cc5c2cfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
@@ -4,14 +4,13 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 	<h1>Defining <!-- TMPL_IF NAME="branch" -->overdue actions for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default overdue actions<!-- /TMPL_IF --></h1>
 	<div class="help">
@@ -173,7 +172,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
index 992d36d210..b70566b447 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
@@ -4,14 +4,13 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>Koha tools</h1>
 
@@ -65,7 +64,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
index 52f07461bc..2f9e23195c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
@@ -11,16 +11,15 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
 
 
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
-
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>Browse system logs</h1>
 
@@ -204,7 +203,8 @@
     </table>
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.39.5