X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FAssuranceForm.templ;h=2e346be390c18645e01a6f641549e06ee6dfefb4;hb=8c9012b3054bc5785c68ca17e1372e88a9120c70;hp=79ae81c649400fd450023814f0fbfc1ddc808320;hpb=ae8917f3a8a3b15b279565a7f40556eb1b7de232;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 79ae81c6..2e346be3 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -1,54 +1,62 @@
-<table class="wrapper dataTable" width="600">
+<table class="table">
 <thead>
 <tr><th colspan="2"><?=_Assurance Confirmation?></th></tr>
 </thead>
 <tbody>
-<tr><td colspan="2"><?=s,$name,Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance.?>
+<tr><td colspan="2"><?=_Please check the following details match against what you witnessed when you met ${name} in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the SomeCA Arbitrator for any issues with this Assurance.?>
 </td></tr>
 
 	<tr>
 		<td><?=_Name?>: </td>
-		<td><span class="accountdetail"><?=$name?></span></td>
+		<td><span class="accountdetail"><?=$nameExplicit?></span></td>
 	</tr>
 	<tr>
 		<td><?=_Date of Birth?>: </td>
-		<td><span class="accountdetail dob"><?=$dob?></span></td>
+		<td><span class="accountdetail dob"><?=$dob?> (<?=$dobFmt2?>)</span></td>
 	</tr>
 	<tr>
 		<td><input type="checkbox" name="certify" value="1"></td>
-		<td><?=s,$name,I certify that %s has appeared in person.?></td>
+		<td><?=_I certify that ${name} has appeared in person.?></td>
 	</tr>
 	<tr>
-		<td><input type="checkbox" name="CCAAgreed" value="1"></td>
-		<td><?=s,$name,I verify that %s has accepted the CAcert Community Agreement.?></td>
+		<td><input type="checkbox" name="tos_agree" value="1"></td>
+		<td><?=_I verify that ${name} has accepted the Terms of Service (!'<a href="/policy/TermsOfService.html">'ToS!'</a>').?></td>
 	</tr>
 	<tr>
 		<td><?=_Location?></td>
-		<td><input type="text" name="location"></td>
+		<td><input class="form-control" type="text" name="location" value="<?=$location?>"></td>
 	</tr>
 	<tr>
 		<td><?=_Date?></td>
-		<td><input type="text" name="date"><br/><?=_The date when the assurance took place. Please adjust the date if you assured the person on a different day (YYYY-MM-DD).?></td>
+		<td><input class="form-control" type="text" name="date" value="<?=$date?>"><br/><?=_The date when the assurance took place. Please adjust the date if you assured the person on a different day (YYYY-MM-DD).?></td>
 	</tr>
 	<tr>
 		<td><input type="checkbox" name="assertion" value="1"></td>
-		<td><?=_I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.?></td>
+		<td><?=_I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the SomeCA Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.?></td>
 	</tr>
 	<tr>
 		<td><input type="checkbox" name="rules" value="1"></td>
-		<td><?=_I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook.?></td>
+		<td><?=_I have read and understood the Terms of Service (!'<a href="/policy/TermsOfService.html">'ToS!'</a>'), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the ToS, Assurance policy and handbook.?></td>
 	</tr>
 	<tr>
 		<td><?=_Policy?>: </td>
 		<td>
-			<a href="/policy/CAcertCommunityAgreement.php" target="_blank"><?=_CAcert Community Agreement?></a>
+			<a href="/policy/TermsOfService.html" target="_blank"><?=_Terms of Service?></a>
 			 - <a href="/policy/AssurancePolicy.php" target="_blank"><?=_Assurance Policy?></a>
 			 - <a href="http://wiki.cacert.org/AssuranceHandbook2" target="_blank"><?=_Assurance Handbook?></a>
 		</td>
 	</tr>
 	<tr>
 		<td><?=_Points?></td>
-		<td><input type="text" name="points"><br/>(Max. <?=$maxpoints?>)</td>
+		<td><input class="form-control" type="text" name="points"><br/>(Max. <?=$maxpoints?>)</td>
+	</tr>
+	<tr>
+		<td><?=_Type?></td>
+		<td><select name="assuranceType"><? foreach($ats) { ?><option value="<?=$id?>"<?=$sel?>><?=$type?></option><? } ?></select></td>
+	</tr>
+	<tr>
+		<td><input type="checkbox" name="passwordReset" value="1" <? if($aword) { ?>checked<? } ?>></td>
+		<td><?=_I have conducted a passwort reset with assurance. The established "A-Word" is:?><input type="text" name="passwordResetValue" value="<? if($aword) { ?><?=$aword?><? } ?>"></td>
 	</tr>
 	<tr>
 		<td colspan="2">