From b5ce8cae5e524a74fb802eb5169a8a3c4673d6dd Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Wed, 26 Mar 2008 09:43:34 -0400 Subject: [PATCH] Fixes to make all label/patron card templates uniform Signed-off-by: Joshua Ferraro --- .../prog/en/modules/labels/label-home.tmpl | 6 ++---- .../prog/en/modules/labels/label-profiles.tmpl | 9 +++++++-- .../prog/en/modules/labels/label-templates.tmpl | 10 +++++++--- labels/label-profiles.pl | 13 +++++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl index c74c940684..dc191fbbca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl @@ -16,11 +16,10 @@ -
+
-
-Set Active Layout +

Set Active Layout

@@ -58,7 +57,6 @@
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-profiles.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-profiles.tmpl index 2b4a8a23e9..631d46087d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-profiles.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-profiles.tmpl @@ -30,6 +30,8 @@ function confirm_deletion(prof_id) { +
+

Printer Profiles

@@ -82,8 +84,11 @@ function confirm_deletion(prof_id) { No Printer Profiles currently defined. - - +
+
+ +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl index 868750c638..533214b8dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl @@ -12,9 +12,9 @@
- - +
+

Templates

@@ -59,7 +59,11 @@ - +
+
+ +
+
diff --git a/labels/label-profiles.pl b/labels/label-profiles.pl index 2cc9893b00..cc4c9036cb 100755 --- a/labels/label-profiles.pl +++ b/labels/label-profiles.pl @@ -23,6 +23,15 @@ my $prof_id = $query->param('prof_id'); #my $creep_horz = $query->param('creep_horz'); #my $creep_vert = $query->param('creep_vert'); +# 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 $active_layout_name = $active_layout->{'layoutname'}; +my $active_template_name = $active_template->{'tmpl_code'}; +# ---------- + my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "labels/label-profiles.tmpl", @@ -44,6 +53,10 @@ if ( $op eq 'delete' ) { @resultsloop = GetAllPrinterProfiles(); $template->param( + batch_id => $batch_id, + active_layout_name => $active_layout_name, + active_template_name => $active_template_name, + resultsloop => \@resultsloop, ); -- 2.39.5