Factorized the code to list localparts.

11 files changed, 34 insertions, 34 deletions

diff --git a/templates/add-alias.html b/templates/add-alias.html
index ab2d8b7..2844dad 100644
--- a/templates/add-alias.html
+++ b/templates/add-alias.html
@@ -12,7 +12,7 @@
         <a href="./"><TMPL_VAR NAME=domain></a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="../?a=logout">Log out</a>
       </div>
diff --git a/templates/add-domain-1.html b/templates/add-domain-1.html
index a7afc6f..ef7f493 100644
--- a/templates/add-domain-1.html
+++ b/templates/add-domain-1.html
@@ -11,7 +11,7 @@
         <a href="./">Root</a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="./?a=logout">Log out</a>
       </div>
diff --git a/templates/add-domain-2.html b/templates/add-domain-2.html
index 9565d8a..c3a728b 100644
--- a/templates/add-domain-2.html
+++ b/templates/add-domain-2.html
@@ -11,7 +11,7 @@
         <a href="./">Root</a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="./?a=logout">Log out</a>
       </div>
diff --git a/templates/add-list.html b/templates/add-list.html
index d4053bd..136899d 100644
--- a/templates/add-list.html
+++ b/templates/add-list.html
@@ -12,7 +12,7 @@
         <a href="./"><TMPL_VAR NAME=domain></a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="../?a=logout">Log out</a>
       </div>
diff --git a/templates/add-user.html b/templates/add-user.html
index ba54e56..8964c22 100644
--- a/templates/add-user.html
+++ b/templates/add-user.html
@@ -12,7 +12,7 @@
         <a href="./"><TMPL_VAR NAME=domain></a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="../?a=logout">Log out</a>
       </div>
diff --git a/templates/edit-alias.html b/templates/edit-alias.html
index 7e42e4b..34425a4 100644
--- a/templates/edit-alias.html
+++ b/templates/edit-alias.html
@@ -13,7 +13,7 @@
         <TMPL_VAR NAME=alias> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="../../?a=logout">Log out</a>
       </div>
diff --git a/templates/edit-domain.html b/templates/edit-domain.html
index d95c8fb..de765e4 100644
--- a/templates/edit-domain.html
+++ b/templates/edit-domain.html
@@ -12,7 +12,7 @@
         <a href="./"><TMPL_VAR NAME=name></a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="../?a=logout">Log out</a>
       </div>
diff --git a/templates/edit-list.html b/templates/edit-list.html
index ad5311a..bb26eef 100644
--- a/templates/edit-list.html
+++ b/templates/edit-list.html
@@ -13,7 +13,7 @@
         <TMPL_VAR NAME=list> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="../../?a=logout">Log out</a>
       </div>
diff --git a/templates/edit-user.html b/templates/edit-user.html
index 53a2871..38d3836 100644
--- a/templates/edit-user.html
+++ b/templates/edit-user.html
@@ -13,7 +13,7 @@
         <TMPL_VAR NAME=user> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="../../?a=logout">Log out</a>
       </div>
diff --git a/templates/list-domains.html b/templates/list-domains.html
index e0fe52e..f07c4ef 100644
--- a/templates/list-domains.html
+++ b/templates/list-domains.html
@@ -11,7 +11,7 @@
         Root /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="./?a=logout">Log out</a>
       </div>
@@ -34,7 +34,7 @@
       <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=URI>/"></TMPL_UNLESS><TMPL_VAR NAME=name><TMPL_UNLESS NAME=isPending></a></TMPL_UNLESS></span></td>
+                href="<TMPL_VAR NAME=URL>/"></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=name>/?"
                 ><input type="text" name="unlock" size="32"
diff --git a/templates/list-locals.html b/templates/list-locals.html
index 0c3a3ab..44ef0be 100644
--- a/templates/list-locals.html
+++ b/templates/list-locals.html
@@ -2,16 +2,16 @@
 <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>Manage domain <TMPL_VAR NAME=domain></title>
+    <title>Manage 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> / <TMPL_VAR NAME=domain> /
+        <a href="../">Root</a> / <TMPL_VAR NAME=name> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURL>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
         | <a href="../?a=logout">Log out</a>
       </div>
@@ -20,14 +20,14 @@
     <hr/>
 
     <div id="content">
-    <h1>Manage domain <span class="domain"><TMPL_VAR NAME=domain></span
+    <h1>Manage domain <span class="domain"><TMPL_VAR NAME=name></span
         ><TMPL_IF NAME=canEditDomain><span class="action">[<a href="./?a=edit">edit domain</a>]</span></TMPL_IF></h1>
 
     <TMPL_IF NAME=description><p class="description"><TMPL_VAR NAME=description></p></TMPL_IF>
 
     <p id="domainstatus">Domain status:
       <b>
