FIX: Smaller changes in the Assure-Form.

diff --git a/src/org/cacert/gigi/Name.java b/src/org/cacert/gigi/Name.java
index f13f85bf033d7f196df2d5d91a7fe126a649c76c..fda8160c04a1fda560cfad5d6a387d11a6149944 100644 (file)
--- a/src/org/cacert/gigi/Name.java
+++ b/src/org/cacert/gigi/Name.java
@@ -35,6 +35,11 @@ public class Name implements Outputable {
         out.println("</span>");
     }
 
+    @Override
+    public String toString() {
+        return fname + " " + lname;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if ( !(obj instanceof Name)) {

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 01c4ea0e33edd5afb5e2080a47941bf5d6d649fd..3368414af45443bbe88519beecc833b05fdc9bbe 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -34,17 +34,21 @@ public class AssuranceForm extends Form {
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
+    SimpleDateFormat sdf2 = new SimpleDateFormat("dd. MMM yyyy");
+
     @Override
     public void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         HashMap<String, Object> res = new HashMap<String, Object>();
         res.putAll(vars);
-        res.put("name", assuree.getName());
+        res.put("nameExplicit", assuree.getName());
+        res.put("name", assuree.getName().toString());
         try {
             res.put("maxpoints", assuree.getMaxAssurePoints());
         } catch (SQLException e) {
             e.printStackTrace();
         }
         res.put("dob", sdf.format(assuree.getDob()));
+        res.put("dobFmt2", sdf2.format(assuree.getDob()));
         templ.output(out, l, res);
     }
 

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 79ae81c649400fd450023814f0fbfc1ddc808320..580b189646a3701d403966207aea437f1835aa66 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -8,11 +8,11 @@
 
        <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>