more HTML cleanup, doc structure/style broken for now

12 files changed, 128 insertions, 146 deletions

diff --git a/root/admin/index.tt b/root/admin/index.tt
index a603c30..72dff05 100644
--- a/root/admin/index.tt
+++ b/root/admin/index.tt
@@ -1 +1 @@
-Please use the menus above
+<p>Please use the menus above.</p>
\ No newline at end of file
diff --git a/root/email/activation.tt b/root/email/activation.tt
index 5e749cd..b873421 100644
--- a/root/email/activation.tt
+++ b/root/email/activation.tt
@@ -3,3 +3,5 @@
 [% l('To activate your account, please follow the link below.') %]
 [% url %]
 
+--
+http://mageia.org/
\ No newline at end of file
diff --git a/root/email/admin/password.tt b/root/email/admin/password.tt
index 38bf2a3..0d9bac1 100644
--- a/root/email/admin/password.tt
+++ b/root/email/admin/password.tt
@@ -6,3 +6,5 @@
 
 [% url %]
 
+--
+http://mageia.org/
\ No newline at end of file
diff --git a/root/index.tt b/root/index.tt
index c42cc22..e809b4f 100644
--- a/root/index.tt
+++ b/root/index.tt
@@ -1,22 +1,21 @@
-<h2>[% l('Login') %]</h2>
+<h1>[% l('Login') %]</h1>
 
 <form method="post" action="/user">
-    <table border=0>
-    <tr>
-        <td>[% l('Username') %]</td>
-        <td><input type=text name="username" value="[% c.user.username %]" /></td>
-    </tr>
-    <tr>
-        <td>[% l('Password') %]</td>
-        <td><input type="password" name="password" /></td>
-    </tr>
-    <tr>
-        <td></td>
-        <td colspan=1>
-            <input type="submit" value="[% l('Login') %]" />
-            [% l('or') %] 
-            <a href="/register">[% l('Register') %]</a>
-        </td>
-    </tr>
-    </table>
+
+    <p>
+        <label for="username_">[% l('Username') %]</label>
+        <input id="username_" type="text" name="username" value="[% c.user.username %]" />
+    </p>
+
+    <p>
+        <label for="password_">[% l('Password') %]</label>
+        <input id="password_" type="password" name="password" />
+    </p>
+
+    <p><input type="submit" value="[% l('Login') %]" />
+        [% l('or') %] 
+        <a href="/register">[% l('Register') %]</a></p>
+        
+    <p>@todo [% l('Forgotten password?') %]</p>
+
 </form>
diff --git a/root/register/complete.tt b/root/register/complete.tt
index 1cddd14..75c6f6c 100644
--- a/root/register/complete.tt
+++ b/root/register/complete.tt
@@ -1,6 +1,6 @@
 <h2>[% l('Registration completed') %]</h2>
 
 <p>
-[% l('Registration was successful.') %]
-[% l('Check your mail for activation instructions.') %]
+    [% l('Registration was successful.') %]
+    [% l('Check your mail for activation instructions.') %]
 </p>
\ No newline at end of file
diff --git a/root/register/index.tt b/root/register/index.tt
index 4d2fa25..2259d4f 100644
--- a/root/register/index.tt
+++ b/root/register/index.tt
@@ -5,41 +5,44 @@ END; %]
 
 <h2>[% l('Register') %]</h2>
 
-<span class="error">
+<p class="error">
     [% FOREACH error IN errors %]
     [% error %]<br/>
     [% END %]
-</span>
+</p>
 
 <form method="post" action="/register/check">
 
