From 72f32f7ff7b556a03a0ed7d6aa2539db96224196 Mon Sep 17 00:00:00 2001 From: wolfpac444 Date: Sun, 13 Apr 2003 05:54:18 +0000 Subject: [PATCH] *** empty log message *** --- admin/aqbookfund.pl | 12 +++--------- .../default/en/parameters/admin-home.tmpl | 2 +- .../default/en/parameters/aqbookfund.tmpl | 9 +++------ .../default/en/parameters/aqbudget.tmpl | 2 +- .../default/en/parameters/categorie.tmpl | 2 +- .../default/en/parameters/categoryitem.tmpl | 2 +- .../default/en/parameters/currency.tmpl | 2 +- .../en/parameters/marc_subfields_structure.tmpl | 2 +- .../default/en/parameters/marctagstructure.tmpl | 2 +- .../default/en/parameters/printers.tmpl | 2 +- .../default/en/parameters/stopwords.tmpl | 2 +- .../default/en/parameters/systempreferences.tmpl | 2 +- .../default/en/parameters/z3950servers.tmpl | 2 +- 13 files changed, 17 insertions(+), 26 deletions(-) diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl index 955c2012b0..10f70b3d38 100755 --- a/admin/aqbookfund.pl +++ b/admin/aqbookfund.pl @@ -120,7 +120,6 @@ if ($op eq 'add_form') { $template->param(add_or_modify => $add_or_modify); $template->param(bookfundid =>$bookfundid); $template->param(bookfundname =>$data->{'bookfundname'}); - $template->param(bookfundgroup =>$data->{'bookfundgroup'}); # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## @@ -132,10 +131,9 @@ if ($op eq 'add_form') { my $sth=$dbh->prepare($query); $sth->execute; $sth->finish; - $query = "replace aqbookfund (bookfundid,bookfundname,bookfundgroup) values ("; + $query = "replace aqbookfund (bookfundid,bookfundname) values ("; $query.= $dbh->quote($input->param('bookfundid')).","; - $query.= $dbh->quote($input->param('bookfundname')).","; - $query.= $dbh->quote($input->param('bookfundgroup')).")"; + $query.= $dbh->quote($input->param('bookfundname')).")"; my $sth=$dbh->prepare($query); $sth->execute; $sth->finish; @@ -154,7 +152,6 @@ if ($op eq 'add_form') { $sth->finish; $template->param(bookfundid => $bookfundid); $template->param(bookfundname => $data->{'bookfundname'}); - $template->param(bookfundgroup => $data->{'bookfundgroup'}); # END $OP eq DELETE_CONFIRM ################## DELETE_CONFIRMED ################################## # called by delete_confirm, used to effectively confirm deletion of data in DB @@ -184,22 +181,19 @@ if ($op eq 'add_form') { my @toggle = (); my @bookfundid = (); my @bookfundname = (); - my @bookfundgroup = (); push(@toggle,$toggle); push(@bookfundid,$results->[$i]{'bookfundid'}); push(@bookfundname,$results->[$i]{'bookfundname'}); - push(@bookfundgroup,$results->[$i]{'bookfundgroup'}); if ($toggle eq 'white'){ $toggle="#ffffcc"; } else { $toggle="white"; } - while (@toggle and @bookfundid and @bookfundname and @bookfundgroup) { + while (@toggle and @bookfundid and @bookfundname) { my %row_data; $row_data{toggle} = shift @toggle; $row_data{bookfundid} = shift @bookfundid; $row_data{bookfundname} = shift @bookfundname; - $row_data{bookfundgroup} = shift @bookfundgroup; push(@loop_data, \%row_data); } } diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl index ef25355f73..78c02b3b1b 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl @@ -1,6 +1,6 @@
-Koha admin page
+System parameters
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl index c5e8e26d1f..483ea019f7 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl @@ -9,7 +9,6 @@ - @@ -18,7 +17,6 @@ "> - @@ -97,7 +95,6 @@ -
Parameters
Book fund NameGroup Budget Edit Delete
  ">/images/filefind.png" width=32 hspace=0 vspace=0 border=0 title="budget"> ?op=add_form&bookfundid= ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ?op=delete_confirm&bookfundid=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
Book fund
Name 
Group
 
@@ -114,17 +111,17 @@ Data recorded - +

 

-data deleted +Data deleted
-"" +
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl index 0ea39dfa53..26c3b7094b 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl @@ -142,7 +142,7 @@ Data recorded -data deleted +Data deleted
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl index dc2eafb66a..aa84b981c7 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl @@ -244,7 +244,7 @@
- data deleted + Data deleted
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl index fbb29bf8a8..ee62f12435 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl @@ -239,7 +239,7 @@
- data deleted + Data deleted
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl index 1a49f87847..4d45668b80 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl @@ -153,7 +153,7 @@
- data deleted + Data deleted
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl index 3cc4b33caa..124c04e0d9 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl @@ -59,7 +59,7 @@ - data deleted + Data deleted
' method=post> diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl index b942be0c34..1eeb62aa60 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl @@ -144,7 +144,7 @@
- data deleted + Data deleted
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl index 73b995c5e4..a3eb41fa37 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl @@ -122,7 +122,7 @@
- data deleted + Data deleted
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl index 562907bb74..df2e32c278 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl @@ -99,7 +99,7 @@ - data deleted + Data deleted
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl index 585ab0084f..175c0afc26 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl @@ -208,7 +208,7 @@
- data deleted + Data deleted
-- 2.39.5
Book fund
Name
Group
Name
CONFIRM DELETION