From b13d20d44c71a3735467cd34f29f3d6106cd9630 Mon Sep 17 00:00:00 2001 From: "Andreas Burchert (scarya)" Date: Sat, 12 Feb 2011 18:20:22 +0100 Subject: [PATCH] Fixed email templates in design: Classic, Froxlor --- .../Classic/customer/email/account_add.tpl | 26 +----------- .../customer/email/account_changepw.tpl | 14 +------ .../customer/email/account_changequota.tpl | 14 +------ .../customer/email/autoresponder_add.tpl | 32 +-------------- .../customer/email/autoresponder_edit.tpl | 2 +- .../Classic/customer/email/emails_add.tpl | 20 +--------- .../Classic/customer/email/emails_edit.tpl | 40 +------------------ .../Classic/customer/email/forwarder_add.tpl | 14 +------ .../customer/email/autoresponder_add.tpl | 6 +-- .../Froxlor/customer/email/emails_add.tpl | 6 +-- .../Froxlor/customer/email/emails_edit.tpl | 6 +-- .../Froxlor/customer/email/forwarder_add.tpl | 6 +-- 12 files changed, 27 insertions(+), 159 deletions(-) diff --git a/templates/Classic/customer/email/account_add.tpl b/templates/Classic/customer/email/account_add.tpl index 9ee1b5a4..2bb422e5 100644 --- a/templates/Classic/customer/email/account_add.tpl +++ b/templates/Classic/customer/email/account_add.tpl @@ -6,31 +6,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - - - + + {$account_add_form}
 {$lng['emails']['account_add']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):
{$lng['emails']['alternative_emailaddress']}:
$title {$title}

