@@ -, +, @@ --- admin/aqplan.pl | 32 ++++--------------- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 37 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 33 deletions(-) --- a/admin/aqplan.pl +++ a/admin/aqplan.pl @@ -156,17 +156,11 @@ push( @category_list, $$_{'authcat'} ) foreach @$auth_cats_loop; #reorder the list @category_list = sort { $a cmp $b } @category_list; -my $tab_list = CGI::scrolling_list( - -name => 'authcat', - -id => 'authcat', - -values => \@category_list, - -default => $authcat, - -size => 1, - -tabindex => '', - -multiple => 0, -); -$template->param( authcat_dropbox => $tab_list ); +$template->param( authcat_dropbox => { + values => \@category_list, + default => $authcat, + }); my @budgets = @$budgets_ref; my $CGISort; @@ -330,22 +324,8 @@ foreach my $n (@names) { # ------------------------------------------------------------ # DEFAULT DISPLAY BEGINS -my $CGIextChoice = CGI::scrolling_list( - -name => 'MIME', - -id => 'MIME', - -values => ['CSV'], # FIXME translation - -size => 1, - -multiple => 0 -); - -my @dels = ( C4::Context->preference("delimiter") ); -my $CGIsepChoice = CGI::scrolling_list( - -name => 'sep', - -id => 'sep', - -values => \@dels, - -size => 1, - -multiple => 0 -); +my $CGIextChoice = ( 'CSV' ); # FIXME translation +my $CGIsepChoice = ( C4::Context->preference("delimiter") ); my ( @budget_lines, %cell_hash ); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -235,11 +235,25 @@

Filter

- +[% BLOCK planning_types %] +[% SWITCH type %] +[% CASE 'MONTHS' %]by months +[% CASE 'ITEMTYPES' %]by item types +[% CASE 'BRANCHES' %]by libraries +[% END %] +[% END %]
  1. - [% authcat_dropbox %] +
  2. [% IF ( show_mine ) %] @@ -275,13 +289,22 @@
  3. [% IF ( budget_lines ) %]
    -

    Export

    +

    Export

      -
    1. -
    2. [% CGIextChoice %] - [% CGIsepChoice %]
    3. +
    4. +
    5. + + +
    --