diff options
| author | Guilhem Moulin <guilhem.moulin@fripost.org> | 2013-01-29 02:39:17 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem.moulin@fripost.org> | 2013-01-29 02:39:17 +0100 |
| commit | 38bbf969d6c29891f40973a0db376d5f5ee5ab07 (patch) | |
| tree | 2b0e4a02308b06d14a4361786acf8deb209d9d3d /templates | |
| parent | 7b81775603b8208c995cd1c4a15cd2a287009404 (diff) | |
Factorized the code to add localparts.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/add-alias.html | 18 | ||||
| -rw-r--r-- | templates/add-list.html | 23 | ||||
| -rw-r--r-- | templates/add-user.html | 18 | ||||
| -rw-r--r-- | templates/edit-alias.html | 20 | ||||
| -rw-r--r-- | templates/edit-list.html | 16 | ||||
| -rw-r--r-- | templates/edit-user.html | 26 | ||||
| -rw-r--r-- | templates/list-locals.html | 4 |
7 files changed, 63 insertions, 62 deletions
diff --git a/templates/add-alias.html b/templates/add-alias.html index 2844dad..1a7d7dd 100644 --- a/templates/add-alias.html +++ b/templates/add-alias.html @@ -2,17 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <title>Add alias under <TMPL_VAR NAME=domain></title> + <title>Add alias under <TMPL_VAR NAME=domainname></title> <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" /> </head> <body> <div id="header"> <div class="left column"> <a href="../">Root</a> / - <a href="./"><TMPL_VAR NAME=domain></a> / + <a href="./"><TMPL_VAR NAME=domainname></a> / </div> <div class="right column"> - Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit" + Logged as <a href="<TMPL_VAR NAME=user_URL>/?a=edit" ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a> | <a href="../?a=logout">Log out</a> </div> @@ -21,7 +21,7 @@ <hr/> <div id="content"> - <h1>Add alias under <span class="domain"><TMPL_VAR NAME=domain></span></h1> + <h1>Add alias under <span class="domain"><TMPL_VAR NAME=domainname></span></h1> <TMPL_IF NAME=error> <div class="fail">Error: <TMPL_VAR NAME=error></div> @@ -37,14 +37,14 @@ <input type="hidden" name="t" value="alias" /> <h4 class="label">Alias name</h4> - <input type="text" name="alias" size="15" value="<TMPL_VAR NAME=alias>"/>@<TMPL_VAR NAME=domain> + <input type="text" name="name" size="15" value="<TMPL_VAR NAME=name>"/>@<TMPL_VAR NAME=domainname> <hr/> <h4 class="label">Status</h4> - <select name="isactive"> - <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option> - <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option> + <select name="isActive"> + <option value="1" <TMPL_IF NAME=isActive>selected="selected"</TMPL_IF>>Active</option> + <option value="0" <TMPL_UNLESS NAME=isActive>selected="selected"</TMPL_UNLESS>>Inactive</option> </select> <div class="help"> <b>Warning</b>: emails are <i>not</i> delivered to inactive entries. @@ -61,7 +61,7 @@ <hr/> <h4 class="label">Destination(s)</h4> - <textarea name="maildrop" cols="50" rows="5" ><TMPL_VAR NAME=maildrop></textarea> + <textarea name="destination" cols="50" rows="5" ><TMPL_VAR NAME=destination></textarea> <div class="help"> The list of destinations (one e-mail address per line) that will receive mail for this alias. diff --git a/templates/add-list.html b/templates/add-list.html index 136899d..6e9f8bd 100644 --- a/templates/add-list.html +++ b/templates/add-list.html @@ -2,17 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <title>Add list under <TMPL_VAR NAME=domain></title> + <title>Add list under <TMPL_VAR NAME=domainname></title> <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" /> </head> <body> <div id="header"> <div class="left column"> <a href="../">Root</a> / - <a href="./"><TMPL_VAR NAME=domain></a> / + <a href="./"><TMPL_VAR NAME=domainname></a> / </div> <div class="right column"> - Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit" + Logged as <a href="<TMPL_VAR NAME=user_URL>/?a=edit" ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a> | <a href="../?a=logout">Log out</a> </div> @@ -21,7 +21,7 @@ <hr/> <div id="content"> - <h1>Add list under <span class="domain"><TMPL_VAR NAME=domain></span></h1> + <h1>Add list under <span class="domain"><TMPL_VAR NAME=domainname></span></h1> <TMPL_IF NAME=error> <div class="fail">Error: <TMPL_VAR NAME=error></div> @@ -37,14 +37,14 @@ <input type="hidden" name="t" value="list" /> <h4 class="label">List name</h4> - <input type="text" name="list" size="15" value="<TMPL_VAR NAME=list>"/>@<TMPL_VAR NAME=domain> + <input type="text" name="name" size="15" value="<TMPL_VAR NAME=name>"/>@<TMPL_VAR NAME=domainname> <hr/> <h4 class="label">Status</h4> - <select name="isactive"> - <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option> - <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option> + <select name="isActive"> + <option value="1" <TMPL_IF NAME=isActive>selected="selected"</TMPL_IF>>Active</option> + <option value="0" <TMPL_UNLESS NAME=isActive>selected="selected"</TMPL_UNLESS>>Inactive</option> </select> <div class="help"> <b>Warning</b>: emails are <i>not</i> delivered to inactive entries. @@ -82,8 +82,9 @@ <h4 class="label">Transport</h4> <select name="transport"> - <option value="mailman" <TMPL_UNLESS NAME=isenc>selected="selected"</TMPL_UNLESS>>GNU Mailman</option> - <option value="schleuder" <TMPL_IF NAME=isenc>selected="selected"</TMPL_IF>>Schleuder</option> + <TMPL_LOOP NAME=transport> + <option value="<TMPL_VAR NAME=item>" <TMPL_IF NAME=selected>selected="selected"</TMPL_IF>><TMPL_VAR NAME=name></option> + </TMPL_LOOP> </select> <div class="help"> The mailing list manager. (<i>Note</i>: It is not possible to @@ -103,7 +104,7 @@ <i>Note</i>: No confirmation email will be sent. It may take a while for the list to be created (especially for the Schleuder list manager, as it requires a GPG key creation); Once the list has succefully been created, it will be visible under the - <a href="./">management page for <span class="domain"><TMPL_VAR NAME=domain></span></a>. + <a href="./">management page for <span class="domain"><TMPL_VAR NAME=domainname></span></a>. </div> </div> </form> diff --git a/templates/add-user.html b/templates/add-user.html index 8964c22..67493a1 100644 --- a/templates/add-user.html +++ b/templates/add-user.html @@ -2,17 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <title>Add user under <TMPL_VAR NAME=domain></title> + <title>Add user under <TMPL_VAR NAME=domainname></title> <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" /> </head> <body> <div id="header"> <div class="left column"> <a href="../">Root</a> / - <a href="./"><TMPL_VAR NAME=domain></a> / + <a href="./"><TMPL_VAR NAME=domainname></a> / </div> <div class="right column"> - Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit" + Logged as <a href="<TMPL_VAR NAME=user_URL>/?a=edit" ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a> | <a href="../?a=logout">Log out</a> </div> @@ -21,7 +21,7 @@ <hr/> <div id="content"> - <h1>Add user under <span class="domain"><TMPL_VAR NAME=domain></span></h1> + <h1>Add user under <span class="domain"><TMPL_VAR NAME=domainname></span></h1> <TMPL_IF NAME=error> <div class="fail">Error: <TMPL_VAR NAME=error></div> @@ -37,14 +37,14 @@ <input type="hidden" name="t" value="user" /> <h4 class="label">User name</h4> - <input type="text" name="user" size="15" value="<TMPL_VAR NAME=user>"/>@<TMPL_VAR NAME=domain> + <input type="text" name="name" size="15" value="<TMPL_VAR NAME=name>"/>@<TMPL_VAR NAME=domainname> <hr/> <h4 class="label">Status</h4> - <select name="isactive"> - <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option> - <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option> + <select name="isActive"> + <option value="1" <TMPL_IF NAME=isActive>selected="selected"</TMPL_IF>>Active</option> + <option value="0" <TMPL_UNLESS NAME=isActive>selected="selected"</TMPL_UNLESS>>Inactive</option> </select> <div class="help"> <b>Warning</b>: emails are <i>not</i> delivered to inactive entries. @@ -76,7 +76,7 @@ <hr/> <h4 class="label">Mail forwarding</h4> - <textarea name="forwards" cols="50" rows="5" ><TMPL_VAR NAME=forwards></textarea> + <textarea name="forward" cols="50" rows="5" ><TMPL_VAR NAME=forward></textarea> <div class="help"> An optional list of destinations (one e-mail address per line) that will <i>also</i> receive mail delivered to this user. diff --git a/templates/edit-alias.html b/templates/edit-alias.html index 34425a4..ba2f20d 100644 --- a/templates/edit-alias.html +++ b/templates/edit-alias.html @@ -2,18 +2,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <title>Edit alias <TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></title> + <title>Edit alias <TMPL_VAR NAME=name></title> <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" /> </head> <body> <div id="header"> <div class="left column"> <a href="../../">Root</a> / - <a href="../"><TMPL_VAR NAME=domain></a> / - <TMPL_VAR NAME=alias> / + <a href="../"><TMPL_VAR NAME=domainpart></a> / + <TMPL_VAR NAME=localpart> / </div> <div class="right column"> - Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit" + Logged as <a href="<TMPL_VAR NAME=user_URL>/?a=edit" ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a> | <a href="../../?a=logout">Log out</a> </div> @@ -22,7 +22,7 @@ <hr/> <div id="content"> - <h1>Edit alias <span class="email"><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></span><TMPL_IF NAME=canDelete + <h1>Edit alias <span class="email"><TMPL_VAR NAME=name></span><TMPL_IF NAME=canDelete ><span class="action">[<a href="./?a=delete">delete</a>]</span ></TMPL_IF></h1> @@ -43,9 +43,9 @@ <input type="hidden" name="a" value="edit" /> <h4 class="label" id="status">Status</h4> - <select name="isactive"> - <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option> - <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option> + <select name="isActive"> + <option value="1" <TMPL_IF NAME=isActive>selected="selected"</TMPL_IF>>Active</option> + <option value="0" <TMPL_UNLESS NAME=isActive>selected="selected"</TMPL_UNLESS>>Inactive</option> </select> <div class="help"> <b>Warning</b>: emails are <i>not</i> delivered to inactive entries. @@ -62,11 +62,11 @@ <hr/> <h4 class="label" id="destination">Destination(s)</h4> - <textarea name="maildrop" cols="50" rows="5" ><TMPL_VAR NAME=maildrop></textarea> + <textarea name="destination" cols="50" rows="5" ><TMPL_VAR NAME=destination></textarea> <div class="help"> The list of destinations (one e-mail address per line) that will receive mail sent to - <span class="email"><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></span>. + <span class="email"><TMPL_VAR NAME=name></span>. </div> <hr/> diff --git a/templates/edit-list.html b/templates/edit-list.html index bb26eef..6930fd1 100644 --- a/templates/edit-list.html +++ b/templates/edit-list.html @@ -2,18 +2,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <title>Edit list <TMPL_VAR NAME=list>@<TMPL_VAR NAME=domain></title> + <title>Edit list <TMPL_VAR NAME=name></title> <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" /> </head> <body> <div id="header"> <div class="left column"> <a href="../../">Root</a> / - <a href="../"><TMPL_VAR NAME=domain></a> / - <TMPL_VAR NAME=list> / + <a href="../"><TMPL_VAR NAME=domainpart></a> / + <TMPL_VAR NAME=localpart> / </div> <div class="right column"> - Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit" + Logged as <a href="<TMPL_VAR NAME=user_URL>/?a=edit" ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a> | <a href="../../?a=logout">Log out</a> </div> @@ -22,8 +22,8 @@ <hr/> <div id="content"> - <h1>Edit list <a class="external" target="_blank" href="<TMPL_VAR NAME=listURL>" - ><span class="email"><TMPL_VAR NAME=list>@<TMPL_VAR NAME=domain></span + <h1>Edit list <a class="external" target="_blank" href="<TMPL_VAR NAME=list_URL>" + ><span class="email"><TMPL_VAR NAME=name></span ></a></h1> <TMPL_IF NAME=newChanges> @@ -44,8 +44,8 @@ <h4 class="label" id="status">Status</h4> <select name="isactive"> - <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option> - <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option> + <option value="1" <TMPL_IF NAME=isActive>selected="selected"</TMPL_IF>>Active</option> + <option value="0" <TMPL_UNLESS NAME=isActive>selected="selected"</TMPL_UNLESS>>Inactive</option> </select> <div class="help"> <b>Warning</b>: emails are <i>not</i> delivered to inactive entries. diff --git a/templates/edit-user.html b/templates/edit-user.html index 38d3836..d4b3c86 100644 --- a/templates/edit-user.html +++ b/templates/edit-user.html @@ -2,18 +2,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <title>Edit user <TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></title> + <title>Edit user <TMPL_VAR NAME=name></title> <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" /> </head> <body> <div id="header"> <div class="left column"> <a href="../../">Root</a> / - <a href="../"><TMPL_VAR NAME=domain></a> / - <TMPL_VAR NAME=user> / + <a href="../"><TMPL_VAR NAME=domainpart></a> / + <TMPL_VAR NAME=localpart> / </div> <div class="right column"> - Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit" + Logged as <a href="<TMPL_VAR NAME=user_URL>/?a=edit" ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a> | <a href="../../?a=logout">Log out</a> </div> @@ -22,7 +22,7 @@ <hr/> <div id="content"> - <h1>Edit user <span class="user"><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></span></h1> + <h1>Edit user <span class="user"><TMPL_VAR NAME=name></span></h1> <TMPL_IF NAME=newChanges> @@ -42,9 +42,9 @@ <input type="hidden" name="a" value="edit" /> <h4 class="label" id="status">Status</h4> - <select name="isactive"> - <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option> - <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option> + <select name="isActive"> + <option value="1" <TMPL_IF NAME=isActive>selected="selected"</TMPL_IF>>Active</option> + <option value="0" <TMPL_UNLESS NAME=isActive>selected="selected"</TMPL_UNLESS>>Inactive</option> </select> <div class="help"> <b>Warning</b>: emails are <i>not</i> delivered to inactive entries. @@ -89,14 +89,14 @@ <hr/> <h4 class="label" id="forward">Mail forwarding</h4> - <textarea name="forwards" cols="50" rows="5" ><TMPL_VAR NAME=forwards></textarea> + <textarea name="forward" cols="50" rows="5" ><TMPL_VAR NAME=forward></textarea> <div class="help"> An optional list of destinations (one e-mail address per line) that will receive mail for - <span class="email"><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></span>. + <span class="email"><TMPL_VAR NAME=name></span>. (<i>Note</i>: When not empty, this list cancels delivery to this user, so do not forget to list - <span class="email"><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></span> + <span class="email"><TMPL_VAR NAME=name></span> here as well if you want this mailbox to be delivered too.) </div> @@ -262,9 +262,9 @@ the recipient(s), depending on how the message has been classified. (Adding the extension <span class="email">virus</span> to - the recipient <span class="email"><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></span> + the recipient <span class="email"><TMPL_VAR NAME=name></span> will result into viruses being sent to - <span class="email"><TMPL_VAR NAME=user>+virus@<TMPL_VAR NAME=domain></span>.)</td> + <span class="email"><TMPL_VAR NAME=localpart>+virus@<TMPL_VAR NAME=domainpart></span>.)</td> <td><input type="text" name="amavisAddrExtensionVirus" size="10" /> Virus</td> </tr> <tr> diff --git a/templates/list-locals.html b/templates/list-locals.html index 44ef0be..e677dd8 100644 --- a/templates/list-locals.html +++ b/templates/list-locals.html @@ -11,7 +11,7 @@ <a href="../">Root</a> / <TMPL_VAR NAME=name> / </div> <div class="right column"> - Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit" + Logged as <a href="<TMPL_VAR NAME=user_URL>/?a=edit" ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a> | <a href="../?a=logout">Log out</a> </div> @@ -130,7 +130,7 @@ <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF> <td><span class="list"><TMPL_UNLESS NAME=isPending><a href="<TMPL_VAR NAME=URL>/"></TMPL_UNLESS ><TMPL_VAR NAME=name - ><TMPL_UNLESS NAME=isPending></a> <a class="external" target="_blank" href="<TMPL_VAR NAME=listURL>">➠</a></TMPL_UNLESS></span></td> + ><TMPL_UNLESS NAME=isPending></a> <a class="external" target="_blank" href="<TMPL_VAR NAME=list_URL>">➠</a></TMPL_UNLESS></span></td> <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td> <td><TMPL_IF NAME=isPending><span class="pending">⚑</span> <TMPL_ELSE><TMPL_IF NAME=isActive><span class="active">✔</span> |