From b0cf7df69749f4aee360bfa8d0f10fbd9bad5c92 Mon Sep 17 00:00:00 2001 From: tipaul Date: Tue, 16 Mar 2004 13:39:50 +0000 Subject: [PATCH] synch'ing with 2.0 branch --- acqui/newbasket2.pl | 18 +++- admin/authorised_values.pl | 2 +- admin/marc_subfields_structure.pl | 15 ++- .../default/en/acqui/newbasket2.tmpl | 20 ++-- .../default/en/parameters/branches.tmpl | 2 +- .../parameters/marc_subfields_structure.tmpl | 4 + .../en/parameters/systempreferences.tmpl | 95 +++++++++---------- 7 files changed, 94 insertions(+), 62 deletions(-) diff --git a/acqui/newbasket2.pl b/acqui/newbasket2.pl index f3fcd7590d..2d4ea65d70 100755 --- a/acqui/newbasket2.pl +++ b/acqui/newbasket2.pl @@ -138,6 +138,7 @@ while ($i < $count2){ my $itemcount; my $location=''; + my $location_only=''; my $word=$result->{'author'}; $word=~ s/([a-z]) +([a-z])/$1%20$2/ig; $word=~ s/ //g; @@ -154,27 +155,37 @@ while ($i < $count2){ $location .= " ($nacount)"; } $location.=" "; + $lineres{'on-loan-p'}=1; } if ($lcount > 0){ $location .= "Levin"; + $location_only .= "Levin"; if ($lcount >1 ){ $location .= " ($lcount)"; + $location_only .= " ($lcount)"; } $location.=" "; + $location_only.=" "; } if ($fcount > 0){ $location .= "Foxton"; + $location_only .= "Foxton"; if ($fcount >1 ){ $location .= " ($fcount)"; + $location_only .= " ($fcount)"; } $location.=" "; + $location_only.=" "; } if ($scount > 0){ $location .= "Shannon"; + $location_only .= "Shannon"; if ($scount >1 ){ $location .= " ($scount)"; + $location_only .= " ($scount)"; } $location.=" "; + $location_only.=" "; } if ($lostcount > 0){ $location .= "Lost"; @@ -182,6 +193,7 @@ while ($i < $count2){ $location .= " ($lostcount)"; } $location.=" "; + $lineres{'lost-p'}=1; } if ($mending > 0){ $location .= "Mending"; @@ -189,6 +201,7 @@ while ($i < $count2){ $location .= " ($mending)"; } $location.=" "; + $lineres{'mending-p'}=1; } if ($transit > 0){ $location .= "In Transit"; @@ -196,6 +209,7 @@ while ($i < $count2){ $location .= " ($transit)"; } $location.=" "; + $lineres{'in-transit-p'}=1; } if ($colour == 1){ $toggle='#ffffcc'; @@ -216,6 +230,7 @@ while ($i < $count2){ $lineres{toggle}=$toggle; $lineres{itemcount}=$count; $lineres{location}=$location; + $lineres{'location-only'}=$location_only; push(@loopresult,\%lineres); $i++; } @@ -238,6 +253,7 @@ $template->param( bookselname => $booksellers[0]->{'name'}, title => $title, author => $author, loopsearch =>\@loopsearch, - loopresult =>\@loopresult); + loopresult =>\@loopresult, + 'use-location-flags-p' => 1); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 9faa93094d..762476b370 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -62,7 +62,7 @@ my ($template, $borrowernumber, $cookie) flagsrequired => {parameters => 1}, debug => 1, }); -my $pagesize=5; +my $pagesize=20; my $op = $input->param('op'); if ($op) { diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index bf3483010c..44f52abf6b 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -33,7 +33,7 @@ sub StringSearch { $searchstring=~ s/\'/\\\'/g; my @data=split(' ',$searchstring); my $count=@data; - my $sth=$dbh->prepare("Select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where (tagfield like ?) order by tagfield"); + my $sth=$dbh->prepare("Select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where (tagfield like ?) order by tagfield"); $sth->execute("$searchstring%"); my @results; my $cnt=0; @@ -137,7 +137,7 @@ if ($op eq 'add_form') { closedir DIR; # build values list - my $sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where tagfield=?"); # and tagsubfield='$tagsubfield'"); + my $sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where tagfield=?"); # and tagsubfield='$tagsubfield'"); $sth->execute($tagfield); my @loop_data = (); my $toggle="white"; @@ -163,6 +163,7 @@ if ($op eq 'add_form') { $row_data{tagsubfield} =$data->{'tagsubfield'}.""; $row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'}); $row_data{libopac} = CGI::escapeHTML($data->{'libopac'}); + $row_data{seealso} = CGI::escapeHTML($data->{'seealso'}); $row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield", -values=> \@kohafields, -default=> "$data->{'kohafield'}", @@ -187,7 +188,6 @@ if ($op eq 'add_form') { -size=>1, -multiple=>0, ); -# $row_data{kohafield} = $data->{'kohafield'}; $row_data{repeatable} = CGI::checkbox("repeatable$i",$data->{'repeatable'}?'checked':'',1,''); $row_data{mandatory} = CGI::checkbox("mandatory$i",$data->{'mandatory'}?'checked':'',1,''); $row_data{bgcolor} = $toggle; @@ -211,6 +211,7 @@ if ($op eq 'add_form') { $row_data{tagsubfield} = "{'tagsubfield'}."\" size=\"3\" maxlength=\"1\">"; $row_data{liblibrarian} = ""; $row_data{libopac} = ""; + $row_data{seealso} = ""; $row_data{repeatable} = CGI::checkbox('repeatable','',1,''); $row_data{mandatory} = CGI::checkbox('mandatory','',1,''); $row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield', @@ -244,13 +245,14 @@ 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 marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder) - values (?,?,?,?,?,?,?,?,?,?,?)"); + my $sth=$dbh->prepare("replace marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,thesaurus_category,value_builder) + values (?,?,?,?,?,?,?,?,?,?,?,?)"); my @tagsubfield = $input->param('tagsubfield'); my @liblibrarian = $input->param('liblibrarian'); my @libopac = $input->param('libopac'); my @kohafield = $input->param('kohafield'); my @tab = $input->param('tab'); + my @seealso = $input->param('seealso'); my @authorised_values = $input->param('authorised_value'); my @thesaurus_category = $input->param('thesaurus_category'); my @value_builder =$input->param('value_builder'); @@ -264,6 +266,7 @@ if ($op eq 'add_form') { my $mandatory =$input->param("mandatory$i")?1:0; my $kohafield =$kohafield[$i]; my $tab =$tab[$i]; + my $seealso =$seealso[$i]; my $authorised_value =$authorised_values[$i]; my $thesaurus_category =$thesaurus_category[$i]; my $value_builder=$value_builder[$i]; @@ -277,6 +280,7 @@ if ($op eq 'add_form') { $mandatory, $kohafield, $tab, + $seealso, $authorised_value, $thesaurus_category, $value_builder); @@ -336,6 +340,7 @@ if ($op eq 'add_form') { $row_data{repeatable} = $results->[$i]{'repeatable'}; $row_data{mandatory} = $results->[$i]{'mandatory'}; $row_data{tab} = $results->[$i]{'tab'}; + $row_data{seealso} = $results->[$i]{'seealso'}; $row_data{authorised_value} = $results->[$i]{'authorised_value'}; $row_data{thesaurus_category} = $results->[$i]{'thesaurus_category'}; $row_data{value_builder} = $results->[$i]{'value_builder'}; diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl index 8249a0596e..fddad9d296 100755 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl @@ -3,15 +3,15 @@

