From cacab4e104acef32ae355f9daac43f15a53cdb3b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 15 Nov 2012 15:33:23 -0500
Subject: [PATCH] Bug 6261 [Revised] Consolidate patron toolbar include files

The staff client has two almost identical include files which
can be consolidated: circ-toolbar.inc and members-toolbar.inc.
This patch marges the slight differences between them and
eliminates circ-toolbar.inc, that being the one which was used
on fewer pages.

In order to accommodate the different "destination" variable
for operations which redirect back either to circ or patrons,
circulation.pl defines "destination" in the template.

Revision corrects a redirect error in setstatus.pl which
predates this patch but which never showed up until now.

To test, perform various operations from the toolbar on at least
two pages: circulation.pl and moremember.pl.

Operations: Edit, add child, duplicate, change password, print (all
options), search to hold, renew, set permissions, delete, update child
to adult, and export checked-in barcodes. In most cases simply
confirming that the link takes you to the right place is enough.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
 .../prog/en/includes/circ-toolbar.inc              |  148 ----------------
 .../prog/en/includes/members-toolbar.inc           |  184 +++++++++++---------
 .../prog/en/modules/circ/circulation.tt            |    3 +-
 .../intranet-tmpl/prog/en/modules/members/files.tt |    2 +-
 .../prog/en/modules/members/notices.tt             |    2 +-
 .../prog/en/modules/members/readingrec.tt          |    2 +-
 .../prog/en/modules/members/routing-lists.tt       |    2 +-
 members/moremember.pl                              |    4 +-
 members/setstatus.pl                               |    4 +-
 9 files changed, 109 insertions(+), 242 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
