From 421d94f7bdf16a8dc8addc7f4f7ba556b6cb7468 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 31 Oct 2007 13:17:31 +0000 Subject: [PATCH] Umstellung einiger Vorlagen von HTML::Template auf Template. --- bin/mozilla/oe.pl | 6 ++-- .../oe/check_for_direct_delivery_de.html | 29 ++++++++++--------- .../oe/check_for_direct_delivery_master.html | 29 ++++++++++--------- templates/webpages/oe/orders_bottom_de.html | 17 ++++++----- .../webpages/oe/orders_bottom_master.html | 17 ++++++----- 5 files changed, 51 insertions(+), 47 deletions(-) diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 3a31a2ee7..eab834bda 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -1087,8 +1087,8 @@ sub orders { } $report->set_options('top_info_text' => join("\n", @options), - 'raw_top_info_text' => $form->parse_html_template('oe/orders_top'), - 'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }), + 'raw_top_info_text' => $form->parse_html_template2('oe/orders_top'), + 'raw_bottom_info_text' => $form->parse_html_template2('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), @@ -1840,7 +1840,7 @@ sub check_for_direct_delivery { $form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ref $_ eq "" } keys %{ $form } ]; $form->header(); - print $form->parse_html_template("oe/check_for_direct_delivery"); + print $form->parse_html_template2("oe/check_for_direct_delivery"); $lxdebug->leave_sub(); diff --git a/templates/webpages/oe/check_for_direct_delivery_de.html b/templates/webpages/oe/check_for_direct_delivery_de.html index 6a307a847..7ab223bc2 100644 --- a/templates/webpages/oe/check_for_direct_delivery_de.html +++ b/templates/webpages/oe/check_for_direct_delivery_de.html @@ -1,4 +1,4 @@ - +[% USE HTML %]

Lieferadresse übernehmen

@@ -8,57 +8,57 @@ - + - + - + - + - + - + - + - + - + - + - +

Name:		[% HTML.escape(CFDD_shiptoname) %]
Abteilung:		[% HTML.escape(CFDD_shiptodepartment_1) %]
		[% HTML.escape(CFDD_shiptodepartment_2) %]
Straße:		[% HTML.escape(CFDD_shiptostreet) %]
PLZ:		[% HTML.escape(CFDD_shiptozipcode) %]
Stadt:		[% HTML.escape(CFDD_shiptocity) %]
Land:		[% HTML.escape(CFDD_shiptocountry) %]
Kontakt:		[% HTML.escape(CFDD_shiptocontact) %]
Telefon:		[% HTML.escape(CFDD_shiptophone) %]
Fax:		[% HTML.escape(CFDD_shiptofax) %]
eMail:		[% HTML.escape(CFDD_shiptoemail) %]

@@ -76,8 +76,9 @@ - - + [%- FOREACH row = VARIABLES %] + + [%- END %] diff --git a/templates/webpages/oe/check_for_direct_delivery_master.html b/templates/webpages/oe/check_for_direct_delivery_master.html index e9e3d8e3c..d434fc2a5 100644 --- a/templates/webpages/oe/check_for_direct_delivery_master.html +++ b/templates/webpages/oe/check_for_direct_delivery_master.html @@ -1,4 +1,4 @@ - +[% USE HTML %]

Carry over shipping address

@@ -8,57 +8,57 @@ - + - + - + - + - + - + - + - + - + - + - +

Name:		[% HTML.escape(CFDD_shiptoname) %]
Department:		[% HTML.escape(CFDD_shiptodepartment_1) %]
		[% HTML.escape(CFDD_shiptodepartment_2) %]
Street:		[% HTML.escape(CFDD_shiptostreet) %]
Zipcode:		[% HTML.escape(CFDD_shiptozipcode) %]
City:		[% HTML.escape(CFDD_shiptocity) %]
Country:		[% HTML.escape(CFDD_shiptocountry) %]
Contact:		[% HTML.escape(CFDD_shiptocontact) %]
Phone:		[% HTML.escape(CFDD_shiptophone) %]
Fax:		[% HTML.escape(CFDD_shiptofax) %]
E-mail:		[% HTML.escape(CFDD_shiptoemail) %]

@@ -76,8 +76,9 @@ - - + [%- FOREACH row = VARIABLES %] + + [%- END %] diff --git a/templates/webpages/oe/orders_bottom_de.html b/templates/webpages/oe/orders_bottom_de.html index 17ec00217..12f1983cf 100644 --- a/templates/webpages/oe/orders_bottom_de.html +++ b/templates/webpages/oe/orders_bottom_de.html @@ -1,12 +1,13 @@ - +[% USE HTML %] + [%- IF SHOW_CONTINUE_BUTTON %] Neuer Auftrag
- + [%- END %] - - - - - - + + + + + + diff --git a/templates/webpages/oe/orders_bottom_master.html b/templates/webpages/oe/orders_bottom_master.html index d2eb9f8b2..0ddcaaa9b 100644 --- a/templates/webpages/oe/orders_bottom_master.html +++ b/templates/webpages/oe/orders_bottom_master.html @@ -1,12 +1,13 @@ - +[% USE HTML %] + [%- IF SHOW_CONTINUE_BUTTON %] New sales order
- + [%- END %] - - - - - - + + + + + + -- 2.20.1