fix: display help text for certificate validity selector

fixes #55

Change-Id: I4e3a74b5ba303a1093a343a91e77b9108a12089a

diff --git a/src/org/cacert/gigi/output/CertificateValiditySelector.java b/src/org/cacert/gigi/output/CertificateValiditySelector.java
index b8601de5aba0263f44cd0b6c9f942eefe0f6bfe7..d0f0c124a38cfc135fe276218094284bb2fbd5b7 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateValiditySelector.java
+++ b/src/org/cacert/gigi/output/CertificateValiditySelector.java
@@ -26,7 +26,9 @@ public class CertificateValiditySelector implements Outputable {
 
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-        out.print("<select name='validFrom'><option value='now'");
+        out.print("<label for='validFrom'>");
+        out.println(l.getTranslation("start: "));
+        out.print("</label><select name='validFrom'><option value='now'");
         if (from == null) {
             out.print(" selected='selected'");
         }
@@ -49,6 +51,9 @@ public class CertificateValiditySelector implements Outputable {
         }
         out.println("</select>");
 
+        out.print("<label for='validity'>");
+        out.println(l.getTranslation("end: "));
+        out.print("</label>");
         out.print("<input type='text' name='validity' value='");
         out.print(HTMLEncoder.encodeHTML(val));
         out.println("'>");

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index 7b64dc72c12ddec25ad032010b8d9d5b899a60f1..e1404ce56b69209882fdcada6f2355daa8ddbfcf 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -61,7 +61,7 @@
   <tr class="expert">
     <td><?=_Valid period?></td>
     <td>
-        <?=$validity?>
+        <?=$validity?>(<?=_start: "now" or YYYY-MM-DD date, end: e.g. 2y, 6m or YYYY-MM-DD date?>)
     </td>
   </tr>
     <tr>