Updated Certificate template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15910 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/personal/generic/generic_certs.tpl b/gosa-core/plugins/personal/generic/generic_certs.tpl
index 50eaedc0b20b67e935fa414ec575ed3de43613a6..97100e1c4dc6e0f9c393f9fd3983ff15bfc8d1cf 100644 (file)
--- a/gosa-core/plugins/personal/generic/generic_certs.tpl
+++ b/gosa-core/plugins/personal/generic/generic_certs.tpl
@@ -1,99 +1,95 @@
 <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
- <!-- Headline container -->
-<h2>{image path="images/lists/key.png"} {t}Certificates{/t}
-</h2>
-
-<table summary="" style="vertical-align:top; text-align:left;border-top: 1px solid rgb(176,176,176);" width="100%" cellpadding=4 border=0>
+<h3>
+{t}Certificates{/t}</h3>
+<table width="100%" cellpadding=4 border=0>
  <tr>
-   <td width="12%" style="vertical-align:top">
-      {t}Standard certificate{/t}
-   </td>
-  
-   <td style="vertical-align:top">
-        <LABEL for="userCertificate_file">{if $Certificate_readable}{$userCertificateinfo}{/if}</LABEL>
-        </td>
-        <td style="vertical-align:top;text-align:right">
-        {if $userCertificate_state ne "true"}
-       {render acl=$CertificateACL}
-     <input id="userCertificate_file" name="userCertificate_file" type="file" size="20" maxlength="255" accept="text/*.*">
-       {/render}
-     {else}
-       {render acl=$CertificateACL}
-     <button type='submit' name='remove_userCertificate'>{t}Remove{/t}</button>
-
-       {/render}
-     {/if}
-   </td>
+  <td width="12%" style="vertical-align:top">
+   {t}Standard certificate{/t}
+  </td>
+  <td style="vertical-align:top">
+   <label for="userCertificate_file">
+   {if $Certificate_readable}{$userCertificateinfo}{/if}</label>
+  </td>
+  <td style="vertical-align:top;text-align:right">
+   {if $userCertificate_state ne "true"}
+   {render acl=$CertificateACL}
+   <input id="userCertificate_file" name="userCertificate_file" type="file" size="20" maxlength="255" accept="text/*.*">
+   {/render}
+   {else}
+   {render acl=$CertificateACL}
+   <button type='submit' name='remove_userCertificate'>
+   {t}Remove{/t}</button>
+   {/render}
+   {/if}
+  </td>
  </tr>
- </table>
-
+</table>
 <br>
-
- <table summary="" style="vertical-align:top; text-align:left;border-top: 1px solid rgb(176,176,176);" width="100%" cellpadding=4 border=0>
+<table summary="" style="vertical-align:top; text-align:left;border-top: 1px solid rgb(176,176,176);" width="100%" cellpadding=4 border=0>
  <tr>
-   <td width="12%" style="vertical-align:top">
-      {t}S/MIME certificate{/t} 
-   </td>
-   <td style="vertical-align:top">
-     <LABEL for="userSMIMECertificate_file">{if $Certificate_readable}{$userSMIMECertificateinfo}{/if}</LABEL>
-   </td>
-   <td style="vertical-align:top;text-align:right">
-        {if $userSMIMECertificate_state ne "true"}
-       {render acl=$CertificateACL}
-     <input id="userSMIMECertificate_file" name="userSMIMECertificate_file" type="file" size="20" maxlength="255" accept="text/*.*">
-       {/render}
-     {else}
-       {render acl=$CertificateACL}
-     <button type='submit' name='remove_userSMIMECertificate'>{t}Remove{/t}</button>
-
-       {/render}
-        {/if}
-   </td>
+  <td width="12%" style="vertical-align:top">
+   {t}S/MIME certificate{/t} 
+  </td>
+  <td style="vertical-align:top">
+   <label for="userSMIMECertificate_file">
+   {if $Certificate_readable}{$userSMIMECertificateinfo}{/if}</label>
+  </td>
+  <td style="vertical-align:top;text-align:right">
+   {if $userSMIMECertificate_state ne "true"}
+   {render acl=$CertificateACL}
+   <input id="userSMIMECertificate_file" name="userSMIMECertificate_file" type="file" size="20" maxlength="255" accept="text/*.*">
+   {/render}
+   {else}
+   {render acl=$CertificateACL}
+   <button type='submit' name='remove_userSMIMECertificate'>
+   {t}Remove{/t}</button>
+   {/render}
+   {/if}
+  </td>
  </tr>