-        <TMPL_IF NAME=isactive><span class="active">Active</span>
+        <TMPL_IF NAME=isActive><span class="active">Active</span>
         <TMPL_ELSE><span class="inactive">Inactive</span>
         </TMPL_IF>
       </b>
@@ -52,11 +52,11 @@
       <tbody>
       <TMPL_LOOP NAME=users>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><span class="user"><a href="<TMPL_VAR NAME=userURI>/"><TMPL_VAR NAME=user></a></span></td>
+          <td><span class="user"><a href="<TMPL_VAR NAME=URL>/"><TMPL_VAR NAME=name></a></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=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
-          <td><TMPL_UNLESS NAME=forwards><span class="none">(none)</span></TMPL_UNLESS>
-              <TMPL_LOOP NAME=forwards><span class="email"><TMPL_VAR NAME=forward></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+          <td><TMPL_IF NAME=isActive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
+          <td><TMPL_UNLESS NAME=forward><span class="none">(none)</span></TMPL_UNLESS>
+              <TMPL_LOOP NAME=forward><span class="email"><TMPL_VAR NAME=item></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
 
           <td><TMPL_IF NAME=quota><TMPL_VAR NAME=quota><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
         </tr>
@@ -72,7 +72,7 @@
        ><span class="action">[<a href="./?a=add&amp;t=alias">add</a>]</span
        ></TMPL_IF><TMPL_IF NAME=listCanAddAlias><span class="permlist"
        >They can also create new aliases:
-       <TMPL_LOOP NAME=listCanAddAlias><span class="email"><TMPL_VAR NAME=user></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP
+       <TMPL_LOOP NAME=listCanAddAlias><span class="email"><TMPL_VAR NAME=item></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP
        >.</span></TMPL_IF></h3>
 
     <table class="list" id="aliases">
@@ -87,19 +87,19 @@
       <tbody>
       <TMPL_LOOP NAME=aliases>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><span class="alias"><a href="<TMPL_VAR NAME=aliasURI>/"><TMPL_VAR NAME=alias></a></span></td>
+          <td><span class="alias"><a href="<TMPL_VAR NAME=URL>/"><TMPL_VAR NAME=name></a></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=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
-          <td><TMPL_UNLESS NAME=destinations><span class="none">(none)</span></TMPL_UNLESS>
-              <TMPL_LOOP NAME=destinations><span class="email"><TMPL_VAR NAME=destination></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+          <td><TMPL_IF NAME=isActive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
+          <td><TMPL_UNLESS NAME=destination><span class="none">(none)</span></TMPL_UNLESS>
+              <TMPL_LOOP NAME=destination><span class="email"><TMPL_VAR NAME=item></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
         </tr>
       </TMPL_LOOP>
-      <TMPL_IF NAME=catchalls>
+      <TMPL_IF NAME=catchAll>
         <TMPL_IF NAME=CAodd><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
          <td><a class="dunno" href="./?a=edit#catch-all">&#x2014;</a></td>
-         <td>Catch-all alias(es) for domain <span class="domain"><TMPL_VAR NAME=domain></span>.</td>
+         <td>Catch-all alias(es) for domain <span class="domain"><TMPL_VAR NAME=name></span>.</td>
          <td><span class="dunno">&#x2014;</span></td>
-         <td><TMPL_LOOP NAME=catchalls><span class="email"><TMPL_VAR NAME=catchall></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+         <td><TMPL_LOOP NAME=catchAll><span class="email"><TMPL_VAR NAME=item></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
         </tr>
       </TMPL_IF>
       </tbody>
@@ -113,7 +113,7 @@
        ><span class="action">[<a href="./?a=add&amp;t=list">add</a>]</span
        ></TMPL_IF><TMPL_IF NAME=listCanAddList><span class="permlist"
        >They can also create new lists:
-       <TMPL_LOOP NAME=listCanAddList><span class="email"><TMPL_VAR NAME=user></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP
+       <TMPL_LOOP NAME=listCanAddList><span class="email"><TMPL_VAR NAME=item></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP
        >.</span></TMPL_IF></h3>
 
     <table class="list" id="lists">
@@ -128,12 +128,12 @@
       <tbody>
       <TMPL_LOOP NAME=lists>
         <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=listURI>/"></TMPL_UNLESS
-             ><TMPL_VAR NAME=list
-             ><TMPL_UNLESS NAME=ispending></a> <a class="external" target="_blank" href="<TMPL_VAR NAME=listURL>">&#x27A0;</a></TMPL_UNLESS></span></td>
+          <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>">&#x27A0;</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">&#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>
           <td><TMPL_VAR NAME=transport></td>
         </tr>