general cleanup

[gigi.git] / src / org / cacert / gigi / pages / wot / AssuranceForm.templ

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 21691e1dbaf02f71327c228577d9b01fbf13fda2..9b1aa2e54d3da1263c7f58b3ec919d71c1082259 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -3,7 +3,7 @@
 <tr><th colspan="2"><?=_Assurance Confirmation?></th></tr>
 </thead>
 <tbody>
-<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 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 CAcert Arbitrator for any issues with this Assurance.?>
 </td></tr>
 
        <tr>
@@ -16,19 +16,19 @@
        </tr>
        <tr>
                <td><input type="checkbox" name="certify" value="1"></td>
-               <td><?=_I certify that $name 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><?=_I verify that $name has accepted the CAcert Community Agreement.?></td>
+               <td><?=_I verify that ${name} has accepted the CAcert Community Agreement.?></td>
        </tr>
        <tr>
                <td><?=_Location?></td>
-               <td><input type="text" name="location"></td>
+               <td><input 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 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>
@@ -50,6 +50,14 @@
                <td><?=_Points?></td>
                <td><input 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">
                        <input type="submit" name="process" value="<?=_I confirm this Assurance?>" />