From 4a0d87e642c4d97ee2a026f1207e25a001518f3a Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 8 Sep 2012 19:49:11 +0200 Subject: Abstracting the LDAP stuff in an OO library. --- template/add-alias.html | 35 ++++++++-------- template/add-list.html | 89 ++++++++++++++++++++++++++++++++++++++++ template/add-mailbox.html | 100 +++++++++++++++++++++++++++++++++++++++++++++ template/edit-alias.html | 37 ++++++++--------- template/edit-domain.html | 35 ++++++++-------- template/edit-list.html | 33 ++++++++------- template/edit-mailbox.html | 49 +++++++++++----------- template/error.html | 10 ++--- template/error_http.html | 4 +- template/list-domains.html | 18 ++++---- template/list-locals.html | 90 +++++++++++++++++++--------------------- template/login.html | 4 +- 12 files changed, 339 insertions(+), 165 deletions(-) create mode 100644 template/add-list.html create mode 100644 template/add-mailbox.html (limited to 'template') diff --git a/template/add-alias.html b/template/add-alias.html index 38193c6..0055012 100644 --- a/template/add-alias.html +++ b/template/add-alias.html @@ -2,28 +2,28 @@ - Edit alias <TMPL_VAR NAME=ALIAS>@<TMPL_VAR NAME=DOMAIN> + Add alias under <TMPL_VAR NAME=domain>
- -

Add alias under

- -
Error:
+

Add alias under

+ + +
Error:

@@ -33,20 +33,20 @@
- +

Alias name

- @ + @

Status

- + +
Warning: emails are not delivered to inactive entries. @@ -57,7 +57,7 @@

Description

- +
An optional description. (HTML tags are allowed.)
@@ -67,7 +67,7 @@

Destination(s)

- +
The list of destinations (one e-mail address per line) that will receive mail for this alias. @@ -76,7 +76,6 @@
-
diff --git a/template/add-list.html b/template/add-list.html new file mode 100644 index 0000000..e50db3e --- /dev/null +++ b/template/add-list.html @@ -0,0 +1,89 @@ + + + + + Add list under <TMPL_VAR NAME=domain> + + + + +
+ +

Add list under

+ + +
Error:
+ +
+ + +
+ +
+
+ + + +

+

List name

+ @ +

+ +
+ +

+

Status

+ +
+ Warning: emails are not delivered to inactive entries. +
+

+ +
+ +

+

Description

+ +
+ An optional description. (HTML tags are allowed.) +
+

+ +
+ +

+

Transport

+ +
+ The mailing list manager (it is not possible to switch once + the list has been created). The two current choices are the + well-known GNU Mailman, and + Schleuder. The + latter offers GPG-enagbled lists (only). +
+

+ +
+ + +
+
+ + diff --git a/template/add-mailbox.html b/template/add-mailbox.html new file mode 100644 index 0000000..fd7e521 --- /dev/null +++ b/template/add-mailbox.html @@ -0,0 +1,100 @@ + + + + + Add mailbox under <TMPL_VAR NAME=domain> + + + + +
+ +

Add mailbox under

+ + +
Error:
+ +
+ + +
+ +
+
+ + + +

+

User name

+ @ +

+ +
+ +

+

Status

+ +
+ Warning: emails are not delivered to inactive entries. +
+

+ +
+ +

+

Password

+ + + + + + + + + + +
Password
Repeat password
+

+ +
+ +

+

Description

+ +
+ An optional description. (HTML tags are allowed.) +
+

+ +
+ +

+

Mail forwarding

+ +
+ An optional list of destinations (one e-mail address per line) that + will also receive mail delivered to this mailbox. +
+

+ +
+ + +
+
+ + diff --git a/template/edit-alias.html b/template/edit-alias.html index 7ff19c8..4390652 100644 --- a/template/edit-alias.html +++ b/template/edit-alias.html @@ -2,30 +2,30 @@ - Edit alias <TMPL_VAR NAME=ALIAS>@<TMPL_VAR NAME=DOMAIN> + Edit alias <TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain>
- -

Edit alias @

- - -
Error:
+

Edit alias @

+ + + +
Error:
Your changes have succesfully been submitted.
 @@ -43,9 +43,9 @@

Status

- + >Active +
Warning: emails are not delivered to inactive entries. @@ -57,7 +57,7 @@

Description

- +
An optional description. (HTML tags are allowed.)
@@ -68,17 +68,16 @@

Destination(s)

- +
The list of destinations (one e-mail address per line) that will receive mail sent to - @. + @.

-
diff --git a/template/edit-domain.html b/template/edit-domain.html index 3b66087..7e8ba2c 100644 --- a/template/edit-domain.html +++ b/template/edit-domain.html @@ -2,29 +2,29 @@ - Edit domain <TMPL_VAR NAME=DOMAIN> + Edit domain <TMPL_VAR NAME=domain>
- -

Edit domain

- - -
Error:
+

Edit domain

+ + + +
Error:
Your changes have succesfully been submitted.
 @@ -41,9 +41,9 @@

Status

- + >Active +
Warning: emails are not delivered to mailboxes, @@ -56,7 +56,7 @@

