From 236377c28ee35ed0fa9ef527db8f65189f88e793 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 2 Mar 2011 07:46:32 +0100 Subject: [PATCH] many fixes in Classic and Froxlor templates Signed-off-by: Michael Kaufmann (d00p) --- .../Classic/customer/domains/domains_add.tpl | 1 + .../Classic/customer/domains/domains_edit.tpl | 1 + .../Classic/customer/email/account_add.tpl | 3 +- .../customer/email/account_changepw.tpl | 1 + .../customer/email/account_changequota.tpl | 1 + .../customer/email/autoresponder_add.tpl | 4 +- .../customer/email/autoresponder_edit.tpl | 34 ++------- .../Classic/customer/email/emails_add.tpl | 1 + .../Classic/customer/email/emails_edit.tpl | 21 ++++-- .../Classic/customer/extras/htaccess_add.tpl | 1 + .../Classic/customer/extras/htaccess_edit.tpl | 1 + .../Classic/customer/extras/htpasswds_add.tpl | 1 + .../customer/extras/htpasswds_edit.tpl | 1 + .../Classic/customer/ftp/accounts_add.tpl | 1 + .../Classic/customer/ftp/accounts_edit.tpl | 1 + .../Classic/customer/mysql/mysqls_add.tpl | 1 + .../Classic/customer/mysql/mysqls_edit.tpl | 1 + .../Classic/customer/ticket/tickets_new.tpl | 1 + .../Classic/customer/ticket/tickets_reply.tpl | 1 + .../admin/ipsandports/ipsandports_edit.tpl | 1 + .../admin/templates/filetemplates_edit.tpl | 8 +-- .../admin/templates/templates_edit.tpl | 8 +-- .../customer/email/autoresponder_add.tpl | 50 ++++++------- .../customer/email/autoresponder_edit.tpl | 72 ++++++++----------- .../Froxlor/customer/mysql/mysqls_add.tpl | 2 +- 25 files changed, 103 insertions(+), 115 deletions(-) diff --git a/templates/Classic/customer/domains/domains_add.tpl b/templates/Classic/customer/domains/domains_add.tpl index ff9c2a24..a619ac57 100644 --- a/templates/Classic/customer/domains/domains_add.tpl +++ b/templates/Classic/customer/domains/domains_add.tpl @@ -3,6 +3,7 @@ $header + diff --git a/templates/Classic/customer/domains/domains_edit.tpl b/templates/Classic/customer/domains/domains_edit.tpl index 456e6519..b525daa6 100644 --- a/templates/Classic/customer/domains/domains_edit.tpl +++ b/templates/Classic/customer/domains/domains_edit.tpl @@ -4,6 +4,7 @@ $header +
$title {$title}
diff --git a/templates/Classic/customer/email/account_add.tpl b/templates/Classic/customer/email/account_add.tpl index 2bb422e5..67ca6356 100644 --- a/templates/Classic/customer/email/account_add.tpl +++ b/templates/Classic/customer/email/account_add.tpl @@ -4,11 +4,12 @@ $header +
$title {$title}
- {$account_add_form} + {$account_add_form}
$title {$title}

diff --git a/templates/Classic/customer/email/account_changepw.tpl b/templates/Classic/customer/email/account_changepw.tpl index 34971069..4d189eae 100644 --- a/templates/Classic/customer/email/account_changepw.tpl +++ b/templates/Classic/customer/email/account_changepw.tpl @@ -4,6 +4,7 @@ $header + diff --git a/templates/Classic/customer/email/account_changequota.tpl b/templates/Classic/customer/email/account_changequota.tpl index a4f032b9..ab7464e4 100644 --- a/templates/Classic/customer/email/account_changequota.tpl +++ b/templates/Classic/customer/email/account_changequota.tpl @@ -4,6 +4,7 @@ $header +
{$title} {$title}
diff --git a/templates/Classic/customer/email/autoresponder_add.tpl b/templates/Classic/customer/email/autoresponder_add.tpl index 31879d01..c9434e9d 100644 --- a/templates/Classic/customer/email/autoresponder_add.tpl +++ b/templates/Classic/customer/email/autoresponder_add.tpl @@ -1,12 +1,14 @@ $header + +
{$title} {$title}
- {$autoresponder_add_form} + {$autoresponder_add_form}
{$title} {$title}

