X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.templ;h=59e22cd4ceffa9ded2c00de750ad2733256e2fa1;hb=253ecf13e1a697a657550090de3f3bf054559ad8;hp=631215e313ac4737b07a03711b6d10112aa15812;hpb=065ca60170f2471227dc25784e1a4c3b7912d367;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/org/cacert/gigi/pages/main/Signup.templ
index 631215e3..59e22cd4 100644
--- a/src/org/cacert/gigi/pages/main/Signup.templ
+++ b/src/org/cacert/gigi/pages/main/Signup.templ
@@ -1,83 +1,83 @@
-<form method="post" action="/register" autocomplete="off">
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
+<table class="table">
+  <thead>
   <tr>
-    <td colspan="3" class="title"><?=_My Details?></td>
+    <th colspan="3"><?=_My Details?></th>
   </tr>
-
+  </thead>
+  <tbody>
   <tr>
-    <td class="DataTD" width="125"><?=_First Name?>: </td>
-    <td class="DataTD" width="125"><input type="text" name="fname" size="30" value="<?=$fname?>" autocomplete="off"></td>
-    <td rowspan="4" class="DataTD" width="125"><?=$helpOnNames?></td>
+    <td><?=_First Name?>: </td>
+    <td><input class="form-control" type="text" name="fname" size="30" value="<?=$fname?>" autocomplete="off"></td>
+    <td rowspan="4"><?=$!helpOnNames?></td>
   </tr>
 
   <tr>
-    <td class="DataTD" valign="top"><?=_Middle Name(s)?><br>
+    <td><?=_Middle Name(s)?><br>
       (<?=_optional?>)
     </td>
-    <td class="DataTD"><input type="text" name="mname" size="30" value="<?=$mname?>" autocomplete="off"></td>
+    <td><input class="form-control" type="text" name="mname" size="30" value="<?=$mname?>" autocomplete="off"></td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Last Name?>: </td>
-    <td class="DataTD"><input type="text" name="lname" size="30" value="<?=$lname?>" autocomplete="off"></td>
+    <td><?=_Last Name?>: </td>
+    <td><input class="form-control" type="text" name="lname" size="30" value="<?=$lname?>" autocomplete="off"></td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Suffix?><br>
+    <td><?=_Suffix?><br>
       (<?=_optional?>)</td>
-    <td class="DataTD"><input type="text" name="suffix" size="30" value="<?=$suffix?>" autocomplete="off"><br><?=_Please only write Name Suffixes into this field.?></td>
+    <td><input class="form-control" type="text" name="suffix" size="30" value="<?=$suffix?>" autocomplete="off"><br><?=_Please only write Name Suffixes into this field.?></td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Date of Birth?><br>
-	    (<?=_dd/mm/yyyy?>)</td>
-    <td class="DataTD"><?=$dob?></td>
-    <td class="DataTD">&nbsp;</td>
+    <td><?=_Date of Birth (minimum age: ${dobmin} years)?><br>
+	    (<?=_yyyy-mm-dd?>)</td>
+    <td><?=$dob?></td>
+    <td>&nbsp;</td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Email Address?>: </td>
-    <td class="DataTD"><input type="text" name="email" size="30" value="<?=$email?>" autocomplete="off"></td>
-    <td class="DataTD"><?=_I own or am authorised to control this email address?></td>
+    <td><?=_Email Address?>: </td>
+    <td><input type="text" name="email" size="30" value="<?=$email?>" autocomplete="off"></td>
+    <td><?=_I own or am authorised to control this email address?></td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Pass Phrase?><font color="red">*</font>: </td>
-    <td class="DataTD"><input type="password" name="pword1" size="30" autocomplete="off"></td>
-    <td class="DataTD" rowspan="2">&nbsp;</td>
+    <td><?=_Pass Phrase?><font color="red">*</font>: </td>
+    <td><input class="form-control" type="password" name="pword1" size="30" autocomplete="off"></td>
+    <td rowspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_Pass Phrase Again?><font color="red">*</font>: </td>
-    <td class="DataTD"><input type="password" name="pword2" size="30" autocomplete="off"></td>
+    <td><?=_Pass Phrase Again?><font color="red">*</font>: </td>
+    <td><input class="form-control" type="password" name="pword2" size="30" autocomplete="off"></td>
   </tr>
 
   <tr>
-    <td class="DataTD" colspan="3"><font color="red">*</font><?=_Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.?></td>
+    <td colspan="3"><font color="red">*</font><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. Learn more in our !'<a href="http://wiki.cacert.org/wiki/FAQ" target="_new">'FAQ!'</a>'.?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="3"><?=_It's possible to get notifications of up and coming events and even just general announcements, untick any notifications you don't wish to receive. For country, regional and radius notifications to work you must choose your location once you've verified your account and logged in.?></td>
+    <td colspan="3"><?=_It's possible to get notifications of up and coming events and even just general announcements, untick any notifications you don't wish to receive. For country, regional and radius notifications to work you must choose your location once you've verified your account and logged in.?></td>
   </tr>
 
   <tr>
-    <td class="DataTD" valign="top"><?=_Alert me if?>: </td>
-    <td class="DataTD" align="left">
-        <input type="checkbox" name="general" value="1"<?=$general?>><?=_General Announcements?><br>
-	<input type="checkbox" name="country" value="1"<?=$country?>><?=_Country Announcements?><br>
-	<input type="checkbox" name="regional" value="1"<?=$regional?>><?=_Regional Announcements?><br>
-	<input type="checkbox" name="radius" value="1"<?=$radius?>><?=_Within 200km Announcements?></td>
-    <td class="DataTD">&nbsp;</td>
+    <td valign="top"><?=_Alert me if?>: </td>
+    <td align="left">
+        <input type="checkbox" name="general" value="1"<?=$!general?>><?=_General Announcements?><br>
+	<input type="checkbox" name="country" value="1"<?=$!country?>><?=_Country Announcements?><br>
+	<input type="checkbox" name="regional" value="1"<?=$!regional?>><?=_Regional Announcements?><br>
+	<input type="checkbox" name="radius" value="1"<?=$!radius?>><?=_Within 200km Announcements?></td>
+    <td>&nbsp;</td>
   </tr>
 
   <tr>
-    <td class="DataTD" colspan="3"><?=_When you click on next, we will send a confirmation email to the email address you have entered above.?></td>
+    <td colspan="3"><?=_When you click on next, we will send a confirmation email to the email address you have entered above.?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="3"><input type="checkbox" name="cca_agree" value="1"><?=_I agree to the terms and conditions of the CAcert Community Agreement?>: <a href="/policy/CAcertCommunityAgreement.php">http://www.cacert.org/policy/CAcertCommunityAgreement.php</a></td>
+    <td colspan="3"><input type="checkbox" name="tos_agree" value="1"><?=_I agree to the Terms of Service (!'<a href="/policy/TermsOfService.html">'ToS!'</a>').?></td>
   </tr>
 
   <tr>
-    <td class="DataTD" colspan="3"><input type="submit" name="process" value="<?=_Next?>"></td>
+    <td colspan="3"><input type="submit" name="process" value="<?=_Next?>"></td>
   </tr>
-
+  </tbody>
 </table>
-</form>