spending some <p>s

6 files changed, 213 insertions, 130 deletions

diff --git a/templates/admin_angel_types.html b/templates/admin_angel_types.html
index 4ad8e9f1..4f2e3a56 100644
--- a/templates/admin_angel_types.html
+++ b/templates/admin_angel_types.html
@@ -1,4 +1,6 @@
-Angel types:
+<p>
+    Angel types:
+</p>
 <table>
     <thead>
         <tr>
@@ -17,8 +19,7 @@ Angel types:
         %table%
     </tbody>
 </table>
-<hr />
-<h2>Create new Angel type:</h2>
+<hr/><h2>Create new Angel type:</h2>
 <form action="%link%&action=create" method="post">
     <table>
         <tr>
diff --git a/templates/admin_groups.html b/templates/admin_groups.html
index c5b4ac57..c6ae4b5c 100644
--- a/templates/admin_groups.html
+++ b/templates/admin_groups.html
@@ -1,6 +1,8 @@
-Hallo %nick%,
-<br/>
-hier hast du die Möglichkeit Gruppenrechte zu ändern:
+<p>
+    Hallo %nick%,
+    <br/>
+    hier hast du die Möglichkeit Gruppenrechte zu ändern:
+</p>
 <table>
     <thead>
         <tr>
diff --git a/templates/admin_questions.html b/templates/admin_questions.html
index 171f10b5..0dfb2372 100644
--- a/templates/admin_questions.html
+++ b/templates/admin_questions.html
@@ -1,4 +1,6 @@
-Not yet answered questions:
+<p>
+    Not yet answered questions:
+</p>
 <table>
     <thead>
         <tr>
@@ -20,7 +22,10 @@ Not yet answered questions:
         %open_questions%
     </tbody>
 </table>
-<hr/> Answered questions:
+<hr/>
+<p>
+    Answered questions:
+</p>
 <table>
     <thead>
         <tr>
diff --git a/templates/user_questions.html b/templates/user_questions.html
index f5fb46ae..b502422b 100644
--- a/templates/user_questions.html
+++ b/templates/user_questions.html
@@ -1,4 +1,6 @@
-Not yet answered questions:
+<p>
+    Not yet answered questions:
+</p>
 <table>
     <thead>
         <tr>
@@ -14,7 +16,10 @@ Not yet answered questions:
         %open_questions%
     </tbody>
 </table>
-<hr/> Answered questions:
+<hr/>
+<p>
+    Answered questions:
+</p>
 <table>
     <thead>
         <tr>
@@ -36,7 +41,10 @@ Not yet answered questions:
         %answered_questions%
     </tbody>
 </table>
-<hr/>Ask an arch angel:
+<hr/>
+<p>
+    Ask an arch angel:
+</p>
 <form action="%link%&action=ask" method="post">
     <table>
         <tr>
diff --git a/templates/user_settings.html b/templates/user_settings.html
index 08790d33..47e5647e 100644
--- a/templates/user_settings.html
+++ b/templates/user_settings.html
@@ -1,106 +1,162 @@
-%greeting%
-
-<hr width="100%">
-%text_user_data%
+<p>
+    %greeting%
+</p>
+<hr/>
+<p>
+    %text_user_data%
+</p>
 <form action="%link%&action=setUserData" method="post">
-  <table>
-    <tr>
-      <td>%label_nick%</td>
-      <td><input type="text" name="nick" size="23" value="%nick%"></td>
-    </tr>
-
-    <tr>
-      <td>%label_name%</td>
-      <td><input type="text" name="name" size="23" value="%name%"></td>
-    </tr>
-
-    <tr>
-      <td>%label_prename%</td>
-      <td><input type="text" name="prename" size="23" value="%prename%"></td>
-    </tr>
-
-    <tr>
-      <td>%label_age%</td>
-      <td><input type="text" name="age" size="3" value="%age%"></td>
-    </tr>
-
-    <tr>
-      <td>%label_tel%</td>
-      <td><input type="text" name="tel" size="40" value="%tel%"></td>
-    </tr>
-
-    <tr>
-      <td>%label_mobile%</td>
-      <td><input type="text" name="mobile" size="40" value="%mobile%"></td>
-    </tr>
-
-    <tr>
-      <td>%label_dect%</td>
-      <td><input type="text" name="dect" size="4" value="%dect%"></td>
-    </tr>
-
-    <tr>
-      <td>%label_mail%</td>
-      <td><input type="text" name="mail" size="40" value="%mail%"></td>
-    </tr>
-
-    <tr>
-      <td>ICQ</td>
-      <td><input type="text" name="icq" size="40" value="%icq%"></td>
-    </tr>
-
-    <tr>
-      <td>jabber</td>
-      <td><input type="text" name="jabber" size="40" value="%jabber%"></td>
-    </tr>
-
-    <tr>
-      <td>%label_hometown%</td>
-      <td><input type="text" name="hometown" size="40" value="%hometown%"></td>
-    </tr>
-%tshirts%
-  </table>
-  <input type="submit" value="%label_save%">
-</form>
-
-<hr />
-
-%text_password%
+    <table>
+        <tr>
+            <td>
+                %label_nick%
+            </td>
+            <td>
+                <input type="text" name="nick" size="23" value="%nick%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %label_name%
+            </td>
+            <td>
+                <input type="text" name="name" size="23" value="%name%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %label_prename%
+            </td>
+            <td>
+                <input type="text" name="prename" size="23" value="%prename%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %label_age%
+            </td>
+            <td>
+                <input type="text" name="age" size="3" value="%age%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %label_tel%
+            </td>
+            <td>
+                <input type="text" name="tel" size="40" value="%tel%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %label_mobile%
+            </td>
+            <td>
+                <input type="text" name="mobile" size="40" value="%mobile%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %label_dect%
+            </td>
+            <td>
+                <input type="text" name="dect" size="4" value="%dect%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %label_mail%
+            </td>
+            <td>
+                <input type="text" name="mail" size="40" value="%mail%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                ICQ
+            </td>
+            <td>
+                <input type="text" name="icq" size="40" value="%icq%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                jabber
+            </td>
+            <td>
+                <input type="text" name="jabber" size="40" value="%jabber%">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %label_hometown%
+            </td>
+            <td>
+                <input type="text" name="hometown" size="40" value="%hometown%">
+            </td>
+        </tr>%tshirts%
+    </table><input type="submit" value="%label_save%">
+</form><hr/>
+<p>
+    %text_password%
+</p>
 <form action="%link%&action=set" method="post">
