From c3587ee5ca0c4620f83c6c02bb6dd8e9c8d0a3ef Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 1 Nov 2007 12:34:29 +0000 Subject: [PATCH] Umstellung der HTML-Vorlagen aus templates/webpages/ustva von HTML::Template auf Template. --- bin/mozilla/ustva.pl | 8 +- templates/webpages/ustva/config_step1_de.html | 47 +++--- .../webpages/ustva/config_step1_master.html | 47 +++--- templates/webpages/ustva/config_step2_de.html | 97 +++++------ .../webpages/ustva/config_step2_master.html | 99 +++++------ .../webpages/ustva/generic_taxreport_de.html | 4 +- .../ustva/generic_taxreport_master.html | 6 +- templates/webpages/ustva/report_de.html | 158 +++++++++--------- templates/webpages/ustva/report_master.html | 158 +++++++++--------- 9 files changed, 304 insertions(+), 320 deletions(-) diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index 4229d24c3..6818a0058 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -69,7 +69,7 @@ use SL::User; # $locale->text('Nov') # $locale->text('Dec') -# $form->parse_html_template('generic/util_hidden_variables'); +# $form->parse_html_template2('generic/util_hidden_variables'); ############################# @@ -217,7 +217,7 @@ sub report { }; - print($form->parse_html_template('ustva/report', $template_ref)); + print($form->parse_html_template2('ustva/report', $template_ref)); @@ -1161,7 +1161,7 @@ sub config_step1 { }; # Ausgabe des Templates - print($form->parse_html_template('ustva/config_step1', $template_ref)); + print($form->parse_html_template2('ustva/config_step1', $template_ref)); $lxdebug->leave_sub(); } @@ -1301,7 +1301,7 @@ sub config_step2 { }; # Ausgabe des Templates - print($form->parse_html_template('ustva/config_step2', $template_ref)); + print($form->parse_html_template2('ustva/config_step2', $template_ref)); $lxdebug->leave_sub(); diff --git a/templates/webpages/ustva/config_step1_de.html b/templates/webpages/ustva/config_step1_de.html index 9b05b7ce4..aa14665d7 100644 --- a/templates/webpages/ustva/config_step1_de.html +++ b/templates/webpages/ustva/config_step1_de.html @@ -1,33 +1,33 @@ - - + -
- + +
Finanzamt - Einstellungen

- +[%- IF COA_Germany %]
Angaben zum Finanzamt
- + [% select_tax_office %]

- +[%- END %]
Versteuerungs Verfahren > + [% checked_accrual %]>
> + [% checked_cash %]>

@@ -37,24 +37,24 @@ > + [% checked_monthly %]>
> + [% checked_quarterly %]>
> + [% checked_dauerfristverlaengerung %]> - +
Steuerberater/-in -
- - - + [%- FOREACH var = hidden_variables %] + + [%- END %]
- diff --git a/templates/webpages/ustva/config_step1_master.html b/templates/webpages/ustva/config_step1_master.html index 4f5421fbe..6b827b4fc 100644 --- a/templates/webpages/ustva/config_step1_master.html +++ b/templates/webpages/ustva/config_step1_master.html @@ -1,33 +1,33 @@ - - + -
- + +
Tax Office Preferences

- +[%- IF COA_Germany %]
Local Tax Office Preferences
- + [% select_tax_office %]

- +[%- END %]
Taxation > + [% checked_accrual %]>
> + [% checked_cash %]>

@@ -37,24 +37,24 @@ > + [% checked_monthly %]>
> + [% checked_quarterly %]>
> + [% checked_dauerfristverlaengerung %]> - +
Tax Consultant -
- - - + [%- FOREACH var = hidden_variables %] + + [%- END %]
- \ No newline at end of file diff --git a/templates/webpages/ustva/config_step2_de.html b/templates/webpages/ustva/config_step2_de.html index 07c0d2682..7465d1fe4 100644 --- a/templates/webpages/ustva/config_step2_de.html +++ b/templates/webpages/ustva/config_step2_de.html @@ -1,10 +1,10 @@ - -
+ @@ -89,61 +89,61 @@ Öffnungszeiten - +
Bankverbindung des Finanzamts -
@@ -13,12 +13,12 @@

- +
- Finanzamt - + Finanzamt + [% HTML.escape(FA_Name) %] @@ -37,23 +37,23 @@
> + value="[% HTML.escape(FA_Name) %]" [% readonly %]>
> + value="[% HTML.escape(FA_Strasse) %]" [% readonly %]>
> + value="[% HTML.escape(FA_PLZ) %]" [% readonly %]> > + value="[% HTML.escape(FA_Ort) %]" [% readonly %]>
@@ -65,21 +65,21 @@ Telefon
> + value="[% HTML.escape(FA_Telefon) %]" [% readonly %]> +

-
Fax
> + value="[% HTML.escape(FA_Fax) %]" [% readonly %]>

Internet
> + value="[% HTML.escape(FA_Email) %]" [% readonly %]>

