From 6d4a5c26514d56e6c847f35fd2f31d1c38cf662e Mon Sep 17 00:00:00 2001 From: oleonard Date: Tue, 20 Jun 2006 16:21:42 +0000 Subject: [PATCH] Adding "tabindex=''" to CGI:scrolling_lists to prevent incorrect tabbing. See Bug 1098 --- acqui/acquire.pl | 3 +++ acqui/lateorders.pl | 2 ++ acqui/newbasket2.pl | 3 +++ acqui/newbiblio.pl | 3 +++ admin/aqbookfund.pl | 1 + admin/aqbudget.pl | 1 + admin/auth_subfields_structure.pl | 11 ++++++++--- admin/auth_tag_structure.pl | 1 + admin/authorised_values.pl | 1 + admin/koha2marclinks.pl | 12 +++++++----- admin/marc_subfields_structure.pl | 15 +++++++++++++++ admin/marctagstructure.pl | 3 +++ admin/thesaurus.pl | 2 ++ authorities/authorities-home.pl | 2 ++ authorities/authorities.pl | 1 + bookshelves/addbookbybiblionumber.pl | 4 ++++ bull/lateissues.pl | 1 + bull/subscription-bib-search.pl | 1 + circ/circulation.pl | 1 + export/marc.pl | 1 + .../intranet-tmpl/npl/en/acqui/supplier.tmpl | 13 ++++++++++++- members/imemberentry.pl | 1 + members/memberentry.pl | 3 +++ opac/opac-addbookbybiblionumber.pl | 4 ++++ request.pl | 1 + search.marc/search.pl | 3 +++ thesaurus_popup.pl | 2 ++ 27 files changed, 87 insertions(+), 9 deletions(-) diff --git a/acqui/acquire.pl b/acqui/acquire.pl index 4e424a224b..0f7ba852b7 100755 --- a/acqui/acquire.pl +++ b/acqui/acquire.pl @@ -78,6 +78,7 @@ if ($count == 1){ # -default => $results[0]->{'itemtype'}, # -labels => \%itemtypes, # -size => 1, +# -tabindex=>'', # -multiple => 0 ); # $sth->finish; @@ -94,6 +95,7 @@ if ($count == 1){ -default => $results[0]->{'branchcode'}, -labels => \%select_branches, -size => 1, + -tabindex=>'', -multiple => 0 ); my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0; @@ -121,6 +123,7 @@ if ($count == 1){ # -default => $results[0]->{'bookfundid'}, # -labels => \%select_bookfunds, # -size => 1, +# -tabindex=>'', # -multiple => 0 ); if ($results[0]->{'quantityreceived'} == 0){ diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl index 8034fa4b06..9288075302 100755 --- a/acqui/lateorders.pl +++ b/acqui/lateorders.pl @@ -39,6 +39,7 @@ my $CGIsupplier=CGI::scrolling_list( -name => 'supplierid', -default => $supplierid, -labels => \%supplierlist, -size => 1, + -tabindex=>'', -multiple => 0 ); $template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid); @@ -57,6 +58,7 @@ my $CGIbranch=CGI::scrolling_list( -name => 'branch', -values => \@select_branches, -labels => \%select_branches, -size => 1, + -tabindex=>'', -multiple => 0 ); my ($count, @lateorders) = getlateorders($delay,$supplierid,$branch); diff --git a/acqui/newbasket2.pl b/acqui/newbasket2.pl index ab7100710c..d9644ed4ca 100755 --- a/acqui/newbasket2.pl +++ b/acqui/newbasket2.pl @@ -222,6 +222,7 @@ while ($i < $count2){ $lineres{biblionumber}=$result->{biblionumber}; $lineres{title}=$result->{title}; $lineres{author}=$result->{author}; + $lineres{colour}=$colour; $lineres{toggle}=$toggle; $lineres{itemcount}=$count; $lineres{location}=$location; @@ -246,6 +247,8 @@ $template->param( bookselname => $booksellers[0]->{'name'}, author => $author, loopsearch =>\@loopsearch, loopresult =>\@loopresult, + intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), + intranetstylesheet => C4::Context->preference("intranetstylesheet"), 'use-location-flags-p' => 1); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/acqui/newbiblio.pl b/acqui/newbiblio.pl index 845ba8f325..26fc63228a 100755 --- a/acqui/newbiblio.pl +++ b/acqui/newbiblio.pl @@ -106,6 +106,7 @@ my $CGIitemtype=CGI::scrolling_list( -name => 'format', -default => $data->{'itemtype'}, -labels => \%itemtypes, -size => 1, + -tabindex=>'', -multiple => 0 ); $sth->finish; @@ -123,6 +124,7 @@ my $CGIbranch=CGI::scrolling_list( -name => 'branch', -default => $data->{'branchcode'}, -labels => \%select_branches, -size => 1, + -tabindex=>'', -multiple => 0 ); # build bookfund list @@ -139,6 +141,7 @@ my $CGIbookfund=CGI::scrolling_list( -name => 'bookfund', -default => $data->{'bookfundid'}, -labels => \%select_bookfunds, -size => 1, + -tabindex=>'', -multiple => 0 ); my $bookfundname; my $bookfundid; diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl index 4beca309dc..542fbd5da7 100755 --- a/admin/aqbookfund.pl +++ b/admin/aqbookfund.pl @@ -127,6 +127,7 @@ my $CGIbranch=CGI::scrolling_list( -name => 'branchcode', -values => \@select_branch, -labels => \%select_branches, -size => 1, + -tabindex=>'', -multiple => 0 ); $template->param(CGIbranch => $CGIbranch); diff --git a/admin/aqbudget.pl b/admin/aqbudget.pl index 90a3916e84..bc718c3581 100755 --- a/admin/aqbudget.pl +++ b/admin/aqbudget.pl @@ -151,6 +151,7 @@ if ($op eq 'add_form') { # -labels => \%select_branches, # -default => ($dataaqbookfund->{branchcode}?$dataaqbookfund->{branchcode}:$dataaqbudget->{branchcode}), # -size => 1, +# -tabindex=>'', # -multiple => 0 ); # $template->param(CGIbranch => $CGIbranch); diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl index 80fa769ec0..78474bf014 100755 --- a/admin/auth_subfields_structure.pl +++ b/admin/auth_subfields_structure.pl @@ -124,9 +124,10 @@ if ($op eq 'add_form') { }, -default=>$data->{'tab'}, -size=>1, + -tabindex=>'', -multiple=>0, ); - $row_data{tagsubfield} =$data->{'tagsubfield'}.""; + $row_data{tagsubfield} =$data->{'tagsubfield'}."{'tagsubfield'}."\" />"; $row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'}); $row_data{libopac} = CGI::escapeHTML($data->{'libopac'}); $row_data{seealso} = CGI::escapeHTML($data->{'seealso'}); @@ -134,12 +135,14 @@ if ($op eq 'add_form') { -values=> \@authorised_values, -default=>$data->{'authorised_value'}, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{value_builder} = CGI::scrolling_list(-name=>'value_builder', -values=> \@value_builder, -default=>$data->{'value_builder'}, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{repeatable} = CGI::checkbox("repeatable$i",$data->{'repeatable'}?'checked':'',1,''); @@ -157,9 +160,10 @@ if ($op eq 'add_form') { }, -default=>"", -size=>1, + -tabindex=>'', -multiple=>0, ); - $row_data{tagsubfield} = "{'tagsubfield'}."\" size=\"3\" maxlength=\"1\">"; + $row_data{tagsubfield} = "{'tagsubfield'}."\" size=\"3\" maxlength=\"1\" />"; $row_data{liblibrarian} = ""; $row_data{libopac} = ""; $row_data{seealso} = ""; @@ -168,6 +172,7 @@ if ($op eq 'add_form') { $row_data{authorised_value} = CGI::scrolling_list(-name=>'authorised_value', -values=> \@authorised_values, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{bgcolor} = $toggle; @@ -176,7 +181,7 @@ if ($op eq 'add_form') { $template->param('use-heading-flags-p' => 1); $template->param('heading-edit-subfields-p' => 1); $template->param(action => "Edit subfields", - tagfield => "$tagfield", + tagfield => "$tagfield", loop => \@loop_data, more_subfields => $more_subfields, more_tag => $tagfield); diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl index 85876c3da0..41c103ce3d 100755 --- a/admin/auth_tag_structure.pl +++ b/admin/auth_tag_structure.pl @@ -118,6 +118,7 @@ if ($op eq 'add_form') { my $authorised_value = CGI::scrolling_list(-name=>'authorised_value', -values=> \@authorised_values, -size=>1, + -tabindex=>'', -multiple=>0, -default => $data->{'authorised_value'}, ); diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index d9812c3631..1a4c0185e4 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -157,6 +157,7 @@ if ($op eq 'add_form') { -values=> \@category_list, -default=>"", -size=>1, + -tabindex=>'', -multiple=>0, ); if (!$searchfield) { diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl index ec225fbe6b..873aa8d8ff 100755 --- a/admin/koha2marclinks.pl +++ b/admin/koha2marclinks.pl @@ -74,6 +74,7 @@ if ($op eq 'add_form') { -values=> \@marcarray, -default=>"$defaulttagfield $defaulttagsubfield - $defaultliblibrarian", -size=>1, + -tabindex=>'', -multiple=>0, ); $template->param("marclist$i" => $marclist); @@ -129,11 +130,12 @@ if ($op eq 'add_form') { $template->param(loop => \@loop_data, tablename => CGI::scrolling_list(-name=>'tablename', -values=>['biblio','biblioitems','items','bibliosubject','bibliosubtitle','additionalauthors'], - -default=>$tablename, - -size=>1, - -multiple=>0 - ) - ); + -default=>$tablename, + -size=>1, + -tabindex=>'', + -multiple=>0 + ) + ); } #---- END $OP eq DEFAULT $template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), intranetstylesheet => C4::Context->preference("intranetstylesheet"), diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 5b17129a8f..0870b9e1a7 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -172,6 +172,7 @@ if ($op eq 'add_form') { }, -default=>$data->{'tab'}, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{tagsubfield} =$data->{'tagsubfield'}."{'tagsubfield'}."\" id=\"tagsubfield\">"; @@ -183,6 +184,7 @@ if ($op eq 'add_form') { -values=> \@kohafields, -default=> "$data->{'kohafield'}", -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{authorised_value} = CGI::scrolling_list(-name=>'authorised_value', @@ -190,6 +192,7 @@ if ($op eq 'add_form') { -values=> \@authorised_values, -default=>$data->{'authorised_value'}, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{value_builder} = CGI::scrolling_list(-name=>'value_builder', @@ -197,6 +200,7 @@ if ($op eq 'add_form') { -values=> \@value_builder, -default=>$data->{'value_builder'}, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{authtypes} = CGI::scrolling_list(-name=>'authtypecode', @@ -204,16 +208,19 @@ if ($op eq 'add_form') { -values=> \@authtypes, -default=>$data->{'authtypecode'}, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i", -checked => $data->{'repeatable'}?'checked':'', -value => 1, + -tabindex=>'', -label => '', -id => "repeatable$i"); $row_data{mandatory} = CGI::checkbox(-name => "mandatory$i", -checked => $data->{'mandatory'}?'checked':'', -value => 1, + -tabindex=>'', -label => '', -id => "mandatory$i"); $row_data{hidden} = CGI::escapeHTML($data->{hidden}); @@ -221,6 +228,7 @@ if ($op eq 'add_form') { -id => "isurl$i", -checked => $data->{'isurl'}?'checked':'', -value => 1, + -tabindex=>'', -label => ''); $row_data{row} = $i; $row_data{toggle} = $toggle; @@ -241,6 +249,7 @@ if ($op eq 'add_form') { }, -default=>"", -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{tagsubfield} = "{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">"; @@ -252,34 +261,40 @@ if ($op eq 'add_form') { -id => "repeatable$i", -checked => '', -value => 1, + -tabindex=>'', -label => ''); $row_data{mandatory} = CGI::checkbox( -name=> 'mandatory', -id => "mandatory$i", -checked => '', -value => 1, + -tabindex=>'', -label => ''); $row_data{isurl} = CGI::checkbox(-name => 'isurl', -id => "isurl$i", -checked => '', -value => 1, + -tabindex=>'', -label => ''); $row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield', -id => "kohafield$i", -values=> \@kohafields, -default=> "", -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{authorised_value} = CGI::scrolling_list(-name=>'authorised_value', -id => 'authorised_value', -values=> \@authorised_values, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{authtypes} = CGI::scrolling_list(-name=>'authtypecode', -id => 'authtypecode', -values=> \@authtypes, -size=>1, + -tabindex=>'', -multiple=>0, ); $row_data{link} = CGI::escapeHTML($data->{'link'}); diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl index e8abba5952..7dc5eb80af 100755 --- a/admin/marctagstructure.pl +++ b/admin/marctagstructure.pl @@ -119,6 +119,7 @@ if ($op eq 'add_form') { my $authorised_value = CGI::scrolling_list(-name=>'authorised_value', -values=> \@authorised_values, -size=>1, + -tabindex=>'', -id=>"authorised_value", -multiple=>0, -default => $data->{'authorised_value'}, @@ -139,11 +140,13 @@ if ($op eq 'add_form') { repeatable => CGI::checkbox(-name=>'repeatable', -checked=> $data->{'repeatable'}?'checked':'', -value=> 1, + -tabindex=>'', -label => '', -id=> 'repeatable'), mandatory => CGI::checkbox(-name => 'mandatory', -checked => $data->{'mandatory'}?'checked':'', -value => 1, + -tabindex=>'', -label => '', -id => 'mandatory'), authorised_value => $authorised_value, diff --git a/admin/thesaurus.pl b/admin/thesaurus.pl index 9a2de9531b..c98f67c374 100755 --- a/admin/thesaurus.pl +++ b/admin/thesaurus.pl @@ -153,6 +153,7 @@ if ($op eq 'add_form') { -values=> \@category_list, -default=>"$search_category", -size=>1, + -tabindex=>'', -multiple=>0, ); if (!$search_category) { @@ -201,6 +202,7 @@ if ($op eq 'add_form') { -values=> \@category_list, -default=>"$search_category", -size=>1, + -tabindex=>'', -multiple=>0, ); if (!$search_category) { diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl index 4890dec1a5..9a131c9298 100755 --- a/authorities/authorities-home.pl +++ b/authorities/authorities-home.pl @@ -191,6 +191,7 @@ elsif ($op eq "AddStatement") { my $marclist = create_scrolling_list({name=>"marclist", values=> $marcarray, size=> 1, + -tabindex=>'', default=>$marcfields[$i], onChange => "sql_update()"} ); @@ -224,6 +225,7 @@ elsif ($op eq "AddStatement") { my $marclist = create_scrolling_list({name=>"marclist", values=> $marcarray, size=>1, + -tabindex=>'', onChange => "sql_update()"}); push @statements, {"marclist" => $marclist }; diff --git a/authorities/authorities.pl b/authorities/authorities.pl index 62acf6e327..c4f03bd6ec 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -122,6 +122,7 @@ sub build_authorized_values_list ($$$$$) { -default => $value, -labels => \%authorised_lib, -size => 1, + -tabindex=>'', -multiple => 0 ); } diff --git a/bookshelves/addbookbybiblionumber.pl b/bookshelves/addbookbybiblionumber.pl index e7ee61ed02..54fdda7f05 100755 --- a/bookshelves/addbookbybiblionumber.pl +++ b/bookshelves/addbookbybiblionumber.pl @@ -70,6 +70,7 @@ if ($shelfnumber) { -values => \@shelvesloop, -labels => \%shelvesloop, -size => 1, + -tabindex=>'', -multiple => 0 ); $template->param(biblionumber => $biblionumber, @@ -84,6 +85,9 @@ if ($shelfnumber) { output_html_with_http_headers $query, $cookie, $template->output; } # $Log$ +# Revision 1.3.2.4 2006/06/20 16:21:42 oleonard +# Adding "tabindex=''" to CGI:scrolling_lists to prevent incorrect tabbing. See Bug 1098 +# # Revision 1.3.2.3 2006/02/05 21:59:21 kados # Adds script support for IntranetNav ... see mail to koha-devel for # details diff --git a/bull/lateissues.pl b/bull/lateissues.pl index 3f5f910b65..845e7352b2 100755 --- a/bull/lateissues.pl +++ b/bull/lateissues.pl @@ -27,6 +27,7 @@ my $CGIsupplier=CGI::scrolling_list( -name => 'supplierid', -default => $supplierid, -labels => \%supplierlist, -size => 1, + -tabindex=>'', -multiple => 0 ); my @lateissues; diff --git a/bull/subscription-bib-search.pl b/bull/subscription-bib-search.pl index 8b9a722726..b8893ef3b6 100755 --- a/bull/subscription-bib-search.pl +++ b/bull/subscription-bib-search.pl @@ -172,6 +172,7 @@ if ($op eq "do_search") { -values => \@itemtype, -labels => \%itemtypes, -size => 1, + -tabindex=>'', -multiple => 0 ); $sth->finish; diff --git a/circ/circulation.pl b/circ/circulation.pl index 6b05404715..da1b4a4243 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -278,6 +278,7 @@ if ($borrowerslist) { -values => \@values, -labels => \%labels, -size => 7, + -tabindex=>'', -multiple => 0 ); } #title diff --git a/export/marc.pl b/export/marc.pl index 8eb41fa51b..da8e8ee7ef 100755 --- a/export/marc.pl +++ b/export/marc.pl @@ -82,6 +82,7 @@ if ($op eq "export") { -default => '', -labels => \%itemtypes, -size => 1, + -tabindex=>'', -multiple => 0 ); $sth->finish; diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl index e3802846af..ae45986d0a 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl @@ -145,7 +145,13 @@ - " /> % + " /> % + + + + + + @@ -259,6 +265,11 @@ Discount: % + + Notes: + + + diff --git a/members/imemberentry.pl b/members/imemberentry.pl index 3da1e41e3e..b98ffdb9a6 100755 --- a/members/imemberentry.pl +++ b/members/imemberentry.pl @@ -69,6 +69,7 @@ my $CGIbranch=CGI::scrolling_list( -name => 'branchcode', -default => $data->{'branchcode'}, -labels => \%select_branches, -size => 1, + -tabindex=>'', -multiple => 0 ); $template->param(member => $member, diff --git a/members/memberentry.pl b/members/memberentry.pl index 4ddedeb319..3d065ed299 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -186,6 +186,7 @@ if ($delete){ if ($ethnicitycategoriescount>=0) { $ethcatpopup = CGI::popup_menu(-name=>'ethnicity', -id => 'ethnicity', + -tabindex=>'', -values=>$categories, -default=>$data->{'ethnicity'}, -labels=>$labels); @@ -195,6 +196,7 @@ if ($delete){ ($categories,$labels)=borrowercategories(); my $catcodepopup = CGI::popup_menu(-name=>'categorycode', -id => 'categorycode', + -tabindex=>'', -values=>$categories, -default=>$data->{'categorycode'}, -labels=>$labels); @@ -262,6 +264,7 @@ if ($delete){ -default => $data->{'branchcode'}, -labels => \%select_branches, -size => 1, + -tabindex=>'', -multiple => 0 ); my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'}); diff --git a/opac/opac-addbookbybiblionumber.pl b/opac/opac-addbookbybiblionumber.pl index 3aad06ba20..59a979246a 100755 --- a/opac/opac-addbookbybiblionumber.pl +++ b/opac/opac-addbookbybiblionumber.pl @@ -71,6 +71,7 @@ if ($shelfnumber) { -values => \@shelvesloop, -labels => \%shelvesloop, -size => 1, + -tabindex=>'', -multiple => 0 ); } @@ -91,6 +92,9 @@ $template->param(biblionumber => $biblionumber, output_html_with_http_headers $query, $cookie, $template->output; } # $Log$ +# Revision 1.1.2.7 2006/06/20 16:21:43 oleonard +# Adding "tabindex=''" to CGI:scrolling_lists to prevent incorrect tabbing. See Bug 1098 +# # Revision 1.1.2.6 2006/04/27 16:23:34 oleonard # Hiding option to add to existing virtual shelves if there are no existing virtual shelves (thanks Chris!) # diff --git a/request.pl b/request.pl index d12ffb9767..4ba5518dd2 100755 --- a/request.pl +++ b/request.pl @@ -180,6 +180,7 @@ my $CGIbranch=CGI::scrolling_list( -name => 'pickup', -values => \@select_branch, -labels => \%select_branches, -size => 1, + -tabindex=>'', -multiple => 0 ); #get the time for the form name... diff --git a/search.marc/search.pl b/search.marc/search.pl index 43368f5431..c6272c069b 100755 --- a/search.marc/search.pl +++ b/search.marc/search.pl @@ -309,6 +309,7 @@ else { my $marclist = CGI::scrolling_list(-name=>"marclist", -values=> $marcarray, -size=>1, + -tabindex=>'', -multiple=>0, -onChange => "sql_update()", ); @@ -335,6 +336,7 @@ else { -values => \@itemtype, -labels => \%itemtypes, -size => 1, + -tabindex=>'', -multiple => 0 ); $sth->finish; @@ -353,6 +355,7 @@ else { -values => \@select_branch, -labels => \%select_branches, -size => 1, + -tabindex=>'', -multiple => 0 ); $sth->finish; diff --git a/thesaurus_popup.pl b/thesaurus_popup.pl index 62518ba37d..777696acdd 100755 --- a/thesaurus_popup.pl +++ b/thesaurus_popup.pl @@ -97,6 +97,7 @@ if ($search_string) { -values=> \@freelib, -default=> "", -size=>1, + -tabindex=>'', -multiple=>0, -labels=> \%stdlib ); @@ -110,6 +111,7 @@ my $dig_list= CGI::scrolling_list( -name=>'search_string', -values=> \@x, -default=> "", -size=>1, + -tabindex=>'', -multiple=>0, ); -- 2.39.5