Merge "Display last successful verification. (adresses #5)"

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
index 4e00bbd367d3747aa69b7a0ec4508c88fa394d83..9be2bf528132044ed4132b331a39631b5fa3a554 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
@@ -82,6 +82,7 @@ public class MailManagementForm extends Form {
                 } else {
                     vars.put("verification", l.getTranslation("Unverified"));
                 }
+                vars.put("last_verification", emailAddress.getLastPing(true));
                 if (target.getEmail().equals(emailAddress.getAddress())) {
                     vars.put("delete", "N/A");
                 } else {

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
index 6c6439bf1771fa084a16bcec6bd9d50b190de365..404048993fb0f46d2bd4936794cb80c80c24f2b2 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
@@ -8,17 +8,19 @@
   <tr>
     <td><?=_Default?></td>
     <td><?=_Status?></td>
+    <td><?=_Last successful verification?></td>
     <td><?=_Address?></td>
     <td><?=_Delete?></td>
     <td><?=_Request reping?></td>
   </tr>
  <? foreach($emails) {?>
        <tr>
-               <td><input type="submit" name="default:<?=$id?>" value="<?=_Set as Default?>"<?=$default?>></td>
+               <td><input class="form-control" type="submit" name="default:<?=$id?>" value="<?=_Set as Default?>"<?=$default?>></td>
                <td><?=$verification?></td>
+               <td><?=$last_verification?></td>
                <td><?=$address?></td>
-               <td><input type="submit" name="delete:<?=$id?>" value="<?=_Delete?>"<?=$default?>></td>
-               <td><input type="submit" name="reping:<?=$id?>" value="<?=_Request reping?>"></td>
+               <td><input class="form-control" type="submit" name="delete:<?=$id?>" value="<?=_Delete?>"<?=$default?>></td>
+               <td><input class="form-control" type="submit" name="reping:<?=$id?>" value="<?=_Request reping?>"></td>
        </tr>
  <? } ?>
   </tbody>