X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fcerts%2FCertificateIssueForm.templ;h=7b00f194988bdab62f01b4ffb0c56ceab54295e0;hb=9cc60d1cefd379eccfbbfe4a8ba5698680ea74ca;hp=a9971f8d87dc62fa61d5c1813f8cd6331d0f6a73;hpb=3395fce1b4cf2ad4a01536f6aeabd59951ccee08;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index a9971f8d..7b00f194 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -24,24 +24,11 @@
     </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?>"><?=$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>
@@ -50,7 +37,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">
@@ -82,7 +69,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>