Preparing 3.0.3

[koha.git] / labels / label-home.pl

diff --git a/labels/label-home.pl b/labels/label-home.pl
index cfdcec3..76d55cd 100755 (executable)
--- a/labels/label-home.pl
+++ b/labels/label-home.pl
@@ -7,9 +7,9 @@ use C4::Output;
 use C4::Labels;
 use C4::Output;
 use C4::Context;
-use HTML::Template;
+use HTML::Template::Pro;
 
-use Smart::Comments;
+# use Smart::Comments;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -32,7 +32,6 @@ my $active_layout_name = $active_layout->{'layoutname'};
 my $active_template_name = $active_template->{'tmpl_code'};
 # ----------
 
-
 my $data = get_label_options();
 my $op =  $query->param('op');
 my $layout_id =  $query->param('layout_id');
@@ -41,22 +40,18 @@ my @label_templates = GetAllLabelTemplates();
 my @printingtypes       = get_printingtypes();
 my @layouts       = get_layouts();
 my @barcode_types = get_barcode_types();
-my @batches = get_batches();
+#my @batches = get_batches();   #This is not used afaics -fbcit
 
-if ($op = 'delete_layout') {
-delete_layout($layout_id);
+if ($op eq 'delete_layout') {  # had been assignment! serious error!
+       delete_layout($layout_id);
 }
 
-
-
- 
 ###  $data
 
 $template->param( guidebox => 1 ) if ( $data->{'guidebox'} );
 $template->param( "papertype_$data->{'papertype'}"       => 1 );
 $template->param( "$data->{'barcodetype'}_checked" => 1 );
 $template->param( "startrow" . $data->{'startrow'} . "_checked" => 1 );
-
 $template->param(
     op => $op,
     active_layout_name => $active_layout_name,
@@ -67,7 +62,7 @@ $template->param(
     printingtypes    => \@printingtypes,
 layout_loop => \@layouts,
 
-batches => \@batches,
+#batches => \@batches, #This is not used afaics -fbcit
      id             => $data->{'id'},
     barcodetype    => $data->{'barcodetype'},
       papertype => $data->{'papertype'},
@@ -86,10 +81,6 @@ batches => \@batches,
     startlabel     => $data->{'startlabel'},
     fontsize       => $active_template->{'fontsize'},
 
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;