diff --git a/templates/Classic/customer/email/account_changepw.tpl b/templates/Classic/customer/email/account_changepw.tpl index 1ac9aec3..34971069 100644 --- a/templates/Classic/customer/email/account_changepw.tpl +++ b/templates/Classic/customer/email/account_changepw.tpl @@ -6,19 +6,9 @@ $header - - - - - - - - - - - - + + {$account_changepw}
 {$lng['menue']['main']['changepassword']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
{$title} {$title}

diff --git a/templates/Classic/customer/email/account_changequota.tpl b/templates/Classic/customer/email/account_changequota.tpl index ce53923c..a4f032b9 100644 --- a/templates/Classic/customer/email/account_changequota.tpl +++ b/templates/Classic/customer/email/account_changequota.tpl @@ -6,19 +6,9 @@ $header - - - - - - - - - - - - + + {$quota_edit}
 {$lng['emails']['quota_edit']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):
{$title} {$title}

diff --git a/templates/Classic/customer/email/autoresponder_add.tpl b/templates/Classic/customer/email/autoresponder_add.tpl index 7186e9c9..31879d01 100644 --- a/templates/Classic/customer/email/autoresponder_add.tpl +++ b/templates/Classic/customer/email/autoresponder_add.tpl @@ -4,37 +4,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {$autoresponder_add_form}
 {$lng['autoresponder']['autoresponder_new']}
{$lng['autoresponder']['account']}:
{$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']}:
{$title} {$title}

diff --git a/templates/Classic/customer/email/autoresponder_edit.tpl b/templates/Classic/customer/email/autoresponder_edit.tpl index 5f82e6b1..cd9f9ddf 100644 --- a/templates/Classic/customer/email/autoresponder_edit.tpl +++ b/templates/Classic/customer/email/autoresponder_edit.tpl @@ -5,7 +5,7 @@ $header - + diff --git a/templates/Classic/customer/email/emails_add.tpl b/templates/Classic/customer/email/emails_add.tpl index 44a0852a..a2da73cb 100644 --- a/templates/Classic/customer/email/emails_add.tpl +++ b/templates/Classic/customer/email/emails_add.tpl @@ -5,25 +5,9 @@ $header
 {$lng['autoresponder']['autoresponder_edit']}{$title} {$title}
{$lng['autoresponder']['account']}:
- + - - - - - - - - - - - - - - - - - + {$email_add_form}
 {$lng['emails']['emails_add']}$title {$title}
{$lng['emails']['emailaddress']}: @
{$lng['emails']['iscatchall']}$iscatchall
{$lng['emails']['noemaildomainaddedyet']}

diff --git a/templates/Classic/customer/email/emails_edit.tpl b/templates/Classic/customer/email/emails_edit.tpl index 3b3f8245..3f6cc570 100644 --- a/templates/Classic/customer/email/emails_edit.tpl +++ b/templates/Classic/customer/email/emails_edit.tpl @@ -1,45 +1,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - - + + {$email_edit_form}
 {$lng['emails']['emails_edit']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['emails']['account']}: - - {$lng['panel']['yes']} [{$lng['menue']['main']['changepassword']}] [{$lng['emails']['account_delete']}] - - - {$lng['panel']['no']} [{$lng['emails']['account_add']}] - -
{$lng['customer']['email_quota']}:{$result['quota']} {$lng['panel']['megabyte']} [{$lng['emails']['quota_edit']}]
{$lng['emails']['catchall']}: - - {$lng['panel']['yes']} - - - {$lng['panel']['no']} - - [{$lng['panel']['toggle']}] -
{$lng['emails']['forwarders']} ({$forwarders_count}):$forwarders{$lng['emails']['forwarder_add']}{$title} {$title}


diff --git a/templates/Classic/customer/email/forwarder_add.tpl b/templates/Classic/customer/email/forwarder_add.tpl index 7ec80417..4c0dcf1e 100644 --- a/templates/Classic/customer/email/forwarder_add.tpl +++ b/templates/Classic/customer/email/forwarder_add.tpl @@ -6,19 +6,9 @@ $header - - - - - - - - - - - - + + {$forwarder_add_form}
 {$lng['emails']['forwarder_add']}
{$lng['emails']['from']}:{$result['email_full']}
{$lng['emails']['to']}:
 {$title} {$title}

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

- {$lng['autoresponder']['autoresponder_new']}  - {$lng['autoresponder']['autoresponder_new']} + {$title}  + {$title}

@@ -11,7 +11,7 @@ $header
- Froxlor - {$lng['emails']['forwarder_add']} + Froxlor - {$title} {$autoresponder_add_form} diff --git a/templates/Froxlor/customer/email/emails_add.tpl b/templates/Froxlor/customer/email/emails_add.tpl index 8559dc2f..15764fc8 100644 --- a/templates/Froxlor/customer/email/emails_add.tpl +++ b/templates/Froxlor/customer/email/emails_add.tpl @@ -11,8 +11,8 @@ $header

- {$lng['emails']['emails_add']}  - {$lng['emails']['emails_add']} +   + {$title}

@@ -20,7 +20,7 @@ $header
- Froxlor - {$lng['emails']['emails_add']} + Froxlor - {$title}
{$email_add_form} diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl index fc259a61..f55604fe 100644 --- a/templates/Froxlor/customer/email/emails_edit.tpl +++ b/templates/Froxlor/customer/email/emails_edit.tpl @@ -2,8 +2,8 @@ $header

- {$lng['emails']['emails_edit']}  - {$lng['emails']['emails_edit']} + {$title}  + {$title}

@@ -11,7 +11,7 @@ $header
- Froxlor - {$lng['emails']['emails_edit']} + Froxlor - {$title}
{$email_edit_form} diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl index 509b7258..e075bdbc 100644 --- a/templates/Froxlor/customer/email/forwarder_add.tpl +++ b/templates/Froxlor/customer/email/forwarder_add.tpl @@ -2,8 +2,8 @@ $header

- {$lng['emails']['forwarder_add']}  - {$lng['emails']['forwarder_add']} + {$title}  + {$title}

@@ -11,7 +11,7 @@ $header
- Froxlor - {$lng['emails']['forwarder_add']} + Froxlor - {$title}
{$forwarder_add_form}