diff --git a/templates/Classic/customer/email/autoresponder_edit.tpl b/templates/Classic/customer/email/autoresponder_edit.tpl index cd9f9ddf..2c812748 100644 --- a/templates/Classic/customer/email/autoresponder_edit.tpl +++ b/templates/Classic/customer/email/autoresponder_edit.tpl @@ -1,43 +1,17 @@ $header
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {$autoresponder_edit_form}
{$title} {$title}
{$lng['autoresponder']['account']}:{$email}
{$lng['autoresponder']['active']}:
{$lng['autoresponder']['date_from']} (dd-mm-yyyy): {$date_from_off}
{$lng['autoresponder']['date_until']} (dd-mm-yyyy): {$date_until_off}
{$lng['autoresponder']['subject']}:
{$lng['autoresponder']['message']}:


-$footer \ No newline at end of file +$footer diff --git a/templates/Classic/customer/email/emails_add.tpl b/templates/Classic/customer/email/emails_add.tpl index a2da73cb..68e70473 100644 --- a/templates/Classic/customer/email/emails_add.tpl +++ b/templates/Classic/customer/email/emails_add.tpl @@ -3,6 +3,7 @@ $header + diff --git a/templates/Classic/customer/email/emails_edit.tpl b/templates/Classic/customer/email/emails_edit.tpl index 3f6cc570..c563a460 100644 --- a/templates/Classic/customer/email/emails_edit.tpl +++ b/templates/Classic/customer/email/emails_edit.tpl @@ -1,10 +1,17 @@ $header -
$title {$title}
- - - - {$email_edit_form} -
{$title} {$title}
+
+ + + + + + + + + + {$email_edit_form} +
$title {$title}
+


-$footer \ No newline at end of file +$footer diff --git a/templates/Classic/customer/extras/htaccess_add.tpl b/templates/Classic/customer/extras/htaccess_add.tpl index 0377bb7c..7309138e 100644 --- a/templates/Classic/customer/extras/htaccess_add.tpl +++ b/templates/Classic/customer/extras/htaccess_add.tpl @@ -3,6 +3,7 @@ $header + diff --git a/templates/Classic/customer/extras/htaccess_edit.tpl b/templates/Classic/customer/extras/htaccess_edit.tpl index c14936d7..00adf6b0 100644 --- a/templates/Classic/customer/extras/htaccess_edit.tpl +++ b/templates/Classic/customer/extras/htaccess_edit.tpl @@ -4,6 +4,7 @@ $header +
{$title} {$title}
diff --git a/templates/Classic/customer/extras/htpasswds_add.tpl b/templates/Classic/customer/extras/htpasswds_add.tpl index cd75df0e..bfe1d611 100644 --- a/templates/Classic/customer/extras/htpasswds_add.tpl +++ b/templates/Classic/customer/extras/htpasswds_add.tpl @@ -3,6 +3,7 @@ $header +
{$title} {$title}
diff --git a/templates/Classic/customer/extras/htpasswds_edit.tpl b/templates/Classic/customer/extras/htpasswds_edit.tpl index 290d2331..5cfee755 100644 --- a/templates/Classic/customer/extras/htpasswds_edit.tpl +++ b/templates/Classic/customer/extras/htpasswds_edit.tpl @@ -4,6 +4,7 @@ $header +
{$title} {$title}
diff --git a/templates/Classic/customer/ftp/accounts_add.tpl b/templates/Classic/customer/ftp/accounts_add.tpl index 795f6c7a..79c1aa98 100644 --- a/templates/Classic/customer/ftp/accounts_add.tpl +++ b/templates/Classic/customer/ftp/accounts_add.tpl @@ -3,6 +3,7 @@ $header +
{$title} {$title}
diff --git a/templates/Classic/customer/ftp/accounts_edit.tpl b/templates/Classic/customer/ftp/accounts_edit.tpl index 0d00707d..29af45e8 100644 --- a/templates/Classic/customer/ftp/accounts_edit.tpl +++ b/templates/Classic/customer/ftp/accounts_edit.tpl @@ -4,6 +4,7 @@ $header +
 {$title}
diff --git a/templates/Classic/customer/mysql/mysqls_add.tpl b/templates/Classic/customer/mysql/mysqls_add.tpl index 6fb61ce6..70626afa 100644 --- a/templates/Classic/customer/mysql/mysqls_add.tpl +++ b/templates/Classic/customer/mysql/mysqls_add.tpl @@ -3,6 +3,7 @@ $header +
 {$title}
diff --git a/templates/Classic/customer/mysql/mysqls_edit.tpl b/templates/Classic/customer/mysql/mysqls_edit.tpl index bdd27005..f1723c9d 100644 --- a/templates/Classic/customer/mysql/mysqls_edit.tpl +++ b/templates/Classic/customer/mysql/mysqls_edit.tpl @@ -4,6 +4,7 @@ $header +
 {$title}
