diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl index 6e465b64f6..b1e8b63914 100755 --- a/admin/auth_subfields_structure.pl +++ b/admin/auth_subfields_structure.pl @@ -132,6 +132,7 @@ if ($op eq 'add_form') { push (@value_builder,$line); } } + @value_builder= sort {$a cmp $b} @value_builder; closedir DIR; # build values list @@ -240,14 +241,8 @@ if ($op eq 'add_form') { -checked => $data->{'isurl'}?'checked':'', -value => 1, -label => ''); - $row_data{link} = CGI::checkbox( -name => "link$i", - -id => "link$i", - -checked => $data->{'link'}?'checked':'', - -value => 1, - -label => ''); $row_data{row} = $i; $row_data{toggle} = $toggle; - # $row_data{link} = CGI::escapeHTML($data->{'link'}); push(@loop_data, \%row_data); $i++; } @@ -345,12 +340,6 @@ if ($op eq 'add_form') { -tabindex=>'', -multiple=>0, ); - $row_data{link} = CGI::checkbox( -name => "link", - -id => "link$i", - -checked => '', - -value => 1, - -label => ''); - # $row_data{link} = CGI::escapeHTML($data->{'link'}); $row_data{toggle} = $toggle; $row_data{row} = $i; push(@loop_data, \%row_data); @@ -369,12 +358,12 @@ if ($op eq 'add_form') { } elsif ($op eq 'add_validate') { my $dbh = C4::Context->dbh; $template->param(tagfield => "$input->param('tagfield')"); - my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl, link) - values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); + my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl) + values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); my @tagsubfield = $input->param('tagsubfield'); my @liblibrarian = $input->param('liblibrarian'); my @libopac = $input->param('libopac'); - my @kohafield = $input->param('kohafield'); + my @kohafield = ''.$input->param('kohafield'); my @tab = $input->param('tab'); my @seealso = $input->param('seealso'); my @hidden; @@ -385,7 +374,6 @@ if ($op eq 'add_form') { my $authtypecode = $input->param('authtypecode'); my @frameworkcodes = $input->param('frameworkcode'); my @value_builder =$input->param('value_builder'); - my @link =$input->param('link'); for (my $i=0; $i<= $#tagsubfield ; $i++) { my $tagfield =$input->param('tagfield'); my $tagsubfield =$tagsubfield[$i]; @@ -402,7 +390,6 @@ if ($op eq 'add_form') { my $value_builder=$value_builder[$i]; my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens; my $isurl = $input->param("isurl$i")?1:0; - my $link = $input->param("link$i")?1:0; if ($liblibrarian) { unless (C4::Context->config('demo') eq 1) { $sth->execute($authtypecode, @@ -420,7 +407,6 @@ if ($op eq 'add_form') { $value_builder, $hidden, $isurl, - $link, ); } } @@ -485,7 +471,6 @@ if ($op eq 'add_form') { $row_data{value_builder} = $results->[$i]{'value_builder'}; $row_data{hidden} = $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ; $row_data{isurl} = $results->[$i]{'isurl'}; - $row_data{link} = $results->[$i]{'link'}; $row_data{delete} = "$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield=".$results->[$i]{'tagsubfield'}."&authtypecode=$authtypecode"; $row_data{toggle} = $toggle; if ($row_data{tab} eq -1) { diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 376273e0a5..456db3c136 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -155,6 +155,7 @@ if ( $op eq 'add_form' ) { push( @value_builder, $line ); } } + @value_builder= sort {$a cmp $b} @value_builder; closedir DIR; # build values list diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl index 9d57c8e8d5..a97248886e 100755 --- a/authorities/blinddetail-biblio-search.pl +++ b/authorities/blinddetail-biblio-search.pl @@ -60,10 +60,8 @@ my $authtypecode = &GetAuthTypeCode($authid); my $tagslib = &GetTagsLabels(1,$authtypecode); my $auth_type = GetAuthType($authtypecode); - warn "XX = ".$auth_type->{auth_tag_to_report}; my $record =GetAuthority($authid); - warn "record auth :".$record->as_formatted; # open template my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "authorities/blinddetail-biblio-search.tmpl", diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl index dd31ead0e0..34d3cc897b 100644 --- a/circ/transferstoreceive.pl +++ b/circ/transferstoreceive.pl @@ -29,7 +29,6 @@ use C4::Date; use C4::Biblio; use C4::Circulation; use C4::Members; -#use C4::Interface::CGI::Output; use Date::Calc qw( Today Add_Delta_Days diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index fea193529c..f3a0f6f328 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -37,7 +37,6 @@ use Date::Calc qw( ); use C4::Reserves; use C4::Koha; -# use C4::Interface::CGI::Output; my $input = new CGI; diff --git a/koha-tmpl/errors/400.pl b/koha-tmpl/errors/400.pl index cf328e6fa7..a804b4a448 100755 --- a/koha-tmpl/errors/400.pl +++ b/koha-tmpl/errors/400.pl @@ -4,7 +4,6 @@ use strict; use CGI; use C4::Auth; use C4::Output; -use C4::Interface::CGI::Output; use C4::Context; diff --git a/koha-tmpl/errors/401.pl b/koha-tmpl/errors/401.pl index ed02d4e0e0..bd0e8fc6f7 100755 --- a/koha-tmpl/errors/401.pl +++ b/koha-tmpl/errors/401.pl @@ -4,7 +4,6 @@ use strict; use CGI; use C4::Auth; use C4::Output; -use C4::Interface::CGI::Output; use C4::Context; diff --git a/koha-tmpl/errors/402.pl b/koha-tmpl/errors/402.pl index 632d3a6970..de7a2157eb 100755 --- a/koha-tmpl/errors/402.pl +++ b/koha-tmpl/errors/402.pl @@ -4,7 +4,6 @@ use strict; use CGI; use C4::Auth; use C4::Output; -use C4::Interface::CGI::Output; use C4::Context; diff --git a/koha-tmpl/errors/403.pl b/koha-tmpl/errors/403.pl index 9760c467f5..073b3fb56a 100755 --- a/koha-tmpl/errors/403.pl +++ b/koha-tmpl/errors/403.pl @@ -4,7 +4,6 @@ use strict; use CGI; use C4::Auth; use C4::Output; -use C4::Interface::CGI::Output; use C4::Context; diff --git a/koha-tmpl/errors/404.pl b/koha-tmpl/errors/404.pl index 95dc494d43..1af16f76bd 100755 --- a/koha-tmpl/errors/404.pl +++ b/koha-tmpl/errors/404.pl @@ -4,7 +4,6 @@ use strict; use CGI; use C4::Auth; use C4::Output; -use C4::Interface::CGI::Output; use C4::Context; diff --git a/koha-tmpl/errors/500.pl b/koha-tmpl/errors/500.pl index 72d14ea32e..0847d16d6c 100755 --- a/koha-tmpl/errors/500.pl +++ b/koha-tmpl/errors/500.pl @@ -4,7 +4,6 @@ use strict; use CGI; use C4::Auth; use C4::Output; -use C4::Interface::CGI::Output; use C4::Context; diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl index 0f73869a2d..afbad4fe7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl @@ -1,4 +1,7 @@ +Koha -- Authority details + + - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl index fa81273d20..30d8ac30f8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl @@ -28,7 +28,8 @@ function Setorder(myorder){

