Better certificate content filtering.

[gigi.git] / src / org / cacert / gigi / pages / account / CertificateIssueForm.templ

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
index 9d94937c6e321ce3b06940cb9c847d1b5a8765cf..d3cd81efbe84125042e61bd5a6f634a5f886ce65 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
@@ -15,15 +15,25 @@
   </thead>
   <tbody>
   <tr>
-    <td><?=_Add?></td>
-    <td><?=_Address?></td>
+    <td>
+    </td>
+    <td>
+    <?=_Key type?>: 
+    <select name="profile">
+    <? foreach($profiles) { ?>
+      <option value="<?=$key?>"><?=$name?></option>
+    <? } ?>
+    </select>
+    </td>
   </tr>
-<? foreach($emails) { ?>
   <tr>
-    <td><input type="checkbox" id="addid<?=$id?>" name="addid[]" value="<?=$id?>"></td>
-    <td align="left"><label for="addid<?=$id?>"><?=$value?></label></td>
+    <td><?=_Your name?></td>
+    <td><input type='text' name='CN' value='<?=$CN?>'></td>
+  </tr>
+  <tr>
+    <td>SANs</td>
+    <td align="left"><textarea rows='5' name='SANs' placeholder="dns:my.domain.example.com, dns:*.example.com, email:my.email@example.com (or newline separated)"><?=$emails?></textarea></td>
   </tr>
-<? } ?>
 
 <? if($points50) { ?>
   <tr>
@@ -36,21 +46,6 @@
   </tr>
 <? } ?>
 
-  <tr>
-    <td>
-      <input type="checkbox" id="login" name="login" value="1" checked="checked" />
-    </td>
-    <td align="left">
-      <label for="login"><?=_Enable certificate login with this certificate?><br />
-      <?=_By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .?></label>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" align="left">
-      <label for="description"><?=_Optional comment, only used in the certificate overview?></label><br />
-      <input type="text" id="description" name="description" maxlength="100" size="100" />
-    </td>
-  </tr>
 
   <tr class="expertoff">
     <td>
@@ -61,16 +56,6 @@
     </td>
   </tr>
 
-<? if($points50) { ?>
-  <tr class="expert">
-    <td colspan="2" align="left">
-      <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_Sign by class 1 root certificate?></label><br />
-      <input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?=_Sign by class 3 root certificate?></label><br />
-      <?=_Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain.?>
-    </td>
-  </tr>
-<? } ?>
-
   <tr class="expert">
     <td colspan="2" align="left">
       <?=_Hash algorithm used when signing the certificate:?><br />
@@ -80,18 +65,22 @@
       <? } ?>
     </td>
   </tr>
-
-<? if($codesign) { ?>
-  <tr class="expert">
+  <tr><td colspan='2'>&nbsp;</td></tr>
+  <tr>
     <td>
-      <input type="checkbox" id="codesign" name="codesign" value="1" />
+      <input type="checkbox" id="login" name="login" value="1" checked="checked" />
     </td>
     <td align="left">
-      <label for="codesign"><?=_Code Signing?><br />
-      <?=_Please note: By ticking this box you will automatically have your name included in the certificate.?></label>
+      <label for="login"><?=_Enable certificate login with this certificate?><br />
+      <?=_By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .?></label>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" align="left">
+      <label for="description"><?=_Optional comment, only used in the certificate overview?></label><br />
+      <input type="text" id="description" name="description" maxlength="100" size="100" />
     </td>
   </tr>
-<? } ?>
 
   <tr>
     <td>
@@ -103,7 +92,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>