X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.templ;h=f590e45800c668c312b2aa8163edc07f50e4c59b;hb=ff18b96af5b8d9b2a57e9f01ed54b414147d065b;hp=c20ff0622352f49a3ef27691e321b193d08265ca;hpb=4ef7ef003efbb904af6d4bce0ea0ee1b5091b65f;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/org/cacert/gigi/pages/main/Signup.templ
index c20ff062..f590e458 100644
--- a/src/org/cacert/gigi/pages/main/Signup.templ
+++ b/src/org/cacert/gigi/pages/main/Signup.templ
@@ -4,40 +4,29 @@
     <th colspan="3"><?=_My Details?></th>
   </tr>
   </thead>
+
   <tbody>
   <tr>
-    <td><?=_First Name?>: </td>
-    <td><input class="form-control" type="text" name="fname" size="30" value="<?=$fname?>" autocomplete="off"></td>
+    <td><?=_Name?>: </td>
+    <td><?=$name?></td>
     <td rowspan="4"><?=$!helpOnNames?></td>
   </tr>
 
   <tr>
-    <td><?=_Middle Name(s)?><br>
-      (<?=_optional?>)
-    </td>
-    <td><input class="form-control" type="text" name="mname" size="30" value="<?=$mname?>" autocomplete="off"></td>
-  </tr>
-
-  <tr>
-    <td><?=_Last Name?>: </td>
-    <td><input class="form-control" type="text" name="lname" size="30" value="<?=$lname?>" autocomplete="off"></td>
-  </tr>
-
-  <tr>
-    <td><?=_Suffix?><br>
-      (<?=_optional?>)</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>
+    <td><?=_Date of Birth?>:<br>
+        (<?=_yyyy-mm-dd?>)</td>
+    <td><?=$dob?></td>
+    <td><?=_The required minimum age is ${dobmin} years.?></td>
   </tr>
 
   <tr>
-    <td><?=_Date of Birth?><br>
-	    (<?=_yyyy-mm-dd?>)</td>
-    <td><?=$dob?></td>
-    <td>&nbsp;</td>
+    <td><?=_Residence Country?>:</td>
+    <td><?=$countryCode?></td>
+    <td><?=_The country in which you currently reside. This information is optional and used for statistical purposes only.?></td>
   </tr>
 
   <tr>
-    <td><?=_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>
@@ -47,13 +36,14 @@
     <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 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>
@@ -63,9 +53,9 @@
     <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>
+        <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>
 
@@ -73,7 +63,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 SomeCA 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>