Description

- +
An optional description. (HTML tags are allowed.)
@@ -67,20 +67,19 @@

Catch-All aliases

- +
An optional list of destinations (one e-mail address per line) that will receive mail sent to non existing recipients. Domain aliases can be defined by leaving the local part of the destination empty, like in @example.org: email - to inexisting@ + to inexisting@ will then be sent to inexisting@example.org.

-
diff --git a/template/edit-list.html b/template/edit-list.html index 6118dd0..d07f9da 100644 --- a/template/edit-list.html +++ b/template/edit-list.html @@ -2,30 +2,30 @@ - Edit mailbox <TMPL_VAR NAME=MAILBOX>@<TMPL_VAR NAME=DOMAIN> + Edit list <TMPL_VAR NAME=list>@<TMPL_VAR NAME=domain>
- -

Edit list @

- - -
+

Edit list @

+ + + +
Your changes have succesfully been submitted.
 @@ -43,9 +43,9 @@

Status

- + >Active +
Warning: emails are not delivered to inactive entries. @@ -57,7 +57,7 @@

Description

- +
An optional description. (HTML tags are allowed.)
@@ -65,7 +65,6 @@
-
diff --git a/template/edit-mailbox.html b/template/edit-mailbox.html index 69b91ab..3dce6e7 100644 --- a/template/edit-mailbox.html +++ b/template/edit-mailbox.html @@ -2,30 +2,30 @@ - Edit mailbox <TMPL_VAR NAME=MAILBOX>@<TMPL_VAR NAME=DOMAIN> + Edit mailbox <TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain>
- -

Edit mailbox @

- - -
Error:
+

Edit mailbox @

+ + + +
Error:
Your changes have succesfully been submitted.
 @@ -43,9 +43,9 @@

Status

- + >Active +
Warning: emails are not delivered to inactive entries. @@ -57,26 +57,26 @@

Change password

- + - + - + - +
Current password
New password
Repeat new password
Note: You need to enter - @'s + @'s current password first.

@@ -86,7 +86,7 @@

Description

- +
An optional description. (HTML tags are allowed.)
@@ -97,17 +97,16 @@

Mail forwarding

- +
An optional list of destinations (one e-mail address per line) that - will also receive mail sent to - @. + will also receive mail delivered to + @.

-
diff --git a/template/error.html b/template/error.html index b7f8930..5c1d0f1 100644 --- a/template/error.html +++ b/template/error.html @@ -6,16 +6,16 @@ -

+

- + If you think it is a bug, please report it to - . + .

- +
-

Back

 +

Back

 diff --git a/template/error_http.html b/template/error_http.html index 34d444b..7cf4f50 100644 --- a/template/error_http.html +++ b/template/error_http.html @@ -2,10 +2,10 @@ - <TMPL_IF NAME=MESSAGE><TMPL_VAR NAME=MESSAGE><TMPL_ELSE>Error</TMPL_IF> + <TMPL_IF NAME=message><TMPL_VAR NAME=message><TMPL_ELSE>Error</TMPL_IF> -

+

diff --git a/template/list-domains.html b/template/list-domains.html index bb29de5..561f788 100644 --- a/template/list-domains.html +++ b/template/list-domains.html @@ -11,33 +11,31 @@ Root /
- Logged as @ - | Log out + Logged as @ + | Log out

-

Manage domains[add]

+

Manage domains[add]

- - + - - - - + + + diff --git a/template/list-locals.html b/template/list-locals.html index b0aa2e4..76c2951 100644 --- a/template/list-locals.html +++ b/template/list-locals.html @@ -2,34 +2,34 @@ - Manage domain <TMPL_VAR NAME=DOMAIN> + Manage domain <TMPL_VAR NAME=domain>
-

Manage domain [edit domain]

+

Manage domain [edit domain]

-

+

-

Domain status: ActiveInactive

+

Domain status: ActiveInactive

- -

Mailboxes[add] +

Mailboxes[add]

@@ -44,15 +44,15 @@

- + - - - - + + + + - + @@ -62,9 +62,9 @@
- -

Alias[add] +

Alias[add]

@@ -74,30 +74,25 @@

- - + - - - - - + + + + - - - - + + + + - - + @@ -107,9 +102,9 @@
- -

Lists[add] +

Lists[add]

@@ -119,19 +114,16 @@

- - + - - - - - + + + + diff --git a/template/login.html b/template/login.html index 293f20f..766dd7d 100644 --- a/template/login.html +++ b/template/login.html @@ -30,11 +30,11 @@
DomainPermissions Description Active
(none)(none)✔✘(none)✔✘
(none)✔✘(none) - , (none)✔✘(none) + , (none)(none)
Alias Description ActiveOwner(s) Destination(s)
(none)✔✘(none) - , (none) - , (none)✔✘(none) + ,
*Catch-all alias(es) for domain .
*Catch-all alias(es) for domain . —(none) - , , ,
List Description ActiveOwner(s) Tranport
(none)✔✘(none) - , (none)✔✘
- +
-

Invalid username or password.

 +

Invalid username or password.

 -- cgit v1.2.3