Display Profiles while issuing certificates.

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index 922f9efba60353d2f39481a41abc1c58b4e1474c..aee6cddf2f6bc61920e45abb65d3b65d529e1789 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -201,6 +201,21 @@ public class CertificateIssueForm extends Form {
             }
         });
         vars2.put("hashs", new HashAlgorithms(selectedDigest));
+        vars2.put("profiles", new IterableDataset() {
+
+            int i = 1;
+
+            @Override
+            public boolean next(Language l, Map<String, Object> vars) {
+                CertificateProfile cp = CertificateProfile.getById(i++);
+                if (cp == null) {
+                    return false;
+                }
+                vars.put("key", cp.getKeyName());
+                vars.put("name", cp.getVisibleName());
+                return true;
+            }
+        });
         t.output(out, l, vars2);
     }
 }

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
index 5fc7b836842d0fbd3c768be541d95e429a13f1a6..64e1c58d24f0c9ed5cfd5c985b2ff15d917d4987 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
@@ -93,7 +93,7 @@
     </td>
   </tr>
   <tr>
-    <td colspan="2"><input type="submit" name="process" value="<?=_Next?>" /></td>
+    <td colspan="2"><input type="submit" name="process" value="<?=_Issue Certificate?>" /></td>
   </tr>
   </tbody>
 </table>