X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fpersonal%2Fgeneric%2Fgeneric_certs.tpl;h=366a6ef733186fa1429d27ae3f8220cd2ea9b373;hb=921b0b204d4014702bba386e46dc5b4242be5458;hp=f5953898063c6df0539deac0fd7efdc685a4bf65;hpb=a6a8f63a88fd06850c5736a4cfb4532ea3862303;p=gosa.git

diff --git a/gosa-core/plugins/personal/generic/generic_certs.tpl b/gosa-core/plugins/personal/generic/generic_certs.tpl
index f59538980..366a6ef73 100644
--- a/gosa-core/plugins/personal/generic/generic_certs.tpl
+++ b/gosa-core/plugins/personal/generic/generic_certs.tpl
@@ -1,96 +1,101 @@
 <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
- <!-- Headline container -->
-<h2><img alt="" class="center" align="middle" src="images/certs.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 summary="{t}The users standard certificate{/t}" style="width:100%">
  <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}
-     <input type=submit name="remove_userCertificate" value="{t}Remove{/t}">
-	{/render}
-     {/if}
-   </td>
+  <td style="width:25%">
+   {t}Standard certificate{/t}
+  </td>
+  <td>
+   <label for="userCertificate_file">
+   {if $Certificate_readable}{$userCertificateinfo}{/if}</label>
+  </td>
+  <td style="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>
+<hr>
 
- <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="{t}The users S/MIME certificate{/t}" style="width:100%">
  <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}
-     <input type=submit name="remove_userSMIMECertificate" value="{t}Remove{/t}">
-	{/render}
-	 {/if}
-   </td>
+  <td style="width:25%">
+   {t}S/MIME certificate{/t} 
+  </td>
+  <td>
+   <label for="userSMIMECertificate_file">
+   {if $Certificate_readable}{$userSMIMECertificateinfo}{/if}</label>
+  </td>
+  <td style="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>
+<hr>
 
-<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="{t}The users PKCS12 certificate{/t}" style="width:100%">
  <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}
-     <input type=submit name="remove_userPKCS12" value="{t}Remove{/t}">
-	{/render}
-	 {/if}
-   </td>
+  <td style="width:25%">
+   {t}PKCS12 certificate{/t} 
+  </td>
+  <td>
+   <label for="userPKCS12_file">
+   {if $Certificate_readable}{$userPKCS12info}{/if}</label>
+  </td>
+  <td style="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 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>
-
-<p class="plugbottom">
-	{render acl=$CertificateACL}
-  <input type=submit name="cert_edit_finish" value="{msgPool type=saveButton}">
-	{/render}
-  &nbsp;
-  <input type=submit name="cert_edit_cancel" value="{msgPool type=cancelButton}">
-</p>
-
+<hr>
+<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>
+</div>