1 files changed, 16 insertions, 16 deletions
diff --git a/web/templates/contact.html.j2.tmpl b/web/templates/contact.html.j2.tmpl
index d2f7bf9..045ab81 100644
--- a/web/templates/contact.html.j2.tmpl
+++ b/web/templates/contact.html.j2.tmpl
@@ -5,10 +5,9 @@
    norder = '-1'
 %]
 [%- PROCESS 'constants.tt' -%]
-{%if form.get %}
+{% if page.get %}
 <p>All the fields have to be filled in ...</p>
-<p><strong>NB:</strong> As a matter of courtesy you should consider adding your name (or even a pseudonym) in the message to us. You know our names as well. Besides, it makes it easier to address you in a response. Thanks.</p>
-<form action="{% form.uri %}" method="post" accept-charset="utf-8">
+<form action="{{ page.uri }}" method="post" accept-charset="utf-8">
 <table width="100%" summary="Mailform">
 <colgroup>
  <col width="30%" />
@@ -19,7 +18,8 @@
  <b>Who should receive the message?:</b>
  </td>
  <td>
- <select name="{% form.recipient %}">
+ <input type="hidden" name="{{ page.hidden }}" value="{{ page.hidden_value }}" />
+ <select name="{{ page.recipient }}">
   <option value="developers" selected="selected">Developers</option>
   [%- FOREACH key IN gpg_keys.sort('name') -%]<option value="[%- key.name | lower -%]">[%- key.name -%]</option>[%- END -%]
   <option value="team">The whole team</option>
@@ -31,7 +31,7 @@
  <b>Your email address (max. 100 chars):</b>
  </td>
  <td>
- <input type="text" name="{% form.sender %}" maxlength="100" class="feld_" />
+ <input type="text" name="{{ page.sender }}" maxlength="100" class="feld_" />
  </td>
  </tr>
 <tr>
@@ -39,19 +39,19 @@
  <b>Subject (max. 100 chars):</b>
  </td>
  <td>
- <input type="hidden" name="{% form.hidden %}" value="{% form.hidden_value %}" />
- <input type="text" name="{% form.subject %}" maxlength="100" class="feld_" />
+ <input type="text" name="{{ page.subject }}" maxlength="100" class="feld_" />
  </td>
  </tr>
 <tr>
  <td colspan="2">
- <b>Here goes your text:</b><br />
- <textarea name="{% form.message %}" rows="15" cols="60" class="feld3"></textarea>
+ <div><b>Here goes your text (barring technical issues it will be transmitted as encrypted email!):</b></div>
+ <textarea name="{{ page.message }}" rows="15" cols="60" class="feld3"></textarea>
  </td>
  </tr>
 <tr>
  <td colspan="2" style="text-align:center; ">
- <input type="submit" value="{% form.send %}" class="btn" />
+ <div><strong>NB:</strong> As a matter of courtesy you should consider adding your name (or even a pseudonym) in the message to us. You know our names as well. Besides, it makes it easier to address you in a response. Thank you.</div>
+ <input type="submit" value="{{ page.send }}" class="btn" />
  </td>
  </tr>
 </table>
@@ -83,24 +83,24 @@ establish whether PGP/MIME can be used in future communication.
 [%- END -%]
 </ul>
 {% else %}
-{% if post.success %}
-<header><h1><span lang="en">Success</span> / <span lang="de">Erfolg</span></h1></header>
+{% if page.success %}
+<h1><span lang="en">Success</span> / <span lang="de">Erfolg</span></h1>
 <section lang="en">
   <h2>Your email was sent successfully (delivery may still fail, though)</h2>
 </section>
 <section lang="de">
   <h2>Ihre Email wurde erfolgreich verschickt (die Zustellung kann dennoch fehlschlagen)</h2>
 </section>
-<article><pre>\n{% post.message %}\n</pre></article>
+<article><pre>\n{{ page.message }}\n</pre></article>
 {% else %}
-<header><h1><span lang="en">Error</span> / <span lang="de">Fehler</span> {% post.status %}</h1></header>
+<h1><span lang="en">Error</span> / <span lang="de">Fehler</span> {{ page.status }}</h1>
 <section lang="en">
   <h2>An error occurred when processing your request.</h2>
-  <p>Status code {% post.status %}: {% post.status_description %}</p>
+  <p>Status code {{ page.status }}: {{ page.status_description }}</p>
 </section>
 <section lang="de">
   <h2>Während der Verarbeitung Ihrer Anfrage kam es zu einem Fehler.</h2>
-  <p>Statuscode {% post.status %}: <span lang="en">{% post.status_description %}</span> (Beschreibung auf Englisch)</p>
+  <p>Statuscode {{ page.status }}: <span lang="en">{{ page.status_description }}</span> (Beschreibung auf Englisch)</p>
 </section>
 {% endif %}
 {% endif %}