From 1eb4513d43c493484259719661b180f1174d9a04 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Sat, 20 Oct 2007 16:42:06 -0500
Subject: [PATCH] Standardizing YUI toolbar

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/css/staff-global.css              |  6 +-
 .../prog/en/includes/acquisitions-toolbar.inc | 34 +++++--
 .../prog/en/includes/authorities-toolbar.inc  | 34 ++++++-
 .../prog/en/includes/cat-toolbar.inc          | 49 +++++++++-
 .../prog/en/includes/circ-toolbar.inc         | 84 +++++++++++++---
 .../prog/en/includes/members-menu.inc         | 11 +--
 .../prog/en/includes/yui-toolbars.inc         | 12 +++
 .../prog/en/modules/acqui/acqui-home.tmpl     |  3 +-
 .../prog/en/modules/acqui/booksellers.tmpl    | 10 +-
 .../prog/en/modules/acqui/supplier.tmpl       |  7 +-
 .../modules/authorities/authorities-home.tmpl |  5 +-
 .../en/modules/authorities/authorities.tmpl   |  6 +-
 .../authorities/searchresultlist-auth.tmpl    |  7 +-
 .../modules/authorities/searchresultlist.tmpl | 96 +++++++++++++++----
 .../prog/en/modules/catalogue/ISBDdetail.tmpl |  3 +-
 .../prog/en/modules/catalogue/MARCdetail.tmpl |  3 +-
 .../prog/en/modules/catalogue/detail.tmpl     | 57 +----------
 .../prog/en/modules/catalogue/moredetail.tmpl |  3 +-
 .../prog/en/modules/circ/circulation.tmpl     | 16 ++--
 .../en/modules/circ/selectbranchprinter.tmpl  | 23 ++---
 .../prog/en/modules/members/moremember.tmpl   |  3 +-
 21 files changed, 316 insertions(+), 156 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.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 dc6ca1fed2..ba830d54c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1,4 +1,4 @@