> + value="[% HTML.escape(FA_Internet) %]" [% readonly %]>
+
Bank
- > +

Kontonummer
- > + +

-
Bankleitzahl (BLZ)
- > + 		Bank
> + value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>

Kontonummer
> + value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]> +

-
Bankleitzahl (BLZ)
> + value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
- + - + @@ -155,12 +155,12 @@ Steuernummer
- - - +[%- IF COA_Germany %] + [% input_steuernummer %] +[%- ELSE %] Bitte bei den Einstellungen des aktuellen Benutzers im Administrationsmodul angeben. - +[%- END %]
@@ -173,39 +173,40 @@ Bitte bei den Einstellungen des aktuellen Benutzers im Administrationsmodul - - - + [%- IF callback %] + + [%- ELSE %] - + [%- END %] + + [%- IF warnung %] - - - + - + [%- ELSE %] - + [%- END %] -

+

[%- saved %]

- - - +[%- FOREACH var = hidden_variables %] + +[%- END %] +
diff --git a/templates/webpages/ustva/config_step2_master.html b/templates/webpages/ustva/config_step2_master.html index 616a292dd..548cc23f4 100644 --- a/templates/webpages/ustva/config_step2_master.html +++ b/templates/webpages/ustva/config_step2_master.html @@ -1,10 +1,10 @@ - -
+ @@ -89,61 +89,61 @@ Openings - +
Bank Connection Tax Office -
@@ -13,12 +13,12 @@

- +
- Tax Office - + Tax Office + [% HTML.escape(FA_Name) %] @@ -37,23 +37,23 @@
> + value="[% HTML.escape(FA_Name) %]" [% readonly %]>
> + value="[% HTML.escape(FA_Strasse) %]" [% readonly %]>
> + value="[% HTML.escape(FA_PLZ) %]" [% readonly %]> > + value="[% HTML.escape(FA_Ort) %]" [% readonly %]>
@@ -65,21 +65,21 @@ Telephone
> + value="[% HTML.escape(FA_Telefon) %]" [% readonly %]> +

-
Fax
> + value="[% HTML.escape(FA_Fax) %]" [% readonly %]>

Internet
> + value="[% HTML.escape(FA_Email) %]" [% readonly %]>

> + value="[% HTML.escape(FA_Internet) %]" [% readonly %]>
+
Bank
- > +

Account Nummer
- > + +

-
Bank Code (long)
- > + 		Bank
> + value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>

Account Nummer
> + value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]> +

-
Bank Code (long)
> + value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
- + - + @@ -155,12 +155,12 @@ Tax Number
- - - +[%- IF COA_Germany %] + [% input_steuernummer %] +[%- ELSE %] Please enter the taxnumber in the administration menu user preferences - +[%- END %]
@@ -173,41 +173,42 @@ preferences - - - + [%- IF callback %] + + [%- ELSE %] - + [%- END %] + + [%- IF warnung %] - - - + - + [%- ELSE %] - + [%- END %] -

+

[%- saved %]

- - - +[%- FOREACH var = hidden_variables %] + +[%- END %] +
- \ No newline at end of file + diff --git a/templates/webpages/ustva/generic_taxreport_de.html b/templates/webpages/ustva/generic_taxreport_de.html index cf5a021ac..bac661098 100644 --- a/templates/webpages/ustva/generic_taxreport_de.html +++ b/templates/webpages/ustva/generic_taxreport_de.html @@ -10,10 +10,8 @@ Position Betrag -[% SET row_odd = '1' %] [% FOREACH row = USTVA %] - + [% HTML.escape(row.id) %] [% HTML.escape(row.amount) %] diff --git a/templates/webpages/ustva/generic_taxreport_master.html b/templates/webpages/ustva/generic_taxreport_master.html index c93a95565..faf3d96c8 100644 --- a/templates/webpages/ustva/generic_taxreport_master.html +++ b/templates/webpages/ustva/generic_taxreport_master.html @@ -10,10 +10,8 @@ Tax Position Amount -[% SET row_odd = '1' %] [% FOREACH row = USTVA %] - + [% HTML.escape(row.id) %] [% HTML.escape(row.amount) %] @@ -23,4 +21,4 @@ SET row_odd = '1' %][% END %]"> - \ No newline at end of file + diff --git a/templates/webpages/ustva/report_de.html b/templates/webpages/ustva/report_de.html index e09b74afc..5a84c540f 100644 --- a/templates/webpages/ustva/report_de.html +++ b/templates/webpages/ustva/report_de.html @@ -1,15 +1,15 @@ - - + -
+ - + - + @@ -21,153 +21,152 @@ Firma - - - - + + [% company_given %] + [% address_given %] +

Tel.:  - + [% HTML.escape(co_tel) %]
Fax.:  - + [% HTML.escape(co_fax) %]

- + [% HTML.escape(co_email) %]

Steuernummer:  - - +[%- IF COA_Germany %] + [% taxnumber_given %]
ELSTER-Steuernummer:  - + [% HTML.escape(elstersteuernummer) %]

