UPD: Stricter name part handling

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

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index ea23e332f512aed4203ff960326c2937d34e3b8b..dda8ce4fb9094785dfc46638eeb2d1b97c0de97f 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -24,11 +24,24 @@
     </select>
     </td>
   </tr>
+  <? if($orga) { ?>
+  <tr> 
+    <td>
+      <label for='org'><?=_Organisation?></label>
+    </td>  
+    <td><select name="org" id='org'>
+      <option value="-1"><?=_(none)?></option>
+    <? foreach($orga) { ?>
+      <option value="<?=$key?>"<?=$!selected?>><?=$name?></option>
+    <? } ?>
+    </select></td>
+  </tr>
+  <? } ?>
   <tr>
     <td>
     <label for='CN'><?=_Your name?></label>
     </td>
-    <td><input type='text' id='CN' name='CN' value='<?=$CN?>'></td>
+    <td><input type='text' id='CN' name='CN' value='<?=$CN?>'/></td>
   </tr>
   <tr>
     <td>SANs</td>
@@ -37,7 +50,7 @@
   <? if($orga) { ?>
   <tr>
     <td><?=_Departement?></td>
-    <td align="left"><input type='text' name='OU'/></td>
+    <td align="left"><input type='text' name='OU' value='<?=$department?>'/></td>
   </tr>
   <? } ?>
   <tr class="expertoff">
@@ -69,7 +82,7 @@
       <input type="checkbox" id="CCA" name="CCA" />
     </td>
     <td align="left">
-      <label for="CCA"><strong><?=s,$!CCA,I accept the CAcert Community Agreement (%s).?> </strong><br />
+      <label for="CCA"><strong><?=_I accept the CAcert Community Agreement ($!{CCA}).?> </strong><br />
       <?=_Please note: You need to accept the CCA to proceed.?></label>
     </td>
   </tr>