Shopping Basket For:

- &basket=&sub="> - //images/filenew.png" border=0 align=right alt="Add New Biblio"> + &basket=&sub="> + //images/filenew.png" border=0 align=right alt="Add New Biblio"> - &basket=&sub="> - //images/filenew.png" border=0 align=right alt="Add New Biblio"> + &basket=&sub="> + //images/filenew.png" border=0 align=right alt="Add New Biblio"> -"> -//images/1uparrow.png" border=0 align=right alt="View Basket"> +"> +//images/1uparrow.png" border=0 align=right alt="View Basket">
> > @@ -65,7 +65,15 @@ You searched on + +
+ On Loan
+ Lost
+ Mending
+ In Transit
+ + diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl index eb90dbc6cf..3d31751636 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl @@ -123,7 +123,7 @@
-
Ph: +
Phone:
Fax: 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 9194f28960..e912b864a0 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 @@ -15,6 +15,7 @@ Mand Koha field Tab + See also (in searches) Authorised value or
Thesaurus category @@ -27,6 +28,7 @@ + " size=20 maxlength=80>
or
or @@ -79,6 +81,7 @@ Rep ? Mand ? Tab ? + See also ? Auth value ? Thesaurus ? Val build ? @@ -91,6 +94,7 @@ YesNo YesNo + diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl index 9787e17d92..3e53e20178 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl @@ -1,21 +1,21 @@ - + - +

Modify a system preference

-

Add a system preference

+

Add a system preference

- - + " name="Aform" method="post"> + - - + + - + - - - + + +
Variable
Variable">
Variable
Variable
Value">
Explanation">
 
Value" size="60">
Explanation">
 
- + Data recorded -
- + " method="post"> +
- - - + +
+ - - - + " method="post">"> + +
Variable
Value
CONFIRM DELETION
CONFIRM DELETION
" method="post">
- + Data deleted -
- + " method="post"> +
-

System preferences admin

-
- - + + +
- - +
+ - + - +"> - - + + - - +" method="post"> +
Variable Value Explanation    
">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
Edit		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
Delete		">//images/fileopen.png" width="32" hspace="0" vspace="0" border="0">
Edit		">//images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
Delete
- +
- - + +
-
method=post> - - +" method="post"> + +
-- 2.39.2