- - - +[%- ELSE %] + [% taxnumber %] +[%- END %]
- - + + [%- IF FA_steuerberater_name %]
-  Steuerberater/-in - -
-
-
- Telefon
+ + [% HTML.escape(FA_steuerberater_name) %]
+ [% HTML.escape(FA_steuerberater_street) %]
+ [% HTML.escape(FA_steuerberater_city) %]
+ Telefon [% HTML.escape(FA_steuerberater_tel) %]

- + [%- END %]
Voranmeldungszeitraum - - + [% select_year %] [% ustva_vorauswahl %] + [% checkbox_kz_10 %]
- + [%- IF FA_voranmeld %]
- - + [% period_local %] + [%- IF FA_dauerfrist %] mit Dauerfristverlängerung - + [%- END %]
- - - - Verfahren: - + [%- END %] + + [%- IF method_local %] + Verfahren: [% method_local %] + [%- END %]
- @@ -181,12 +180,12 @@
[% HTML.escape(title) %]
+
Finanzamt -

- - +

[% HTML.escape(FA_Name) %]

+ + [% HTML.escape(FA_Strasse) %]
-     + [% HTML.escape(FA_PLZ) %]   [% HTML.escape(FA_Ort) %]

Tel.:  - -
+ [% HTML.escape(FA_Telefon) %] +
Fax.:  - + [% HTML.escape(FA_Fax) %]

- ""> - + %0D%0A%0D%0A[% HTML.escape(signature) %]""> + [% HTML.escape(FA_Email) %]
- - + + [% HTML.escape(FA_Internet) %]

Öffnungszeiten
- + [% openings %]

Bankverbindungen - + [%- FOREACH row = "tax_office_banks" %] - + [%- END %]
- -
+ [% HTML.escape(row.Bankbezeichnung) %] +
Konto:  - + [% HTML.escape(row.Kontonummer) %]
BLZ:  - + [% HTML.escape(row.BLZ) %]

- -
- + +
+
Ausgabeformat - - - +[%- IF COA_Germany %] + [% select_options %] +[%- ELSE %] - +[%- END %]

- + - - - - + + + + -
@@ -204,11 +203,6 @@ -->
+ - - - - - diff --git a/templates/webpages/ustva/report_master.html b/templates/webpages/ustva/report_master.html index 5e2687e92..dbde6256f 100644 --- a/templates/webpages/ustva/report_master.html +++ b/templates/webpages/ustva/report_master.html @@ -1,15 +1,15 @@ - - + - + - + - + @@ -21,153 +21,152 @@ Company - - - - + + [% company_given %] + [% address_given %] +

Tel.:  - + [% HTML.escape(co_tel) %]
Fax.:  - + [% HTML.escape(co_fax) %]

- + [% HTML.escape(co_email) %]

Tax Number:  - - +[%- IF COA_Germany %] + [% taxnumber_given %]
ELSTER Tax Number:  - + [% HTML.escape(elstersteuernummer) %]

- - - +[%- ELSE %] + [% taxnumber %] +[%- END %]
- - + + [%- IF FA_steuerberater_name %]
-  Tax Consultant - -
-
-
- Tel.
+ + [% HTML.escape(FA_steuerberater_name) %]
+ [% HTML.escape(FA_steuerberater_street) %]
+ [% HTML.escape(FA_steuerberater_city) %]
+ Tel. [% HTML.escape(FA_steuerberater_tel) %]

- + [%- END %]
Tax Period - - + [% select_year %] [% ustva_vorauswahl %] + [% checkbox_kz_10 %]
- + [%- IF FA_voranmeld %]
- - + [% period_local %] + [%- IF FA_dauerfrist %] With Extension Of Time - + [%- END %]
- - - - Method: - + [%- END %] + + [%- IF method_local %] + Method: [% method_local %] + [%- END %]
- @@ -181,12 +180,12 @@
[% HTML.escape(title) %]
+
Tax Office -

- - +

[% HTML.escape(FA_Name) %]

+ + [% HTML.escape(FA_Strasse) %]
-     + [% HTML.escape(FA_PLZ) %]   [% HTML.escape(FA_Ort) %]

Tel.:  - -
+ [% HTML.escape(FA_Telefon) %] +
Fax.:  - + [% HTML.escape(FA_Fax) %]

- ""> - + %0D%0A%0D%0A[% HTML.escape(signature) %]""> + [% HTML.escape(FA_Email) %]
- - + + [% HTML.escape(FA_Internet) %]

Openings
- + [% openings %]

Bank Connections - + [%- FOREACH row = "tax_office_banks" %] - + [%- END %]
- -
+ [% HTML.escape(row.Bankbezeichnung) %] +
Account:  - + [% HTML.escape(row.Kontonummer) %]
Bank Code:  - + [% HTML.escape(row.BLZ) %]

- -
- + +
+
Outputformat - - - +[%- IF COA_Germany %] + [% select_options %] +[%- ELSE %] - +[%- END %]

- + - - - - + + + + -
@@ -204,11 +203,6 @@ -->
+ - - - - - -- 2.20.1