aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem.moulin@fripost.org>2013-01-26 03:09:12 +0100
committerGuilhem Moulin <guilhem.moulin@fripost.org>2013-01-26 03:09:12 +0100
commita11bde40a35dd261ffa35bf1b5d36ef638319295 (patch)
tree57df11adc469d679c2edd50b9b94bc5ec2103645 /templates
parent2981b029975aab774406e3849cd37567033b5d7a (diff)
Restructured the domain part of the interface.
Diffstat (limited to 'templates')
-rw-r--r--templates/add-domain-1.html10
-rw-r--r--templates/add-domain-2.html24
-rw-r--r--templates/edit-domain.html16
-rw-r--r--templates/list-domains.html9
4 files changed, 30 insertions, 29 deletions
diff --git a/templates/add-domain-1.html b/templates/add-domain-1.html
index df6ac65..9b7de76 100644
--- a/templates/add-domain-1.html
+++ b/templates/add-domain-1.html
@@ -35,7 +35,7 @@
<input type="hidden" name="a" value="add" />
<h4 class="label" id="domain">Domain name</h4>
- <input type="text" name="domain" size="15" value="<TMPL_VAR NAME=domain>" />
+ <input type="text" name="name" size="15" value="<TMPL_VAR NAME=name>" />
<div class="help">
The domain name to be added.
@@ -50,9 +50,9 @@
<hr/>
<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 users,
@@ -70,7 +70,7 @@
<hr/>
<h4 class="label" id="catch-all">Catch-All aliases</h4>
- <textarea name="catchalls" cols="50" rows="5" ><TMPL_VAR NAME=catchalls></textarea>
+ <textarea name="catchAlls" cols="50" rows="5" ><TMPL_VAR NAME=catchAlls></textarea>
<div class="help">
An optional list of destinations (one e-mail address per line) that
will receive mail sent to <i>non existing</i> recipients.
diff --git a/templates/add-domain-2.html b/templates/add-domain-2.html
index 56b3086..72bc0d8 100644
--- a/templates/add-domain-2.html
+++ b/templates/add-domain-2.html
@@ -2,7 +2,7 @@
<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 domain <TMPL_VAR NAME=domain></title>
+ <title>Add domain <TMPL_VAR NAME=name></title>
<link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
</head>
<body>
@@ -22,25 +22,25 @@
<div id="content">
<form name="addform" method="post" action="?">
<input type="hidden" name="a" value="add" />
- <input type="hidden" name="domain" value="<TMPL_VAR NAME=domain>" />
- <input type="hidden" name="isactive" value="<TMPL_VAR NAME=isactive>" />
+ <input type="hidden" name="name" value="<TMPL_VAR NAME=name>" />
+ <input type="hidden" name="isActive" value="<TMPL_VAR NAME=isActive>" />
<input type="hidden" name="description" value="<TMPL_VAR NAME=description>" />
- <input type="hidden" name="catchalls" value="<TMPL_VAR NAME=catchalls>" />
+ <input type="hidden" name="catchAlls" value="<TMPL_VAR NAME=catchAlls>" />
- <TMPL_IF NAME=postmasters>
+ <TMPL_IF NAME=owners>
<div class="message">
You have asked to let us manage e-mail
- <span class="email">@<TMPL_VAR NAME=domain></span>.
+ <span class="email">@<TMPL_VAR NAME=name></span>.
Please select an address below where to send a confirmation
token, proving that you indeed own the domain
- <span class="domain"><TMPL_VAR NAME=domain></span>.
+ <span class="domain"><TMPL_VAR NAME=name></span>.
</div>
- <table class="align" id="postmasters">
+ <table class="align" id="owners">
<tbody>
- <TMPL_LOOP NAME=postmasters>
+ <TMPL_LOOP NAME=owners>
<TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
- <td><input type="radio" name="postmaster" value="<TMPL_VAR NAME=postmaster>"/></td>
- <td><span class="email"><TMPL_VAR NAME=postmaster></td>
+ <td><input type="radio" name="owner" value="<TMPL_VAR NAME=owner>"/></td>
+ <td><span class="email"><TMPL_VAR NAME=owner></td>
</tr>
</TMPL_LOOP>
</tbody>
@@ -51,7 +51,7 @@
<div class="error">
I couldn't find a valid e-mail in your domain's WHOIS,
and no valid postmaster address has been found (either because
- <span class="domain"><TMPL_VAR NAME=domain></span> has no configured MX,
+ <span class="domain"><TMPL_VAR NAME=name></span> has no configured MX,
or because it already uses ours).
</div>
<input type="submit" name="cancel" value="Cancel" />
diff --git a/templates/edit-domain.html b/templates/edit-domain.html
index f3b6581..9acd52f 100644
--- a/templates/edit-domain.html
+++ b/templates/edit-domain.html
@@ -2,14 +2,14 @@
<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 domain <TMPL_VAR NAME=domain></title>
+ <title>Edit domain <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> /
+ <a href="./"><TMPL_VAR NAME=name></a> /
</div>
<div class="right column">
Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
@@ -21,7 +21,7 @@
<hr/>
<div id="content">
- <h1>Edit domain <span class="domain"><TMPL_VAR NAME=domain></span></h1>
+ <h1>Edit domain <span class="domain"><TMPL_VAR NAME=name></span></h1>
<TMPL_IF NAME=newChanges>
<TMPL_IF NAME=error>
@@ -66,7 +66,7 @@
will receive mail sent to <i>non existing</i> recipients.
Domain aliases can be defined by leaving the local part of
the destination empty, like in <span class="email">@example.org</span>:
- email to <span class="email">inexisting@<TMPL_VAR NAME=domain></span>
+ email to <span class="email">inexisting@<TMPL_VAR NAME=name></span>
will then be sent to <span class="email">inexisting@example.org</span>.
</div>
@@ -78,13 +78,13 @@
<div class="help">
An optional list of e-mails (one address per line) that are
allowed to create aliases under your domain
- <span class="domain"><TMPL_VAR NAME=domain></span>.
+ <span class="domain"><TMPL_VAR NAME=name></span>.
It is possible to grant right for a whole domain by leaving out
the local part: For instance, listing
<span class="email">@example.org</span> here will give every user
under <span class="domain">example.org</span> the right to
create aliases under
- <span class="domain"><TMPL_VAR NAME=domain></span>.
+ <span class="domain"><TMPL_VAR NAME=name></span>.
<i>Note</i>: You already have this right, so there is no need to
list your e-mail here.
</div>
@@ -96,13 +96,13 @@
<div class="help">
An optional list of e-mails (one address per line) that are
allowed to create mailing lists under your domain
- <span class="domain"><TMPL_VAR NAME=domain></span>.
+ <span class="domain"><TMPL_VAR NAME=name></span>.
It is possible to grant right for a whole domain by leaving out
the local part: For instance, listing
<span class="email">@example.org</span> here will give every user
under <span class="domain">example.org</span> the right to
create mailing lists under
- <span class="domain"><TMPL_VAR NAME=domain></span>.
+ <span class="domain"><TMPL_VAR NAME=name></span>.
<i>Note</i>: You already have this right, so there is no need to
list your e-mail here.
</div>
diff --git a/templates/list-domains.html b/templates/list-domains.html
index 13b8941..c5c662b 100644
--- a/templates/list-domains.html
+++ b/templates/list-domains.html
@@ -33,8 +33,9 @@
<tbody>
<TMPL_LOOP NAME=domains>
<TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
- <td><span class="domain"><TMPL_UNLESS NAME=ispending><a href="<TMPL_VAR NAME=domainURI>/"></TMPL_UNLESS><TMPL_VAR NAME=domain><TMPL_UNLESS NAME=ispending></a></TMPL_UNLESS></span></td>
- <td><TMPL_IF NAME=ispending
+ <td><span class="domain"><TMPL_UNLESS NAME=isPending><a
+ href="<TMPL_VAR NAME=URI>/"></TMPL_UNLESS><TMPL_VAR NAME=name><TMPL_UNLESS NAME=isPending></a></TMPL_UNLESS></span></td>
+ <td><TMPL_IF NAME=isPending
><form class="unlock" method="post" action="<TMPL_VAR NAME=domain>/?"
><input type="text" name="unlock" size="32"
><input type="hidden" name="domain" value="<TMPL_VAR NAME=domain>"
@@ -42,8 +43,8 @@
/></form
><TMPL_ELSE><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF
></TMPL_IF></td>
- <td><TMPL_IF NAME=ispending><span class="pending">&#x2691;</span>
- <TMPL_ELSE><TMPL_IF NAME=isactive><span class="active">&#x2714;</span>
+ <td><TMPL_IF NAME=isPending><span class="pending">&#x2691;</span>
+ <TMPL_ELSE><TMPL_IF NAME=isActive><span class="active">&#x2714;</span>
<TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></TMPL_IF></td>
</tr>
</TMPL_LOOP>