From: Benny Baumann <BenBE1987@gmx.net>
Date: Sat, 18 Jun 2016 11:35:36 +0000 (+0200)
Subject: Merge "Display last successful verification. (adresses #5)"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=b94ee2236f2ac89e237a62b0cdee5f09f1fa76ea;hp=5f89b8c26f06505157019a3131438d2de5e557ff

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 4e00bbd3..9be2bf52 100644
--- 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 6c6439bf..40404899 100644
--- 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>