X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=patroncards%2Fedit-layout.pl;h=d2446403b9d7bd653d5f1c4f58ebc44c886ce99b;hb=662a98345a71fb170bc6ae5b3679e3edf4eee96f;hp=7b05f6c308271a2d1e767bf53a58f61887bd5aae;hpb=7edf6810e68c74bd0b72d63182897c558b880701;p=koha.git diff --git a/patroncards/edit-layout.pl b/patroncards/edit-layout.pl index 7b05f6c308..d2446403b9 100755 --- a/patroncards/edit-layout.pl +++ b/patroncards/edit-layout.pl @@ -5,36 +5,36 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; use warnings; -use CGI; +use CGI qw ( -utf8 ); use Text::CSV_XS; use XML::Simple; use autouse 'Data::Dumper' => qw(Dumper); use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators::Lib 1.000000 qw(get_barcode_types get_label_types get_font_types get_text_justification_types get_unit_values get_all_image_names); -use C4::Patroncards::Layout 1.000000; +use C4::Creators; +use C4::Patroncards; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "patroncards/edit-layout.tmpl", + template_name => "patroncards/edit-layout.tt", query => $cgi, type => "intranet", authnotrequired => 0, @@ -96,6 +96,8 @@ if ($op eq 'edit') { push @text_fields, ( "field_" . $field_number . "_llx" => $field_params->{'llx'}, "field_" . $field_number . "_lly" => $field_params->{'lly'}, + "field_" . $field_number . "_height_scale" => $field_params->{'height_scale'}, + "field_" . $field_number . "_width_scale" => $field_params->{'width_scale'}, "field_" . $field_number . "_font" => _set_selected($field_params->{'font'}, $font_types), "field_" . $field_number . "_font_size" => $field_params->{'font_size'}, "field_" . $field_number . "_text_alignment" => _set_selected($field_params->{'text_alignment'}, $alignment_types), @@ -138,16 +140,26 @@ if ($op eq 'edit') { # Handle barcodes... my @barcode = (); foreach my $barcode_param (keys %{$layout_xml->{'barcode'}->[0]}) { - push @barcode, (($barcode_param eq 'type' ? ("barcode_" . $barcode_param => _set_selected($layout_xml->{'barcode'}->[0]->{'barcode_type'}, $barcode_types)) : ("barcode_" . $barcode_param => $layout_xml->{'barcode'}->[0]->{$barcode_param}))); + push @barcode, (($barcode_param eq 'type' ? ("barcode_" . $barcode_param => _set_selected($layout_xml->{'barcode'}->[0]->{'type'}, $barcode_types)) : ("barcode_" . $barcode_param => $layout_xml->{'barcode'}->[0]->{$barcode_param}))); + } + + foreach my $unit (@$units){ + if ($unit->{'type'} eq $layout->get_attr('units')) { + $unit->{'selected'} = 1; + } else { + $unit->{'selected'} = 0; + } } $template->param( layout_id => $layout->get_attr('layout_id') > -1 ? $layout->get_attr('layout_id') : '', layout_name => $layout->get_attr('layout_name'), page_side => ($layout_xml->{'page_side'} eq 'F' ? 0 : 1), + guide_box => $layout_xml->{'guide_box'}, + guide_grid => $layout_xml->{'guide_grid'}, units => $units, @barcode, - barcode_type => get_barcode_types(), + barcode_type => _set_selected($layout_xml->{'barcode'}->[0]->{'type'}, $barcode_types), @text_fields, @images, guidebox => 0, @@ -206,10 +218,13 @@ elsif ($op eq 'save') { $layout_id = $cgi->param($parameter) if $parameter eq 'layout_id'; $layout->{'units'} = $cgi->param($parameter) if $parameter eq 'units'; $layout->{'page_side'} = $cgi->param($parameter) if $parameter eq 'page_side'; + $layout->{'guide_box'} = $cgi->param($parameter) if $parameter eq 'guide_box'; + $layout->{'guide_grid'} = $cgi->param($parameter) if $parameter eq 'guide_grid'; } } $layout->{'text'} = $text_lines; my @params = (layout_name => $layout_name, layout_id => $layout_id, layout_xml => XMLout($layout)); + push(@params,units => $layout->{'units'}) if $layout->{'units'}; if ($layout_id) { # if a label_id was passed in, this is an update to an existing layout $layout = C4::Patroncards::Layout->retrieve(layout_id => $layout_id); $layout->set_attr(@params); @@ -225,7 +240,7 @@ elsif ($op eq 'save') { elsif ($op eq 'new') { # this is a new layout $layout = C4::Patroncards::Layout->new(); my @fields = (); - for (my $field; $field < 4; $field++) { # limit 3 text fields + for (my $field = 0; $field < 4; $field++) { # limit 3 text fields push @fields, ( "field_$field" . "_font" => get_font_types(), "field_$field" . "_text_alignment" => get_text_justification_types(), @@ -233,7 +248,7 @@ elsif ($op eq 'new') { # this is a new layout } my @images = (); - for (my $image; $image < 3; $image++) { #limit 2 images + for (my $image = 0; $image < 3; $image++) { #limit 2 images push @images, ( "image_$image" . "_image_source" => $image_sources, "image_$image" . "_image_name" => $image_names,