-@import url( /intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css) all;
+@import url("/intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css");
 
 a, a:link, a:visited, a:active {
 	color : #0000CC;
@@ -718,14 +718,14 @@ fieldset.rows .inputnote {
     visibility:visible; /* you propably don't need to change this one */
     display:block;
 }
-#addbiblio a {
+#addbiblio a, #addchild a {
 	padding-left : 34px;
 	background-image: url("/intranet-tmpl/prog/img/toolbar-new.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
-#deletebiblio a {
+#deletebiblio a, #deletepatron a {
 	padding-left : 34px;
 	background-image: url("/intranet-tmpl/prog/img/toolbar-delete.gif");
 	background-position : center left;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
index 8be2bd4c5a..2af4b5d201 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
@@ -1,12 +1,32 @@
-<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("newsupplier");
+	    <!-- TMPL_IF NAME="id" -->new YAHOO.widget.Button("neworder");
+	    new YAHOO.widget.Button("editsupplier");
+	    new YAHOO.widget.Button("manageorders");
+	    new YAHOO.widget.Button("receive");<!-- /TMPL_IF -->
+	}
+
+	//]]>
+	</script>
 	<ul class="toolbar">
-		<li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Supplier</a></li>
+		<li><a id="newsupplier" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Supplier</a></li>
 		<!-- TMPL_IF NAME="id" -->
-		<li><a href="/cgi-bin/koha/acqui/basket.pl?supplierid=<!-- TMPL_VAR NAME="id" -->">New Order</a></li>
-		<li><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Edit Supplier</a></li>
-		<li><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">Manage Orders</a></li>
-		<li><a href="/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">Receive Parcel</a></li>
+		<li><a id="neworder" href="/cgi-bin/koha/acqui/basket.pl?supplierid=<!-- TMPL_VAR NAME="id" -->">New Order</a></li>
+		<li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Edit Supplier</a></li>
+		<li><a id="manageorders" href="/cgi-bin/koha/acqui/booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">Manage Orders</a></li>
+		<li><a id="receive" href="/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">Receive Parcel</a></li>
 		<!-- /TMPL_IF -->
 	</ul>
-<br clear="all" />
 </div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
index 03d0d37155..0a101aefb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
@@ -1,6 +1,36 @@
 <div id="toolbar">
+<script type="text/javascript">
+	//<![CDATA[
 
-  <form name="f2" method="post" action="authorities.pl">
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    $("#newmenuc").empty();
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {   
+	
+		var newmenu = [
+			<!-- TMPL_LOOP name="authtypesloop" -->{ text: "New <!-- TMPL_VAR name="authtypetext" -->", url: "/cgi-bin/koha/authorities/authorities.pl?authtypecode=<!-- TMPL_VAR name="value" -->"},
+<!-- /TMPL_LOOP -->
+		]
+
+	    new YAHOO.widget.Button({
+	        type: "menu",
+	        label: "New Authority",
+	        name: "newmenubutton",
+	        menu: newmenu,
+	        container: "newmenuc"
+	    });  
+	}
+
+	//]]>
+	</script>
+	
+  <span id="newmenuc"><form name="f2" method="post" action="authorities.pl">
 	<label for="add_authtypecode">New: </label>
         <select id="add_authtypecode" name="authtypecode">
 <!-- TMPL_LOOP name="authtypesloop" -->
@@ -12,5 +42,5 @@
 <!-- /TMPL_LOOP -->
         </select>
       <input type="submit" value="Add" class="button" />
-  </form>
+  </form></span>
 </div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 0e785f4f59..c63b6f4f55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -1,10 +1,53 @@
 <div id="toolbar">
+	
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    $("#edititems").parent().remove();
+	    $("#duplicatebiblio").parent().remove();
+	    $("#editmenucontainer").empty();
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    var editmenu = [
+	        { text: "Edit Record", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=" },
+	        { text: "Edit Items", url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
+	        { text: "Edit as New (Duplicate)", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=duplicate" }
+	    ];
+
+	    new YAHOO.widget.Button({
+	        type: "menu",
+	        label: "Edit",
+	        name: "editmenubutton",
+	        menu: editmenu,
+	        container: "editmenucontainer"
+	    });   
+
+	    new YAHOO.widget.Button("addbiblio");
+	    new YAHOO.widget.Button("editbiblio");
+	    new YAHOO.widget.Button("edititems");
+	    new YAHOO.widget.Button("duplicatebiblio");
+	    new YAHOO.widget.Button("deletebiblio");
+	    new YAHOO.widget.Button("addtoshelf");
+	    new YAHOO.widget.Button("printbiblio");
+	    new YAHOO.widget.Button("placehold");		 
+	}
+
+	//]]>
+	</script>
+	
 <ul class="toolbar">
 
 	<li><a id="addbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li>
-	<li id="editmenucontainer"><a id="editbiblio" class="menubutton" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
-	<li><a id="edititems" class="menubutton" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
-	<li><a id="duplicatebiblio" class="menubutton" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate Record</a></li>
+	<li id="editmenucontainer"><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
+	<li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
+	<li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate Record</a></li>
 	<li><a id="deletebiblio" href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Delete</a></li>
 	<li><a id="addtoshelf" href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf</a></li>
 	<li><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index 87ede6875b..4f541c3f40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -1,21 +1,81 @@
-<div id="toolbar"><ul class="toolbar">
-	<li><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Check Out</a></li>
-	<!-- TMPL_IF name="adultborrower" --><li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    $("#printslip").parent().remove();
+		$("#patronflags").parent().remove();
+		$("#deletepatron").parent().remove();
+		$("#moremenuc").empty();
+	    $("#printmenuc").empty();
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    var printmenu = [
+	        { text: "Print Page", url: "#" },
+	        { text: "Print Slip", url: "#" }
+	    ];
+	
+		var moremenu = [
+			{ text: "Renew Patron", url: "javascript:confirm_reregistration();"},
+			{ text: "Set Permissions", url: "/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->"},
+			{ text: "Delete", url: "javascript:confirm_deletion();"},
+		]
+
+	    new YAHOO.widget.Button({
+	        type: "menu",
+	        label: "Print",
+	        name: "printmenubutton",
+	        menu: printmenu,
+	        container: "printmenuc"
+	    });   
+	
+	    new YAHOO.widget.Button({
+	        type: "menu",
+	        label: "More",
+	        name: "moremenubutton",
+	        menu: moremenu,
+	        container: "moremenuc"
+	    });
+	
+	    new YAHOO.widget.Button("checkout");
+	    new YAHOO.widget.Button("addchild");
+	    new YAHOO.widget.Button("editpatron");
+	    new YAHOO.widget.Button("addnote");
+	    new YAHOO.widget.Button("changepassword");
+	    new YAHOO.widget.Button("printslilp");
+		new YAHOO.widget.Button("printpage");
+	    new YAHOO.widget.Button("renewpatron");		 
+		new YAHOO.widget.Button("patronflags");
+		new YAHOO.widget.Button("deletepatron");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="checkout" href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Check Out</a></li>
+	<!-- TMPL_IF name="adultborrower" --><li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="category_type" -->
             <!--TMPL_IF NAME="guarantor"-->
-                <li><a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
+                <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
             <!--TMPL_ELSE-->
-            <li><a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
+            <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
             <!--/TMPL_IF-->Edit</a></li>
         <!-- TMPL_ELSE --> <!-- try with categorycode if no category_type -->
             <!-- TMPL_IF NAME="categorycode" -->
-            <li><a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;categorycode=<!-- TMPL_VAR NAME="categorycode"-->">Edit</a></li>
+            <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;categorycode=<!-- TMPL_VAR NAME="categorycode"-->">Edit</a></li>
             <!-- TMPL_ELSE --> <!-- if no categorycode, set category_type to A by default -->
-                <li><a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=A">Edit</a></li>
+                <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=A">Edit</a></li>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
-	<li><a href="Someone please write this">Add Note</a></li>
-	<li><a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li>
-	<li><a href="">Print</a><ul><li><a href="">Page</a></li><li><a href="">Slip</a></li></ul></li><li><a href="javascript:confirm_reregistration();">Renew Account</a></li><!-- TMPL_IF NAME="CAN_user_permission" --><li><a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set Permissions</a></li><!-- /TMPL_IF --><li><a href="javascript:confirm_deletion();">Delete</a></li>
-</ul>
-<br clear="all" /></div>
+	<li><a id="addnote" href="Someone please write this">Add Note</a></li>
+	<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li>
+	<li id="printmenuc"><a id="printpage" href="#">Print Page</a></li>
+	<li><a id="printslip" href="#">Print Slip</a></li>
+	<li id="moremenuc"><a id="renewpatron" href="javascript:confirm_reregistration();">Renew Account</a></li><!-- TMPL_IF NAME="CAN_user_permission" --><li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set Permissions</a></li><!-- /TMPL_IF --><li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
+</ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
index 8c3cf434dc..fd84f0eb81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
@@ -1,15 +1,8 @@
-<h5>Add Patron</h5>
-<ul>
-    <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Adult</a></li>
-    <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Child</a></li>
-    <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Professional</a></li>
-    <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Organisation</a></li>
-</ul>
 <!-- TMPL_IF NAME="borrowernumber" -->
 <h5>Patron Details</h5>
 <ul>
 	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details</a></li>
 	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
-	<li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</a></li>
+	<!-- TMPL_IF NAME="intranetreadinghistory" --><li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</a></li><!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->">Modification Log</a></li><!-- /TMPL_IF -->
-</ul><!-- /TMPL_IF -->
+</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc
new file mode 100644
index 0000000000..d299270d23
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc
@@ -0,0 +1,12 @@
+<!-- Core + Skin CSS -->
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/button/assets/skins/sam/button.css" />
+<!-- OPTIONAL: Menu Stylesheet (required for creating buttons of type "menu" and "split") -->
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/menu/assets/skins/sam/menu.css" />
+<!-- Dependencies -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/element/element-beta-min.js"></script>
+<!-- OPTIONAL: Menu and Container Core (required for creating buttons of type "menu" and "split") -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/container/container_core-min.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/menu/menu-min.js"></script>
+<!-- Source file -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/button/button-beta-min.js"></script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
index 23fae053ca..11be41264c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Acquisitions</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="acquisitions-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
index 8a708aa444..1dbf2632ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -1,12 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Search for supplier <!-- TMPL_VAR name="bookselname" --></title>
+<title>Koha &rsaquo; Search for supplier <!-- TMPL_VAR name="supplier" --></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="acquisitions-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Search for Supplier <em><!-- TMPL_VAR name="supplier" --></em> </div>
 
 <div id="doc3" class="yui-t2">
    
@@ -76,9 +77,6 @@
 		<!-- /TMPL_LOOP -->
 		</table>
 </div>
-<div id="action">
-    <a href="supplier.pl?op=enter">Add supplier</a>
-</div>
 </div>
 </div>
 <div class="yui-b">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 46bb6d0c62..48ff52facf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Supplier <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_UNLESS NAME="enter" --><!-- TMPL_INCLUDE NAME="yui-toolbars.inc" --><!-- /TMPL_UNLESS -->
 <script type="text/javascript">
 //<![CDATA[
 function confirm_deletion() {
@@ -11,11 +12,11 @@ function confirm_deletion() {
 //]]>
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" --> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --> <!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" --> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --> <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --></div>
 
 <div id="doc" class="yui-t7">
    
@@ -23,7 +24,7 @@ function confirm_deletion() {
 	<div id="yui-main">
 	<div class="yui-g">
 	
-<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
+<!-- TMPL_UNLESS NAME="enter" --><!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" --><!-- /TMPL_UNLESS -->
 	
 <!--TMPL_IF Name="enter"-->
     <form action="updatesupplier.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
index 5b143099ab..8bb16b4a53 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
@@ -1,7 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Authorities</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script language="JavaScript" type="text/javascript">
+//<![CDATA[
 function Help() {
     newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
 }
@@ -15,9 +17,10 @@ function searchauthority() {
     Y = document.forms[0].value.value;
     window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
 }
+//]]>
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="authorities-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index af9bb264a3..32559ac748 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha -- Authority details</title>
+<title>Koha &rsaquo; Authorities &rsaquo; <!-- TMPL_IF name="authid" -->Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)<!-- TMPL_ELSE -->Adding authority (<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <script type="text/javascript">
@@ -393,8 +393,6 @@ function searchauthority() {
     <div id="action">
 <!-- TMPL_IF name="authid" -->
     <input type="button" value="Save" onclick="Check(this.form)" accesskey="w" />
-<!-- TMPL_ELSE -->
-    <input type="button" value="Add authority" onclick="Check(this.form)" accesskey="w" />
 <!-- /TMPL_IF -->
     </div>
 
@@ -549,8 +547,6 @@ function searchauthority() {
 <div id="action">
     <!-- TMPL_IF name="authid" -->
         <input type="button" value="Save" onclick="Check(this.form)" accesskey="w" />
-    <!-- TMPL_ELSE -->
-        <input type="button" value="Add authority" onclick="Check(this.form)" accesskey="w" />
     <!-- /TMPL_IF -->
 </div>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
index 6a5283acd2..c639cf675c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
@@ -12,11 +12,10 @@ function jumpfull(page)
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div id="yui-main"><div class="yui-g">
 
     <h1>Authority search results</h1>
     <form name="f" method="post" action="auth_finder.pl">
@@ -149,7 +148,5 @@ function jumpfull(page)
 
 </div>
 </div>
-</div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
index 2a8cf949c0..bac4f38ed4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Authorities &rsaquo; Search Result List</title>
+<title>Koha &rsaquo; Authorities &rsaquo; Authority search results</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript" >
-
+//<![CDATA[
 function confirm_deletion(id) {
 	
 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
@@ -10,12 +11,6 @@ function confirm_deletion(id) {
 		window.location="authorities-home.pl?op=delete&amp;authid="+id;
 	}
 }
-</script>
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<script language="JavaScript" type="text/javascript">
 function Help() {
     newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
 }
@@ -29,25 +24,30 @@ function searchauthority() {
     Y = document.forms[0].value.value;
     window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
 }
+//]]>
 </script>
+</head>
+<body class="yui-skin-sam">
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="authorities-search.inc" -->
 
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; Authority search results</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-g">
+	
+	<!-- TMPL_INCLUDE NAME="authorities-toolbar.inc" -->
 
 <h1>Authority search results</h1>
 
+<!-- TMPL_IF name="total" -->
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <p id="authorities_searchresultlist_current_page_info">
-<!-- TMPL_IF name="total" -->
   Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
-<!-- TMPL_ELSE -->
-  No results found.
-<!-- /TMPL_IF -->
 </p>
 
 <div id="authorities_searchresultlist_results">
@@ -83,9 +83,73 @@ function searchauthority() {
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
-</div>
+<!-- TMPL_ELSE -->
+  No results found.
+  
+  <fieldset id="authorities_authorities_home_search">
+  <legend>Authority search</legend>
+
+  <form name="f" action="/cgi-bin/koha/authorities/authorities-home.pl" method="post">
+    <input type="hidden" name="op" value="do_search" />
+    <input type="hidden" name="type" value="intranet" />
+    <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+
+    <p><label for="authtypecode">Search on</label>
+          <select id="authtypecode" name="authtypecode">
+<!-- TMPL_LOOP NAME="authtypesloop" -->
+  <!-- TMPL_IF name="selected" -->
+            <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="authtypetext" --></option>
+  <!-- TMPL_ELSE -->
+            <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
+  <!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+          </select>
+          <label for="value_mainmainentry">Main entry ($a only)</label>
+          <input type="hidden" name="marclist" value="mainmainentry" />
+          <select name="operator">
+	    <option value="contains">contains</option>
+	    <option value="start">start by</option>
+            <option value="is">is exactly</option>
+        </select>
+        <input id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+    </p>
+    <p>
+        <label for="value_mainentry">Main entry</label>
+        <input type="hidden" name="marclist" value="mainentry" />
+        <input type="hidden" name="and_or" value="and" />
+        <input type="hidden" name="excluding" value="" />
+        <select name="operator">
+            <option value="contains">contains</option>
+            <option value="start">start by</option>
+            <option value="is">is exactly</option>
+        </select>
+        <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+      </p>
+    <p><label for="value_anywhere">Anywhere</label>
+          <input type="hidden" name="marclist" value="" />
+          <input type="hidden" name="and_or" value="and" />
+          <input type="hidden" name="excluding" value="" />
+          <select name="operator">
+            <option value="contains">contains</option>
+            <option value="start">start by</option>
+            <option value="is">is exactly</option>
+          </select>
+          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+    </p>
+
+    <div id="action">
+          <p><label>Order by :</label><select name="orderby">
+         <option value="">None</option>
+	    <option value="HeadingAsc" selected="SELECTED">Heading Ascendant</option>
+	    <option value="HeadingDsc">Heading Descendant</option>
+	  </select>
+      <input type="submit" value="Start search">
+      </p>
+    </div>
+  </form>
+</fieldset>
+<!-- /TMPL_IF -->
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
index ef7e7ff358..b45473b87c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue &rsaquo; ISBD Details for <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script language="javascript" type="text/javascript">
 function Dopop(link) {
     newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
@@ -29,7 +30,7 @@ function confirm_deletion(count) {
 
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 9f3f3e2c25..6ff29aaf95 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue &rsaquo; MARC Details for <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript">
 
 //<![CDATA[
@@ -38,7 +39,7 @@ function Changefwk(FwkList) {
 //]]>
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
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 2fbb646899..88007d2ee0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -1,21 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue &rsaquo; Details for <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- Core + Skin CSS -->
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/button/assets/skins/sam/button.css"/>
-<!-- OPTIONAL: Menu Stylesheet (required for creating buttons of type "menu" and "split") -->
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/menu/assets/skins/sam/menu.css"/>
-
-<!-- Dependencies -->
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/element/element-beta-min.js"></script>
-
-<!-- OPTIONAL: Menu and Container Core (required for creating buttons of type "menu" and "split") -->
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/container/container_core-min.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/menu/menu-min.js"></script>
-
-<!-- Source file -->
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/button/button-beta-min.js"></script>
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript">
 //<![CDATA[
 function Dopop(link) {
@@ -41,47 +27,6 @@ function confirm_deletion(count) {
 		
     }
 }
-
-// prepare DOM for YUI Toolbar
-
- $(document).ready(function() {
- 	$("#edititems").parent().remove();
-	$("#duplicatebiblio").parent().remove();
-	$("#editmenucontainer").empty();
-	yuiToolbar();
- });
-
-// YUI Toolbar Functions
-
-       var editmenu = [
-            { text: "Edit Record", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=" },
-            { text: "Edit Items", url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
-            { text: "Edit as New (Duplicate)", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate" }
-        ];
-        
-        var oEditMenu = new YAHOO.widget.Button({
-				type: "menu",
-				label: "Edit",
-				name: "editmenubutton",
-				menu: editmenu,
-				container: "editmenucontainer"
-		 });   
-
-function yuiToolbar(){
-	 YAHOO.toolbar.init = function () {
-                    var oAddbiblio = new YAHOO.widget.Button("addbiblio");
-                    var oEditbiblio = new YAHOO.widget.Button("editbiblio");
-                    var oEdititems = new YAHOO.widget.Button("edititems");
-                    var oDuplicatebiblio = new YAHOO.widget.Button("duplicatebiblio");
-                    var oDeletebiblio = new YAHOO.widget.Button("deletebiblio");
-                    var oAddtoshelf = new YAHOO.widget.Button("addtoshelf");
-                    var oPrintbiblio = new YAHOO.widget.Button("printbiblio");
-                    <!-- TMPL_UNLESS name="bi_notforloan" -->
-                        var oPlacehold = new YAHOO.widget.Button("placehold");		 
-                    <!-- /TMPL_UNLESS -->
-    } ();
-}
-	
 //]]>
 </script>
 </head>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index a026e400a6..5dccc38984 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue &rsaquo; Item details for <!-- TMPL_LOOP NAME="BIBITEM_DATA" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --></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" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 0e4a561c7a..209d8ee53f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -5,6 +5,7 @@
 (<!-- TMPL_VAR NAME="cardnumber" -->)
 <!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 	 $(document).ready(function() {
@@ -14,7 +15,7 @@
 </script>
 
 </head>
-<body>
+<body class="yui-skin-sam">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
@@ -33,13 +34,9 @@
 	<div class="yui-b">
 <!-- TMPL_IF NAME="borrowernumber" -->
 <!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
-<!-- TMPL_ELSE -->
-<!--     <h1>Circulation &rsaquo; Checkouts</h1> -->
 <!-- /TMPL_IF -->
 
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-<!-- Branch: <a href="/cgi-bin/koha/circ/selectbranchprinter.pl" title="change"><!-- TMPL_VAR NAME="branchname"--></a>
-<!-- TMPL_IF name="printername" --> | Printer: <!-- TMPL_VAR NAME="printername" --><!-- /TMPL_IF -->-->
 
 <!-- TMPL_IF NAME="borrowernumber" -->
 
@@ -741,10 +738,10 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <table>
         <tr>
             <th>Hold date</th>
-            <th>Barcode</th>
+            <th>Status</th>
             <th>Title</th>
             <th>Author</th>
-            <th>Localisation</th>
+            <th>Call Number</th>
         </tr>
         <!-- TMPL_LOOP NAME="reservloop" -->
         <tr class="<!-- TMPL_VAR NAME="color" -->">
@@ -752,8 +749,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                         <!-- TMPL_VAR NAME="reservedate" -->
                     </td>
                     <td>
-                        <!-- TMPL_IF name="barcodereserv" -->
-                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
+                        <!-- TMPL_IF name="barcodereserv" --><!-- TMPL_VAR NAME="barcodereserv" -->
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF NAME="waitingposition" -->
                         Hold priority :
@@ -761,7 +757,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                         <!-- /TMPL_IF -->
                     </td>
                     <td>
-                        <!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
+                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
 
                         <!-- TMPL_IF name="waiting" -->
                         <br />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
index 5baab3ba3c..4c95424b7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
@@ -8,19 +8,19 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Set Library</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
 
 
-<h1>Set Library</h1>
-
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
 <!-- TMPL_VAR NAME="branch" -->
 
-<label for="branch">Choose library:</label>
+<fieldset class="rows">
+	<legend>Set Library</legend>
+	<ol><li><label for="branch">Choose library:</label>
 <!--branchselection-->
 	<select name="branch" id="branch">
 	<!-- TMPL_LOOP Name="branchloop" -->
@@ -29,11 +29,11 @@
 				<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="name" --></option>
 				<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
-	</select>
+	</select></li>
 
 
 <!-- TMPL_IF Name="printerloop" -->
-    <label for="printer">Choose a network printer:</label>
+    <li><label for="printer">Choose a network printer:</label>
     <!--printerselection-->
     <select name="printer" id="printer">
         <!-- TMPL_LOOP Name="printerloop" -->
@@ -42,17 +42,14 @@
 				<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="name" --></option>
 				<!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
-        </select>
+        </select></li>
 <!-- /TMPL_IF -->
-    <input type="hidden" name="setcookies" value="1" />
-    <input type="submit" value="Submit" name="changesettings" />
+    <input type="hidden" name="setcookies" value="1" /></ol>
+</fieldset>    <input type="submit" value="Submit" name="changesettings" />
 </form>
 
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-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/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index dbe7fd7051..52f256ab8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Patrons &rsaquo; <!-- TMPL_IF NAME="unknowuser" -->Patron does not exist<!-- TMPL_ELSE -->Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript">
 //<![CDATA[
 function confirm_deletion() {
@@ -22,7 +23,7 @@ function confirm_reregistration() {
 //]]>
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
-- 
2.39.5