- + + Phone: Fax:

"> @@ -53,7 +54,7 @@ function Setorder(myorder){

Missing Issues

- +
@@ -69,7 +70,7 @@ function Setorder(myorder){
 
- " onclick="document.claims.op='send_alert';"> + " onclick="document.claims.op='send_alert';" /> @@ -98,7 +99,7 @@ function Setorder(myorder){
-

There are no missing issues to claim

+

Select a supplier

@@ -146,7 +147,7 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let

Missing Issues

- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl index 0540627183..af7a9891b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl @@ -1,13 +1,13 @@ -Koha › MARC biblio export +Koha › MARC biblio export -

Select biblios to export

+

Select biblios to export

- Note : The items are exported by this tool. + Note : The items are exported by this tool unless specified.

@@ -15,15 +15,17 @@ Records -

- - - - -

- -

- +

+ + +

+

+ + +

+ +

+ -

- -

- - +

-

- - - - +

+ + +

+

+ +

Options +

-
+

+

splitted by a blank. (for example: 100a 200 606) -
+

Output format -

- - - format. -

-
- - +

+ + + format. +

+ + + diff --git a/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl index e4d55699a3..db7694dc40 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl @@ -46,7 +46,7 @@

" />

" />

" />

-

" />

+

" />

- + diff --git a/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl index 0f73869a2d..503be495e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl @@ -1,4 +1,7 @@ +Koha -- Détails autorité + + - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl index db8aebc15a..556c9a6df2 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl @@ -73,7 +73,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl index 73e401b936..f6c7527b6c 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl @@ -7,7 +7,7 @@ Constructeur du label - +
Supplier Title Code Adresse CatégorieIdentifiant site Adresses IP du site Imprimante du site    
@@ -307,7 +307,7 @@ - +
1-4 Taille enregistrement(auto-rempli)