From 6292e9df869734c501169df5c0778b2e12ead3fd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Fri, 5 Sep 2014 13:08:36 +0200
Subject: [PATCH] UPD: split up the "certificate initiation"-form

---
 .../pages/account/RequestCertificate.templ    | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/org/cacert/gigi/pages/account/RequestCertificate.templ b/src/org/cacert/gigi/pages/account/RequestCertificate.templ
index 08fc0cf6..9a448ba5 100644
--- a/src/org/cacert/gigi/pages/account/RequestCertificate.templ
+++ b/src/org/cacert/gigi/pages/account/RequestCertificate.templ
@@ -1,26 +1,47 @@
-
+<form method="post">
 <table class="wrapper dataTable">
   <thead>
   <tr>
-    <th colspan="2" class="title"><?=_New Certificate?></th>
+    <th colspan="2" class="title"><?=_New Certificate from CSR?></th>
   </tr>
   </thead>
   <tbody>
   <tr>
     <td><?=_I have a CSR! Paste it here:?></td>
-    <td><?=_I do not have a CSR.?></td>
+    <td>
+      <textarea name="CSR"></textarea>
+    </td>
   </tr>
-
   <tr>
-    <td>
-     <form method="post"> <textarea name="CSR"></textarea><br/>
-     <input type="submit" name="process" value="<?=_Next?>" />
-     <input type='hidden' name='<?=$csrf_name?>' value='<?=$csrf?>'></form>
+    <td colspan="2">
+      <input type="submit" name="process" value="<?=_Next?>" />
+      <input type='hidden' name='<?=$csrf_name?>' value='<?=$csrf?>'>
     </td>
+  </tr>
+  </tbody>
+</table>
+</form>
+<br>
+<form method="post">
+<table class="wrapper dataTable">
+  <thead>
+  <tr>
+    <th colspan="2" class="title"><?=_New Certificate from newly generatey Key (SPKAC)?></th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <td><?=_I do not have a CSR.?></td>
     <td align="left">
-     <form method="post"> <keygen name="SPKAC" challenge="<?=$spkacChallenge?>"/><br/>
+     <keygen name="SPKAC" challenge="<?=$spkacChallenge?>"/>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
      <input type="submit" name="process" value="<?=_Next?>" />
-     <input type='hidden' name='<?=$csrf_name?>' value='<?=$csrf?>'></form>
+     <input type='hidden' name='<?=$csrf_name?>' value='<?=$csrf?>'>
+    </td>
   </tr>
   </tbody>
 </table>
+</form>
-- 
2.39.2