X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.templ;h=c47bf8f1a7d8921eb8651f8adad8c38e423a5b73;hb=9def69bd08ea69eb27786d5b34f00e154e09e9f3;hp=a3f77b261f01ebb5a424ebe0979007d02816348d;hpb=312a2c54478798f8cb0e75fb73cbdbabd4f2134f;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/org/cacert/gigi/pages/main/Signup.templ
index a3f77b26..c47bf8f1 100644
--- a/src/org/cacert/gigi/pages/main/Signup.templ
+++ b/src/org/cacert/gigi/pages/main/Signup.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable" width="400">
+<table class="table">
   <thead>
   <tr>
     <th colspan="3"><?=_My Details?></th>
@@ -6,32 +6,13 @@
   </thead>
   <tbody>
   <tr>
-    <td width="125"><?=_First Name?>: </td>
-    <td width="125"><input type="text" name="fname" size="30" value="<?=$fname?>" autocomplete="off"></td>
-    <td rowspan="4" width="125"><?=$!helpOnNames?></td>
+    <td><?=_Name?>: </td>
+    <td><?=$name?></td>
+    <td rowspan="4"><?=$!helpOnNames?></td>
   </tr>
-
-  <tr>
-    <td valign="top"><?=_Middle Name(s)?><br>
-      (<?=_optional?>)
-    </td>
-    <td><input type="text" name="mname" size="30" value="<?=$mname?>" autocomplete="off"></td>
-  </tr>
-
-  <tr>
-    <td><?=_Last Name?>: </td>
-    <td><input type="text" name="lname" size="30" value="<?=$lname?>" autocomplete="off"></td>
-  </tr>
-
-  <tr>
-    <td><?=_Suffix?><br>
-      (<?=_optional?>)</td>
-    <td><input type="text" name="suffix" size="30" value="<?=$suffix?>" autocomplete="off"><br><?=_Please only write Name Suffixes into this field.?></td>
-  </tr>
-
   <tr>
-    <td><?=_Date of Birth?><br>
-	    (<?=_dd/mm/yyyy?>)</td>
+    <td><?=_Date of Birth (minimum age: ${dobmin} years)?><br>
+	    (<?=_yyyy-mm-dd?>)</td>
     <td><?=$dob?></td>
     <td>&nbsp;</td>
   </tr>
@@ -44,16 +25,16 @@
 
   <tr>
     <td><?=_Pass Phrase?><font color="red">*</font>: </td>
-    <td><input type="password" name="pword1" size="30" autocomplete="off"></td>
+    <td><input class="form-control" type="password" name="pword1" size="30" autocomplete="off"></td>
     <td rowspan="2">&nbsp;</td>
   </tr>
   <tr>
     <td><?=_Pass Phrase Again?><font color="red">*</font>: </td>
-    <td><input type="password" name="pword2" size="30" autocomplete="off"></td>
+    <td><input class="form-control" type="password" name="pword2" size="30" autocomplete="off"></td>
   </tr>
 
   <tr>
-    <td 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 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>
@@ -73,7 +54,7 @@
     <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 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>