X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.templ;h=f997cc5ccb48211e3f444a47fee5c922ac696b7d;hb=d7faeb9059063a213bfb0dad5d91f5732c3c6a48;hp=59e22cd4ceffa9ded2c00de750ad2733256e2fa1;hpb=30d832c49af804fc3fad6a9c24bdbb7debf4f978;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/org/cacert/gigi/pages/main/Signup.templ
index 59e22cd4..f997cc5c 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 (minimum age: ${dobmin} years)?><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,6 +36,7 @@
     <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>
@@ -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>
 
@@ -77,7 +67,7 @@
   </tr>
 
   <tr>
-    <td colspan="3"><input type="submit" name="process" value="<?=_Next?>"></td>
+    <td colspan="3"><input class="btn btn-primary" type="submit" name="process" value="<?=_Next?>"></td>
   </tr>
   </tbody>
 </table>