- </table>
-
+</table>
 <br>
-
-<table summary="" style="vertical-align:top; text-align:left;border-top: 1px solid rgb(176,176,176);" width="100%" cellpadding=4 border=0> 
+<table summary="" style="vertical-align:top; text-align:left;border-top: 1px solid rgb(176,176,176);" width="100%" cellpadding=4 border=0>
  <tr>
-   <td width="12%" style="vertical-align:top">
-      {t}PKCS12 certificate{/t} 
-   </td>
-   <td style="vertical-align:top">
-     <LABEL for="userPKCS12_file">{if $Certificate_readable}{$userPKCS12info}{/if}</LABEL>
-   </td>
-   <td style="vertical-align:top;text-align:right">
-        {if $userPKCS12_state ne "true"}
-       {render acl=$CertificateACL}
-     <input id="userPKCS12_file" name="userPKCS12_file" type="file" size="20" maxlength="255" accept="text/*.*">
-       {/render}
-        {else}
-       {render acl=$CertificateACL}
-     <button type='submit' name='remove_userPKCS12'>{t}Remove{/t}</button>
-
-       {/render}
-        {/if}
-   </td>
+  <td width="12%" style="vertical-align:top">
+   {t}PKCS12 certificate{/t} 
+  </td>
+  <td style="vertical-align:top">
+   <label for="userPKCS12_file">
+   {if $Certificate_readable}{$userPKCS12info}{/if}</label>
+  </td>
+  <td style="vertical-align:top;text-align:right">
+   {if $userPKCS12_state ne "true"}
+   {render acl=$CertificateACL}
+   <input id="userPKCS12_file" name="userPKCS12_file" type="file" size="20" maxlength="255" accept="text/*.*">
+   {/render}
+   {else}
+   {render acl=$CertificateACL}
+   <button type='submit' name='remove_userPKCS12'>
+   {t}Remove{/t}</button>
+   {/render}
+   {/if}
+  </td>
  </tr>
- 
  {if $governmentmode eq "true"}
  <tr>
-   <td>
-     <LABEL for="certificateSerialNumber">{t}Certificate serial number{/t}</LABEL>
-   </td>
-   <td>
-       {render acl=$CertificateACL}
-     <input type='text' id="certificateSerialNumber" name="certificateSerialNumber" size=10 maxlength=20 value="{$certificateSerialNumber}">
-       {/render}
-   </td>
+  <td>
+   <label for="certificateSerialNumber">
+   {t}Certificate serial number{/t}</label>
+  </td>
+  <td>
+   {render acl=$CertificateACL}
+   <input type='text' id="certificateSerialNumber" name="certificateSerialNumber" size=10 maxlength=20 value="{$certificateSerialNumber}">
+   {/render}
+  </td>
  </tr>
  {/if}
 </table>
-
 <div class='plugin-actions'>
-       {render acl=$CertificateACL}
-    <button type='submit' name='cert_edit_finish'>{msgPool type=saveButton}</button>
-       {/render}
-  <button type='submit' name='cert_edit_cancel'>{msgPool type=cancelButton}</button>
+ {render acl=$CertificateACL}
+ <button type='submit' name='cert_edit_finish'>
+ {msgPool type=saveButton}</button>
+ {/render}
+ <button type='submit' name='cert_edit_cancel'>
+ {msgPool type=cancelButton}</button>
 </div>
-