-<table border=0>
-    <tr>
-        <td>[% l('Username') %]</td>
-        <td><input type=text name="uid" value="[% c.request.params.uid %]" /></td>
-    </tr>
-    <tr>
-        <td>[% l('First name') %]</td>
-        <td><input type=text name="gn" value="[% c.request.params.gn %]" /></td>
-    </tr>
-    <tr>
-        <td>[% l('Surname') %]</td>
-        <td><input type=text name="sn" value="[% c.request.params.sn %]" /></td>
-    </tr>
-    <tr>
-        <td>[% l('Email address') %]</td>
-        <td><input type=text name="mail1" value="[% c.request.params.mail1 %]" /></td>
-    </tr>
-    <tr>
-        <td>[% l('Confirm Email address') %]</td>
-        <td><input type=text name="mail2" value="[% c.request.params.mail2 %]" /></td>
-    </tr>
-    <tr>
-        <td><img src="/register/captcha" /></td>
-        <td><input type="text" name="validate" /></td>
-    </tr>
-    <tr>
-        <td></td>
-        <td colspan=1><input type="Submit" value="[% l('Register') %]" /></td>
-    </tr>
-</table>
+    <p>
+        <label for="uid_">[% l('Username') %]</label>
+        <input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" />
+    </p>
+
+    <p>
+        <label for="gn_">[% l('First name') %]</label>
+        <input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" />
+    </p>
+
+    <p>
+        <label for="sn_">[% l('Surname') %]</label>
+        <input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" />
+    </p>
+
+    <p>
+        <label for="mail1_">[% l('Email address') %]</label>
+        <input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" />
+    </p>
+
+    <p>
+        <label for="mail2_">[% l('Confirm Email address') %]</label>
+        <input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" />
+    </p>
+
+    <p>
+        <img src="/register/captcha" />
+        <input type="text" name="validate" />
+    </p>
+
+    <p><input type="submit" value="[% l('Register') %]" /></p>
+
+</form>
\ No newline at end of file
diff --git a/root/template/header b/root/template/header
index 4812ea7..84b795d 100644
--- a/root/template/header
+++ b/root/template/header
@@ -1,8 +1,6 @@
-<div class="masthead">
-    <h1>[% c.config.apptitle %]</h1>
-</div>
+<p>[% template.title or site.title or c.config.apptitle %]</p>
+
 <div class="hnav">
-    <!--div class="hnav" -->
     <ul class="hnav">
     [% FOREACH page IN pages %]
         <li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li>
diff --git a/root/template/html b/root/template/html
index d28ca35..93488ef 100644
--- a/root/template/html
+++ b/root/template/html
@@ -3,7 +3,7 @@
 <html lang="en" dir="ltr">
 <head>
     <meta charset="utf-8" />
-    <title>[% template.title or site.title %]</title>
+    <title>[% template.title or site.title or c.config.apptitle %]</title>
     <meta content="description" value="" />
     <meta content="robots" value="index,nofollow" />
     <link rel="stylesheet" href="/ttsite.css" />
diff --git a/root/template/layout b/root/template/layout
index 3d7bc10..8c80b34 100644
--- a/root/template/layout
+++ b/root/template/layout
@@ -1,37 +1,24 @@
 <div id="header">[% PROCESS template/header %]</div>
 
-<div id="outerColumnContainer">
-    <div id="leftColumn">
-        <div class="inside">
-            <div class="vnav">
-                <ul>
-                [% FOREACH subpage IN subpages %]
-                    <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li>
-                [% END %]
-                </ul>
-            </div>
-        </div>
-    </div>
+<ul id="nav">
+[% FOREACH subpage IN subpages %]
+    <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li>
+[% END %]
+</ul>
 
-    <div id="innerColumnContainer">
-        <!-- div id="SOWrap" -->
-        <div id="middleColumn">
-            <div class="inside">
-                [% IF errors %]
-                <span class="error">
-                    [% FOREACH error IN errors %]
-                        [% error %]<br/>
-                    [% END %]
-                </span>
-                [% END %]
-                <div id="content">
-                    [% content %]
-                </div>
-            </div>
-            <div class="clear"></div>
-        </div>
-        <div class="clear"></div>
-    </div>
+<div class="inside">
+[% IF errors %]
+    <span class="error">
+    [% FOREACH error IN errors %]
+        [% error %]
+        <br/>
+    [% END %]
+    </span>
+[% END %]
 </div>
 
