[Koha-cvs] koha label-home.pl [dev_week]

[Mason James]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Mason James <sushi>     07/07/16 01:36:57

Modified files:
        .              : label-home.pl 

Log message:
                updating devweek with newer commits from rel22.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/label-home.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.4&r2=1.1.2.1.2.5

Patches:
Index: label-home.pl
===================================================================
RCS file: /sources/koha/koha/Attic/label-home.pl,v
retrieving revision 1.1.2.1.2.4
retrieving revision 1.1.2.1.2.5
diff -u -b -r1.1.2.1.2.4 -r1.1.2.1.2.5
--- label-home.pl       8 Jul 2007 22:14:21 -0000       1.1.2.1.2.4
+++ label-home.pl       16 Jul 2007 01:36:57 -0000      1.1.2.1.2.5
@@ -24,22 +24,31 @@
     }
 );
 
-my $data = get_label_options();
-
+# little block for displaying active layout/template/batch in templates
+# ----------
+my $batch_id     = $query->param('batch_id');
+my $active_layout = get_active_layout();
 my $active_template = GetActiveLabelTemplate();
-my @label_templates = GetAllLabelTemplates();
-
-#warn Dumper @label_templates;
+my $active_layout_name = $active_layout->{'layoutname'};
+my $active_template_name = $active_template->{'tmpl_code'};
+# ----------
 
-my @printingtypes       = get_printingtypes();
 
-#my @layouts       = get_layouts();
-my @layouts       = get_layout("5");
+my $data = get_label_options();
+my $op =  $query->param('op');
+my $layout_id =  $query->param('layout_id');
 
+my @label_templates = GetAllLabelTemplates();
+my @printingtypes       = get_printingtypes();
+my @layouts       = get_layouts();
 my @barcode_types = get_barcode_types();
 my @batches = get_batches();
 
-my $text_fields = get_text_fields();
+if ($op = 'delete_layout') {
+delete_layout($layout_id);
+}
+
+
 
  
 ###  $data
@@ -50,26 +59,31 @@
 $template->param( "startrow" . $data->{'startrow'} . "_checked" => 1 );
 
 $template->param(
-    active_template => $data->{'active_template'},
+    op => $op,
+    active_layout_name => $active_layout_name,
+    active_template_name => $active_template_name,
+
     label_templates => address@hidden,
     barcode_types   => address@hidden,
     printingtypes    => address@hidden,
 layout_loop => address@hidden,
 
 batches => address@hidden,
-      papertype => $data->{'papertype'},
-    author         => $data->{'author'},
-    barcode        => $data->{'barcode'},
     id             => $data->{'id'},
     barcodetype    => $data->{'barcodetype'},
-    title          => $data->{'title'},
-    isbn           => $data->{'isbn'},
-    issn           => $data->{'issn'},
-    itemtype            => $data->{'itemtype'},
-    dewey          => $data->{'dewey'},
-    class          => $data->{'class'},
-    subclass       => $data->{'subclass'},
-    itemcallnumber => $data->{'itemcallnumber'},
+      papertype => $data->{'papertype'},
+
+    tx_author         => $data->{'author'},
+    tx_barcode        => $data->{'barcode'},
+   tx_title          => $data->{'title'},
+    tx_isbn           => $data->{'isbn'},
+    tx_issn           => $data->{'issn'},
+    tx_itemtype            => $data->{'itemtype'},
+    tx_dewey          => $data->{'dewey'},
+    tx_class          => $data->{'class'},
+    tx_subclass       => $data->{'subclass'},
+    tx_itemcallnumber => $data->{'itemcallnumber'},
+
     startlabel     => $data->{'startlabel'},
     fontsize       => $active_template->{'fontsize'},