From f6519d10e305e9f787e539d54d0b1db49bd0b316 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 12 Aug 2009 09:57:51 -0500
Subject: [PATCH] Hide z39.50 search button for users without cataloging
 privileges.

This also simplifies the display of the z39.50 search button on the search results page. It's overkill to use a YUI button when there are already simpler standard buttons in use in the same area.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 .../prog/en/includes/cat-toolbar.inc             |  6 +++---
 .../prog/en/modules/catalogue/results.tmpl       | 16 +---------------
 2 files changed, 4 insertions(+), 18 deletions(-)

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 3da9fd3150..8adb30b576 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -2,7 +2,7 @@
 	
 	<script type="text/javascript">
 	//<![CDATA[
-	
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
 	/* this function open a popup to search on z3950 server.  */
 	function PopupZ3950() {
 		var strQuery = GetZ3950Terms();
@@ -19,7 +19,7 @@
 		<!-- /TMPL_LOOP -->
 		return strQuery;
 	}
-
+	<!-- /TMPL_IF -->
 	function addToShelf() {	window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes');
 	}
 	function printBiblio() {window.open('/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Print_Biblio','width=700,height=500,toolbar=false,scrollbars=yes');
@@ -160,7 +160,7 @@ function confirm_deletion() {
         <!-- TMPL_UNLESS name="bi_notforloan" -->
 	<!-- TMPL_UNLESS NAME="norequests" --><li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
 	<!-- /TMPL_IF -->
-	<li id="z3950searchc"><input type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950(); return false;" /></li>
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue" --><li id="z3950searchc"><input type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950(); return false;" /></li><!-- /TMPL_IF -->
     </ul>
 </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index 4acf2c164d..5bb82c2030 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -33,8 +33,6 @@ $(document).ready(function() {
     $('#sort_by').change(function() {
         $('#sortbyform').submit();
     });
-	$("#z3950searchc").empty();
-	yuiZ3950button();
     $("#selection_ops").show();
     $(".selection").show();
     <!-- TMPL_IF NAME="query_desc" -->
@@ -119,16 +117,6 @@ function GetZ3950Terms(){
 	<!-- /TMPL_LOOP -->
 	return strQuery;
 }
-/* prepare DOM for Z39.50 Search Button */
-function yuiZ3950button() {
-	new YAHOO.widget.Button({
-			id: "z3950search",
-			type: "button",
-			label: _("z39.50 Search"),
-			container: "z3950searchc",
-			onclick: {fn:function(){PopupZ3950()}}
-	});
-}
 //]]>
 </script>
 </head>
@@ -166,9 +154,6 @@ function yuiZ3950button() {
 
     <!-- TMPL_IF NAME="total" -->
         <div id="searchheader">
-			<form method="post" name="fz3950" class="fz3950" action="#">
-					<span id="z3950searchc"><input type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950(); return false;" /></span>
-			</form>
             <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="sortbyform">
                 <!-- TMPL_IF NAME="searchdesc" -->
                     <!-- TMPL_LOOP NAME="QUERY_INPUTS"-->
@@ -200,6 +185,7 @@ function yuiZ3950button() {
                   <input type="button" onclick="placeHold(); return false;" value="Place Hold"/>
                 <!-- /TMPL_IF -->
                 <input type="button" onclick="addToList(); return false;" value="Add to List"/>
+				<!-- TMPL_IF NAME="CAN_user_editcatalogue" --><input type="button" onclick="PopupZ3950(); return false;" value="z39.50 Search"/><!-- /TMPL_IF -->
             </div>
         </div>
     <!-- TMPL_IF NAME="stopwords_removed" --><div><p class="tip">Ignored the following common words: "<!-- TMPL_VAR NAME="stopwords_removed" -->"<p></div><!-- /TMPL_IF -->
-- 
2.39.2