-<!-- div id="footer">[% PROCESS template/footer %]</div -->
+<div id="content">
+    [% content %]
+</div>
+
+<div id="footer">[% PROCESS template/footer %]</div>
diff --git a/root/user/firstlogin.tt b/root/user/firstlogin.tt
index 79d15c1..5fa648a 100644
--- a/root/user/firstlogin.tt
+++ b/root/user/firstlogin.tt
@@ -1,17 +1,16 @@
 
 <form method="post" action="">
-<table border='0'>
-    <tr>
-        <td>[% l('New Password') %]</td>
-        <td><input name="newpassword1" type="password"></td>
-    </tr>
-    <tr>
-        <td>[% l('Repeat New Password') %]</td>
-        <td><input name="newpassword2" type="password"></td>
-    </tr>
-    <tr>
-        <td></td>
-        <td align=right><input type="submit" value="[% l('Change') %]" /></td>
-    </tr>
-</table>
+
+    <p>
+        <label for="newpassword1_">[% l('New Password') %]</label>
+        <input id="newpassword1_" name="newpassword1" type="password" value="" />
+    </p>
+
+    <p>
+        <label for="newpassword2_">[% l('Repeat New Password') %]</label>
+        <input id="newpassword2_" name="newpassword2" type="password" value="" />
+    </p>
+
+    <p><input type="submit" value="[% l('Change') %]" /></p>
+    
 </form>
diff --git a/root/user/index.tt b/root/user/index.tt
index d0bdb5a..7c70b4a 100644
--- a/root/user/index.tt
+++ b/root/user/index.tt
@@ -22,30 +22,22 @@
             </td>
         </tr>
         [% END %]
-        <tr>
-            <td colspan=2 align=center>
-                <input type='Submit' value='[% l('Update') %]'>
-            </td>
-        </tr>
     </table>
+
+    <p><input type="Submit" value="[% l('Update') %]" /></p>
 </form>
 
+<hr />
+
 <form method="post" action="/user/add">
-    <table>
-    <tr>
-        <td>
-            <select name="attribute">
-                [% FOREACH attr IN may %]
-                    <option value="[% attr %]">[% attr %]</option>
-                [% END %]
-            </select>
-        </td>
-        <td>
-            <input name="value" />
-        </td>
-        <td>
-            <input type="submit" value="[% l('Add') %]" />
-        </td>
-    </tr>
-    </table>
+    <p>
+        <select name="attribute">
+        [% FOREACH attr IN may %]
+            <option value="[% attr %]">[% attr %]</option>
+        [% END %]
+
+        <input name="value" value="" />
+
+        <input type="submit" value="[% l('Add') %]" />
+    </p>
 </form>
diff --git a/root/user/password.tt b/root/user/password.tt
index 38832a2..85db475 100644
--- a/root/user/password.tt
+++ b/root/user/password.tt
@@ -1,21 +1,21 @@
 
-<form method="post">
-<table>
-    <tr>
-        <td>[% l('Current password') %]</td>
-        <td><input name="password" type="password" /></td>
-    </tr>
-    <tr>
-        <td>[% l('New Password') %]</td>
-        <td><input name="newpassword1" type="password" /></td>
-    </tr>
-    <tr>
-        <td>[% l('Repeat New Password') %]</td>
-        <td><input name="newpassword2" type="password" /></td>
-    </tr>
-    <tr>
-        <td></td>
-        <td align="right"><input type="submit" value="[% l('Change') %]"></td>
-    </tr>
-</table>
+<form method="post" action="">
+
+    <p>
+        <label for="password_">[% l('Current password') %]</label>
+        <input id="password_" name="password" type="password" value="" />
+    </p>
+
+    <p>
+        <label for="newpassword1_">[% l('New Password') %]</label>
+        <input id="newpassword1_" name="newpassword1" type="password" value="" />
+    </p>
+
+    <p>
+        <label for="newpassword2_">[% l('Repeat New Password') %]</label>
+        <input id="newpassword2_" name="newpassword2" type="password" value="" />
+    </p>
+
+    <p><input type="submit" value="[% l('Change') %]" /></p>
+
 </form>