diff --git a/templates/Classic/customer/ticket/tickets_new.tpl b/templates/Classic/customer/ticket/tickets_new.tpl index 283738de..fa2f78b6 100644 --- a/templates/Classic/customer/ticket/tickets_new.tpl +++ b/templates/Classic/customer/ticket/tickets_new.tpl @@ -3,6 +3,7 @@ $header +
 {$title}
diff --git a/templates/Classic/customer/ticket/tickets_reply.tpl b/templates/Classic/customer/ticket/tickets_reply.tpl index ab0e613d..333573ae 100644 --- a/templates/Classic/customer/ticket/tickets_reply.tpl +++ b/templates/Classic/customer/ticket/tickets_reply.tpl @@ -4,6 +4,7 @@ $header + $ticket_replies diff --git a/templates/Froxlor/admin/ipsandports/ipsandports_edit.tpl b/templates/Froxlor/admin/ipsandports/ipsandports_edit.tpl index 2cbb1207..891bd2cf 100644 --- a/templates/Froxlor/admin/ipsandports/ipsandports_edit.tpl +++ b/templates/Froxlor/admin/ipsandports/ipsandports_edit.tpl @@ -22,6 +22,7 @@ $header +

diff --git a/templates/Froxlor/admin/templates/filetemplates_edit.tpl b/templates/Froxlor/admin/templates/filetemplates_edit.tpl index 4eca2e25..e435b13e 100644 --- a/templates/Froxlor/admin/templates/filetemplates_edit.tpl +++ b/templates/Froxlor/admin/templates/filetemplates_edit.tpl @@ -13,11 +13,11 @@ $header
Froxlor - {$title} -
 {$title}
- {$filetemplate_edit_form} -
+ + {$filetemplate_edit_form} +
-

+

diff --git a/templates/Froxlor/admin/templates/templates_edit.tpl b/templates/Froxlor/admin/templates/templates_edit.tpl index fff660ae..89775052 100644 --- a/templates/Froxlor/admin/templates/templates_edit.tpl +++ b/templates/Froxlor/admin/templates/templates_edit.tpl @@ -13,11 +13,11 @@ $header

Froxlor - {$title} - - {$template_edit_form} -
+ + {$template_edit_form} +
-

+

diff --git a/templates/Froxlor/customer/email/autoresponder_add.tpl b/templates/Froxlor/customer/email/autoresponder_add.tpl index 7268a1c9..2e5f07c9 100644 --- a/templates/Froxlor/customer/email/autoresponder_add.tpl +++ b/templates/Froxlor/customer/email/autoresponder_add.tpl @@ -1,30 +1,30 @@ $header -

-
-

- {$title}  - {$title} -

-
+
+
+

+ {$title}  + {$title} +

+
-
+
-
-
- Froxlor - {$title} + +
+ Froxlor - {$title} - - {$autoresponder_add_form} -
+ + {$autoresponder_add_form} +
-

- - - - -

-
- -
-
-$footer \ No newline at end of file +

+ + + + +

+
+ + + +$footer diff --git a/templates/Froxlor/customer/email/autoresponder_edit.tpl b/templates/Froxlor/customer/email/autoresponder_edit.tpl index 5e6ffe2a..3c5c85a0 100644 --- a/templates/Froxlor/customer/email/autoresponder_edit.tpl +++ b/templates/Froxlor/customer/email/autoresponder_edit.tpl @@ -1,43 +1,31 @@ $header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['autoresponder']['autoresponder_edit']}
{$lng['autoresponder']['account']}:{$email}
{$lng['autoresponder']['active']}:
{$lng['autoresponder']['date_from']} (dd-mm-yyyy): {$date_from_off}
{$lng['autoresponder']['date_until']} (dd-mm-yyyy): {$date_until_off}
{$lng['autoresponder']['subject']}:
{$lng['autoresponder']['message']}:
-
-
-
-$footer \ No newline at end of file +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$autoresponder_edit_form} +
+ +

+ + + + + +

+
+
+
+
+$footer diff --git a/templates/Froxlor/customer/mysql/mysqls_add.tpl b/templates/Froxlor/customer/mysql/mysqls_add.tpl index c1168dae..66a56345 100644 --- a/templates/Froxlor/customer/mysql/mysqls_add.tpl +++ b/templates/Froxlor/customer/mysql/mysqls_add.tpl @@ -17,7 +17,7 @@ $header {$mysql_add_form} -

+