Make printslip and printpage buttons use popup.

This bug was reported by existing users.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

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 08414e5..38a3133 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -32,11 +32,15 @@ function confirm_reregistration() {
         });
 
        // YUI Toolbar Functions
+       function printx_window(print_type) {
+               window.open("/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=" + print_type, "printwindow");
+               return false;
+       }
 
        function yuiToolbar() {
            var printmenu = [
-               { text: _("Print Page"), url: "/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" },
-               { text: _("Print Slip"), url: "/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" }
+               { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}}, },
+               { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}}, }
            ];
        
                var moremenu = [
@@ -47,7 +51,7 @@ function confirm_reregistration() {
                     <!-- TMPL_ELSE --><!-- /TMPL_IF -->
                 <!-- TMPL_ELSE -->, disabled: true<!-- /TMPL_IF-->},
             { text: _("Delete"), <!-- TMPL_IF NAME="StaffMember" --><!-- TMPL_UNLESS NAME="CAN_user_staffaccess" -->disabled: true, <!-- /TMPL_UNLESS --><!-- /TMPL_IF --> onclick: { fn: confirm_deletion } }
-               ]
+               ];
 
            new YAHOO.widget.Button({
                type: "menu",
@@ -70,7 +74,7 @@ function confirm_reregistration() {
            new YAHOO.widget.Button("addnote");
         <!-- TMPL_IF NAME="StaffMember" --><!-- TMPL_IF NAME="CAN_user_staffaccess" --> new YAHOO.widget.Button("changepassword");  <!-- /TMPL_IF-->
             <!-- TMPL_ELSE--> new YAHOO.widget.Button("changepassword"); <!-- /TMPL_IF -->
-           new YAHOO.widget.Button("printslilp");
+           new YAHOO.widget.Button("printslip");
                new YAHOO.widget.Button("printpage");
            new YAHOO.widget.Button("renewpatron");              
         <!-- TMPL_IF NAME="CAN_user_permissions" -->

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 3adcfdb..dbeec1b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -46,11 +46,15 @@ function update_child() {
         });
 
        // YUI Toolbar Functions
+       function printx_window(print_type) {
+               window.open("/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=" + print_type, "printwindow");
+               return false;
+       }
 
        function yuiToolbar() {
            var printmenu = [
-               { text: _("Print Page"), url: "/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" },
-               { text: _("Print Slip"), url: "/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" }
+               { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}}, },
+               { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}}, }
            ];
        
                var moremenu = [
@@ -58,7 +62,7 @@ function update_child() {
                        { text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->"<!-- TMPL_UNLESS NAME="CAN_user_permissions" -->, disabled: true<!-- /TMPL_UNLESS -->},
                        { text: _("Delete"), onclick: { fn: confirm_deletion } },
                        { text: _("Update Child to Adult Patron") , onclick: { fn: update_child }<!-- TMPL_UNLESS NAME="is_child" -->, disabled: true<!-- /TMPL_UNLESS -->}
-               ]
+               ];
 
            new YAHOO.widget.Button({
                type: "menu",