From 29e620cb89f0d6efeba79a9434a640698ed9e070 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 16 Jun 2011 08:48:47 -0400 Subject: [PATCH] [SIGNED OFF] Fix for Bug 6501 - missing scroll bar when updating child Content-Type: text/plain; charset="utf-8" - Adding "scrollbars=yes" to window.open javascript. - Adding javascript tablesorter to categories table To test, open a child patron record and choose more -> Update Child to Adult Patron from the toolbar menu. The resulting pop-up should have scrollbars. The table of categories should be sortable with a default sort on the description. --- .../prog/en/includes/circ-toolbar.inc | 2 +- .../prog/en/includes/members-toolbar.inc | 2 +- .../prog/en/modules/members/update-child.tt | 18 ++++++++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) 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 1377aa5..503f954 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc @@ -27,7 +27,7 @@ function confirm_reregistration() { 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=no,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 %] 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 9331f5f..afad863 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -25,7 +25,7 @@ function confirm_reregistration() { function update_child() { [% IF ( CATCODE_MULTI ) %] - window.open('update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=no,resizable=yes'); + window.open('update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes'); [% ELSE %] confirm_updatechild(); [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt index f73ce2d..81fa3b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt @@ -1,6 +1,16 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Choose Adult category [% INCLUDE 'doc-head-close.inc' %] + + @@ -41,12 +51,15 @@ window.close();
- +
+ + + [% FOREACH CAT_LOO IN CAT_LOOP %] [% END %] +
  Code Description
@@ -55,6 +68,7 @@ window.close();
@@ -72,4 +86,4 @@ window.close(); -[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'popup-bottom.inc' %] -- 1.7.2.5