deleted file mode 100644
index 23c7de2..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ /dev/null
@@ -1,148 +0,0 @@
-<div id="toolbar">
-	<script type="text/javascript">
-	//<![CDATA[
-
-function confirm_deletion() {
-    var is_confirmed = window.confirm(_('Are you sure you want to delete this patron? This cannot be undone.'));
-    if (is_confirmed) {
-        window.location='/cgi-bin/koha/members/deletemem.pl?member=[% borrowernumber %]';
-    }
-}
-
-function confirm_updatechild() {
-    var is_confirmed = window.confirm(_('Are you sure you want to update this child to an Adult category?  This cannot be undone.'));
-    if (is_confirmed) {
-        window.location='/cgi-bin/koha/members/update-child.pl?op=update&borrowernumber=[% borrowernumber %]&catcode=[% catcode %]&catcode_multi=[% CATCODE_MULTI %]';
-    }
-}
-
-function confirm_reregistration() {
-    var is_confirmed = window.confirm(_('Are you sure you want to renew this patron\'s registration?'));
-    // var borrowernumbervalue1 = $("#borrowernumber").attr("value");
-    if (is_confirmed) {
-	window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y';
-    }
-}
-
-function update_child() {
-    // var borrowernumbervalue= $("#borrowernumber").attr("value"); 
-[% IF ( CATCODE_MULTI ) %]
- window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
-[% ELSE %]
- confirm_updatechild();
-[% END %]
-}
-
-function export_barcodes() {
-    window.open('/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]&amp;op=export_barcodes');
-}
-
-	// prepare DOM for YUI Toolbar
-
-	 $(document).ready(function() {
-	    $("#printslip,#patronflags,#deletepatron").parent().remove();
-		$("#moremenuc,#printmenuc,#searchtoholdc").empty();
-	    yuiToolbar();
-	 });
-
-	// YUI Toolbar Functions
-    var slip_re = /slip/;
-	function printx_window(print_type) {
-        var handler = print_type.match(slip_re) ? "printslip" : "moremember";
-		window.open("/cgi-bin/koha/members/" + handler + ".pl?borrowernumber=[% borrowernumber %]&amp;print=" + print_type, "printwindow");
-		return false;
-	}
-	function searchToHold(){
-		var date = new Date();
-		date.setTime(date.getTime() + (10 * 60 * 1000));
-	    $.cookie("holdfor", "[% borrowernumber %]", { path: "/", expires: date });
-	    location.href="/cgi-bin/koha/catalogue/search.pl";
-	}
-	function yuiToolbar() {
-	    var printmenu = [
-            [% IF ( CAN_user_borrowers ) %]
-            { text: _("Print summary"), onclick: {fn: function(){printx_window("page")}} },
-            [% END %]
-            { text: _("Print slip"), onclick: {fn: function(){printx_window("slip")}} },
-            { text: _("Print quick slip"), onclick: {fn: function(){printx_window("qslip")}} }
-	    ];
-	
-		var moremenu = [
-            { text: _("Renew patron"),  onclick: { fn: confirm_reregistration } },
-            { text: _("Set permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS CAN_user_permissions %], disabled: true[% END %]},
-            { text: _("Delete"), [% UNLESS CAN_user_borrowers %]disabled: true, [% END %] onclick: { fn: confirm_deletion } },
-            { text: _("Update child to adult patron") , onclick: { fn: update_child }[% UNLESS is_child %], disabled: true[% END %]},
-            { text: _("Export today's checked in barcodes"), onclick: { fn: export_barcodes }}
-        ];
-
-	    new YAHOO.widget.Button({
-	        type: "menu",
-	        label: _("Print"),
-	        name: "printmenubutton",
-	        menu: printmenu,
-	        container: "printmenuc"
-	    });
-	    new YAHOO.widget.Button({
-	        id: "searchtohold",
-	        type: "button",
-	        label: _("Search to hold"),
-	        container: "searchtoholdc",
-			onclick: {fn: searchToHold }
-		});
-	    new YAHOO.widget.Button({
-	        type: "menu",
-	        label: _("More"),
-	        name: "moremenubutton",
-	        menu: moremenu,
-	        container: "moremenuc"
-	    });
-
-	    [% IF ( adultborrower ) %]new YAHOO.widget.Button("addchild");[% END %]
-	    new YAHOO.widget.Button("editpatron");
-	    new YAHOO.widget.Button("addnote");
-        [% IF CAN_user_borrowers %] new YAHOO.widget.Button("changepassword");  [% END %]
-	    new YAHOO.widget.Button("duplicate");
-	    new YAHOO.widget.Button("printslip");
-		new YAHOO.widget.Button("printpage");
-	}
-
-	//]]>
-	</script>
-	<ul class="toolbar">
-	[% IF ( CAN_user_borrowers ) %]
-	[% IF ( category_type ) %]
-            [% IF ( guarantor ) %]
-                <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantorborrowernumber %]&amp;category_type=[% category_type %]">
-            [% ELSE %]
-            <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">
-            [% END %]Edit</a></li>
-        [% ELSE %] <!-- try with categorycode if no category_type -->
-            [% IF ( categorycode ) %]
-            <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit</a></li>
-            [% ELSE %] <!-- if no categorycode, set category_type to A by default -->
-                <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;category_type=A">Edit</a></li>
-            [% END %]
-        [% END %]
-	[% END %]
-	[% IF ( CAN_user_borrowers ) %]
-        [% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-        [% IF ( CAN_user_borrowers ) %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change password</a></li>[% END %]
-    [% END %]
-    <li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
-    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print summary</a></li>
-    <li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
-	<li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
-    <li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>
-    [% IF ( CAN_user_permissions ) %]
-        [% IF ( StaffMember ) %]
-            [% IF ( CAN_user_staffaccess ) %]
-                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
-            [% END %]
-          [% ELSE %]
-                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
-        [% END %]
-    [% END %]
-    [% IF ( StaffMember ) %][% UNLESS ( CAN_user_staffaccess ) %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>[% END %]
-    [% ELSE %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>[% END %]
-
-</ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index 9acdf90..0bb9255 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -1,124 +1,136 @@
 <div id="toolbar">
-	<script type="text/javascript">
-	//<![CDATA[
-
+    <script type="text/javascript">
+    //<![CDATA[
+[% IF ( CAN_user_borrowers ) %]
 function confirm_deletion() {
     var is_confirmed = window.confirm(_('Are you sure you want to delete this patron? This cannot be undone.'));
     if (is_confirmed) {
-            window.location='/cgi-bin/koha/members/deletemem.pl?member=[% borrowernumber %]';
-    }
-}
-function confirm_updatechild() {
-    var is_confirmed = window.confirm(_('Are you sure you want to update this child to an Adult category?  This cannot be undone.'));
-
-    if (is_confirmed) {
-            window.location='/cgi-bin/koha/members/update-child.pl?op=update&borrowernumber=[% borrowernumber %]&catcode=[% catcode %]&catcode_multi=[% CATCODE_MULTI %]';
+        window.location='/cgi-bin/koha/members/deletemem.pl?member=[% borrowernumber %]';
     }
 }
 
-function confirm_reregistration() {
-    var is_confirmed = window.confirm(_('Are you sure you want to renew this patron\'s registration?'));
+[% IF ( is_child ) %]function confirm_updatechild() {
+    var is_confirmed = window.confirm(_('Are you sure you want to update this child to an Adult category?  This cannot be undone.'));
     if (is_confirmed) {
-    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber=[% borrowernumber %]';
+        window.location='/cgi-bin/koha/members/update-child.pl?op=update&borrowernumber=[% borrowernumber %]&catcode=[% catcode %]&catcode_multi=[% CATCODE_MULTI %]';
     }
 }
 
 function update_child() {
 [% IF ( CATCODE_MULTI ) %]
- window.open('update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
+ window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
 [% ELSE %]
  confirm_updatechild();
 [% END %]
+}[% ELSE %][% END %]
+
+function confirm_reregistration() {
+    var is_confirmed = window.confirm(_('Are you sure you want to renew this patron\'s registration?'));
+    if (is_confirmed) {
+       window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=[% destination %]&amp;reregistration=y';
+    }
+}
+function export_barcodes() {
+    window.open('/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]&amp;op=export_barcodes');
 }
+[% END %]
 
-	// prepare DOM for YUI Toolbar
+    // prepare DOM for YUI Toolbar
 
-	 $(document).ready(function() {
-	    $("#printslip,#patronflags,#deletepatron").parent().remove();
-		$("#moremenuc,#printmenuc,#searchtoholdc").empty();
-	    yuiToolbar();
-	 });
+     $(document).ready(function() {
+        $("#printslip,#patronflags,#deletepatron").parent().remove();
+        $("#moremenuc,#printmenuc,#searchtoholdc").empty();
+        yuiToolbar();
+     });
 
-	// YUI Toolbar Functions
-	function printx_window(print_type) {
-		window.open("/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=" + print_type, "printwindow");
-		return false;
-	}
-	function searchToHold(){
-		var date = new Date();
-		date.setTime(date.getTime() + (10 * 60 * 1000));
-	    $.cookie("holdfor", "[% borrowernumber %]", { path: "/", expires: date });
-	    location.href="/cgi-bin/koha/catalogue/search.pl";
-	}
-	function yuiToolbar() {
-	    var printmenu = [
+    // YUI Toolbar Functions
+    var slip_re = /slip/;
+    function printx_window(print_type) {
+        var handler = print_type.match(slip_re) ? "printslip" : "moremember";
+        window.open("/cgi-bin/koha/members/" + handler + ".pl?borrowernumber=[% borrowernumber %]&amp;print=" + print_type, "printwindow");
+        return false;
+    }
+    function searchToHold(){
+        var date = new Date();
+        date.setTime(date.getTime() + (10 * 60 * 1000));
+        $.cookie("holdfor", "[% borrowernumber %]", { path: "/", expires: date });
+        location.href="/cgi-bin/koha/catalogue/search.pl";
+    }
+    function yuiToolbar() {
+        var printmenu = [
             { text: _("Print summary"), onclick: {fn: function(){printx_window("page")}} },
             { text: _("Print slip"), onclick: {fn: function(){printx_window("slip")}} },
             { text: _("Print quick slip"), onclick: {fn: function(){printx_window("qslip")}} }
-	    ];
+        ];
 
-		var moremenu = [
-            { text: _("Renew patron"),  onclick: { fn: confirm_reregistration } },
-            { text: _("Set permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS ( CAN_user_permissions ) %], disabled: true[% END %]},
-			{ text: _("Delete"), onclick: { fn: confirm_deletion}[% UNLESS ( CANDELETEUSER ) %], disabled: true[% END %] },
-            { text: _("Update child to adult patron") , onclick: { fn: update_child }[% UNLESS ( is_child ) %], disabled: true[% END %]}
-		];
+        var moremenu = [
+            { text: _("Renew patron"), [% UNLESS CAN_user_borrowers %]disabled: true, [% END %] onclick: { fn: confirm_reregistration } },
+            { text: _("Set permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS CAN_user_permissions %], disabled: true[% END %]},
+            { text: _("Delete"), [% UNLESS CAN_user_borrowers %]disabled: true, [% END %] onclick: { fn: confirm_deletion } },
+            { text: _("Update child to adult patron")[% IF is_child && CAN_user_borrowers %], onclick: { fn: update_child }[% ELSE %], disabled: true[% END %]},
+            { text: _("Export today's checked in barcodes"), [% UNLESS CAN_user_borrowers %]disabled: true, [% END %] onclick: { fn: export_barcodes }}
+        ];
 
-	    new YAHOO.widget.Button({
-	        type: "menu",
-	        label: _("Print"),
-	        name: "printmenubutton",
-	        menu: printmenu,
-	        container: "printmenuc"
-	    });
+        new YAHOO.widget.Button({
+            type: "menu",
+            label: _("Print"),
+            name: "printmenubutton",
+            menu: printmenu,
+            container: "printmenuc"
+        });
+        new YAHOO.widget.Button({
+            id: "searchtohold",
+            type: "button",
+            label: _("Search to hold"),
+            container: "searchtoholdc",
+            onclick: {fn: searchToHold }
+        });
+        new YAHOO.widget.Button({
+            type: "menu",
+            label: _("More"),
+            name: "moremenubutton",
+            menu: moremenu,
+            container: "moremenuc"
+        });
 
-	    new YAHOO.widget.Button({
-	        id: "searchtohold",
-	        type: "button",
-	        label: _("Search to hold"),
-	        container: "searchtoholdc",
-			onclick: {fn: searchToHold }
-		});
-
-	    new YAHOO.widget.Button({
-	        type: "menu",
-	        label: _("More"),
-	        name: "moremenubutton",
-	        menu: moremenu,
-	        container: "moremenuc"
-	    });
-
-	    [% IF ( adultborrower ) %]new YAHOO.widget.Button("addchild");[% END %]
-	    new YAHOO.widget.Button("editpatron");
-	    new YAHOO.widget.Button("addnote");
-            [% IF CAN_user_borrowers %]new YAHOO.widget.Button("changepassword");  [% END %]
-	    new YAHOO.widget.Button("duplicate");
-	    new YAHOO.widget.Button("printslip");
-		new YAHOO.widget.Button("printpage");
-	}
-
-	//]]>
+        [% IF ( CAN_user_borrowers ) %][% IF ( adultborrower ) %]new YAHOO.widget.Button("addchild");[% END %]
+        new YAHOO.widget.Button("editpatron");
+        new YAHOO.widget.Button("changepassword");
+        new YAHOO.widget.Button("duplicate");[% END %]
+        new YAHOO.widget.Button("printslip");
+        new YAHOO.widget.Button("printpage");
+    }
 
-	</script>
-	<ul class="toolbar">
-	[% IF ( category_type ) %]
+    //]]>
+    </script>
+    <ul class="toolbar">
+    [% IF ( CAN_user_borrowers ) %]
+        [% IF ( category_type ) %]
             [% IF ( guarantor ) %]
-                <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantorborrowernumber %]&amp;category_type=[% category_type %]">
+                <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=[% destination %]&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantorborrowernumber %]&amp;category_type=[% category_type %]">
             [% ELSE %]
-            <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">
+            <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=[% destination %]&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">
             [% END %]Edit</a></li>
         [% ELSE %] <!-- try with categorycode if no category_type -->
             [% IF ( categorycode ) %]
-            <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit</a></li>
+            <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=[% destination %]&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit</a></li>
             [% ELSE %] <!-- if no categorycode, set category_type to A by default -->
-                <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;category_type=A">Edit</a></li>
+                <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=[% destination %]&amp;borrowernumber=[% borrowernumber %]&amp;category_type=A">Edit</a></li>
             [% END %]
         [% END %]
-	[% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-    [% IF CAN_user_borrowers %]<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change password</a></li> [% END %]
-	<li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
+        [% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
+        <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change password</a></li>
+        <li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
+    [% END %]
     <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print summary</a></li>
     <li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
-	<li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
-    <li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>[% IF ( CAN_user_permissions ) %]<li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>[% END %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
+    <li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
+    [% IF ( CAN_user_borrowers ) %]<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>[% END %]
+    [% IF ( CAN_user_permissions ) %]
+        [% IF ( CAN_user_staffaccess ) %]
+            <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
+        [% END %]
+    [% END %]
+    [% IF ( CAN_user_staffaccess ) %]<li><a id="deletepatron" href="#" onclick="confirm_deletion();">Delete</a></li>[% END %]
+
 </ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index c860ed6..bace749 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -1,5 +1,6 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
+[% SET destination = "circ" %]
 <title>Koha &rsaquo; Circulation
 [% IF borrowernumber %]
   &rsaquo; Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 %]
@@ -261,7 +262,7 @@ function validate1(date) {
 [% END %]
 
 [% IF ( borrowernumber ) %]
-[% INCLUDE 'circ-toolbar.inc' %]
+[% INCLUDE 'members-toolbar.inc' %]
 [% END %]
 
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
index a44aaa9..58a3038 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
@@ -13,7 +13,7 @@
     <div id="bd">
         <div id="yui-main">
             <div class="yui-b">
-                [% INCLUDE 'circ-toolbar.inc' %]
+                [% INCLUDE 'members-toolbar.inc' %]
 
                 <h1>Files</h1>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
index bd345b8..445ed17 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -35,7 +35,7 @@
     <div id="bd">
     <div id="yui-main">
     <div class="yui-b">
-[% INCLUDE 'circ-toolbar.inc' %]
+[% INCLUDE 'members-toolbar.inc' %]
 <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index b7c5f53..90e1530 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -25,7 +25,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-[% INCLUDE 'circ-toolbar.inc' %]
+[% INCLUDE 'members-toolbar.inc' %]
 <h1>Circulation history</h1>
 [% IF loop_reading %]
 <form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
index 04876dc..f6f6f92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
@@ -12,7 +12,7 @@
     <div id="bd">
     <div id="yui-main">
     <div class="yui-b">
-[% INCLUDE 'circ-toolbar.inc' %]
+[% INCLUDE 'members-toolbar.inc' %]
 
 <!-- Search Bar -->
 <p class="tip">Search subscriptions:</p>
diff --git a/members/moremember.pl b/members/moremember.pl
index 0524ecb..3928286 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -85,7 +85,9 @@ my $quickslip = 0;
 my $flagsrequired;
 if ($print eq "page") {
     $template_name = "members/moremember-print.tmpl";
-    $flagsrequired = { borrowers => 1 };
+    # circ staff who process checkouts but can't edit
+    # patrons still need to be able to access print view
+    $flagsrequired = { circulate => "circulate_remaining_permissions" };
 } elsif ($print eq "slip") {
     $template_name = "members/moremember-receipt.tmpl";
     # circ staff who process checkouts but can't edit
diff --git a/members/setstatus.pl b/members/setstatus.pl
index 31a62e6..914c36e 100755
--- a/members/setstatus.pl
+++ b/members/setstatus.pl
@@ -64,8 +64,8 @@ if($destination eq "circ"){
 	}
 } else {
 	if($dateexpiry){
-		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber&dateexpiry=$dateexpiry");
+        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&dateexpiry=$dateexpiry");
 	} else {
-		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
+        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
 	}
 }
-- 
1.7.10.4