-  <table>
-    <tr><td>%current_pw_label%</td><td><input type="password" name="current_pw" size="20"></td></tr>
-    <tr><td>%new_pw_label%</td><td><input type="password" name="new_pw" size="20"></td></tr>
-    <tr><td>%new_pw2_label%</td><td><input type="password" name="new_pw2" size="20"></td></tr>
-  </table>
-  <input type="submit" value="%label_save%">
-</form>
-
-<hr />
-
-%text_theme%
+    <table>
+        <tr>
+            <td>
+                %current_pw_label%
+            </td>
+            <td>
+                <input type="password" name="current_pw" size="20">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %new_pw_label%
+            </td>
+            <td>
+                <input type="password" name="new_pw" size="20">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                %new_pw2_label%
+            </td>
+            <td>
+                <input type="password" name="new_pw2" size="20">
+            </td>
+        </tr>
+    </table><input type="submit" value="%label_save%">
+</form><hr/>
+<p>
+    %text_theme%
+</p>
 <form action="%link%&action=colour" method="post">
-  <table>
-     <tr>
-       <td>%theme_label%</td>
-       <td>
-       	%theme_select%
-       </td>
-     </tr>
-  </table>
-  <input type="submit" value="%label_save%">
-</form>
-
-<hr />
-
-%text_language%
+    <table>
+        <tr>
+            <td>
+                %theme_label%
+            </td>
+            <td>
+                %theme_select%
+            </td>
+        </tr>
+    </table>
+    <input type="submit" value="%label_save%">
+</form><hr/>
+<p>
+    %text_language%
+</p>
 <form action="%link%&action=sprache" method="post">
-  <table>
-  <tr>
-    <td>%language_label%</td>
-    <td>
-    	%language_select%
-    </td>
-	</tr>
-  </table>
-  <input type="submit" value="%label_save%">
-</form>
+    <table>
+        <tr>
+            <td>
+                %language_label%
+            </td>
+            <td>
+                %language_select%
+            </td>
+        </tr>
+    </table>
+    <input type="submit" value="%label_save%">
+</form>
\ No newline at end of file
diff --git a/templates/user_wakeup.html b/templates/user_wakeup.html
index d02ff5e8..bf2d5531 100644
--- a/templates/user_wakeup.html
+++ b/templates/user_wakeup.html
@@ -1,18 +1,29 @@
 <form action="%wakeup_link%&amp;action=create" method="post">
-<table>
-	<tr>
-		<td align="right"> %date_text%: </td>
-		<td><input type="text" name="Date" value="%date_value%"></td>
-	</tr>
-	<tr>
-		<td align="right"> %place_text% </td>
-		<td><input type="text" name="Ort" value=""></td>
-	</tr>
-	<tr>
-		<td align="right"> %comment_text% </td>
-		<td><textarea name="Bemerkung" rows="5" cols="40">
-%comment_value%</textarea></td>
-	</tr>
-</table>
-<input type="submit" name="submit" value="%submit_text%" />
-</form>
+    <table>
+        <tr>
+            <td align="right">
+                %date_text%: 
+            </td>
+            <td>
+                <input type="text" name="Date" value="%date_value%">
+            </td>
+        </tr>
+        <tr>
+            <td align="right">
+                %place_text% 
+            </td>
+            <td>
+                <input type="text" name="Ort" value="">
+            </td>
+        </tr>
+        <tr>
+            <td align="right">
+                %comment_text% 
+            </td>
+            <td>
+                <textarea name="Bemerkung" rows="5" cols="40">%comment_value%</textarea>
+            </td>
+        </tr>
+    </table>
+    <input type="submit" name="submit" value="%submit_text%" />
+</form>
\ No newline at end of file