Cleanup

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

diff --git a/plugins/personal/posix/generic.tpl b/plugins/personal/posix/generic.tpl
index d1f1e3b3c0d8a8c4bd6d4bd2dd974d6a6dcc356c..48a819b50d888196e327525fcf9849c81cea4213 100644 (file)
--- a/plugins/personal/posix/generic.tpl
+++ b/plugins/personal/posix/generic.tpl
@@ -80,52 +80,19 @@
 
 <table summary="" style="width:100% ; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
-  <td>
+  <td style='width:50%'>
    <h2><img alt="" align="middle" src="images/terminal_small.png"> {t}Account{/t}</h2>
-  </td>
- </tr>
- <tr>
-  <td>
    {include file="$pwmode.tpl"}
   </td>
- </tr>
-</table>
-
-<p class="seperator">&nbsp;</p>
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
- <tr>
-  <td style="vertical-align:top; width:50%">
-   <h2><img alt="" align="middle" src="images/display.png"> {t}Environment{/t}</h2>
-   <table summary="">
-    <tr>
-     <td><LABEL for="gosaDefaultPrinter">{t}Default printer{/t}</LABEL></td>
-     <td>
-      <select id="gosaDefaultPrinter" size="1" name="gosaDefaultPrinter" {$gosaDefaultPrinterACL}>
-       {html_options options=$printerList selected=$gosaDefaultPrinter}
-               <option disabled value="">&nbsp;</option>
-      </select> 
-     </td>
-    </tr>
-    <tr>
-     <td><LABEL for="gosaDefaultLanguage">{t}Default language{/t}</LABEL></td>
-     <td>
-      <select size="1" id="gosaDefaultLanguage" name="gosaDefaultLanguage" {$gosaDefaultLanguageACL}>
-       {html_options values=$languages output=$languages selected=$gosaDefaultLanguage}
-      </select> 
-     </td>
-    </tr>
-   </table>
-  </td>
   <td style="border-left:1px solid #A0A0A0">
     &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/closedlock.png" style="margin-bottom:10px;"> {t}System trust{/t}&nbsp;
-    <select name="trustmode" id="trustmode" size=1 onchange="changeSelectState('trustmode', 'wslist'); changeSelectState('trustmode', 'add_ws'); changeSelectState('trustmode', 'del_ws');" {$trustmodeACL}>
+   <h2><img alt="" align="middle" src="images/closedlock.png" style="margin-bottom:10px;"> {t}System trust{/t}</h2>
+    {t}Trust mode{/t}&nbsp;<select name="trustmode" id="trustmode" size=1 onchange="changeSelectState('trustmode', 'wslist'); changeSelectState('trustmode', 'add_ws'); changeSelectState('trustmode', 'del_ws');" {$trustmodeACL}>
       {html_options options=$trustmodes selected=$trustmode}
     </select>
-   </h2>
-   <select style="width:350px;" id="wslist" name="workstation_list[]" size=4 multiple {$trustmodeACL} {$trusthide}>
+   <select style="width:350px;" id="wslist" name="workstation_list[]" size=5 multiple {$trustmodeACL} {$trusthide}>
     {html_options values=$workstations output=$workstations}
        {if $emptyArrAccess}
                <option disabled>&nbsp;</option>

diff --git a/plugins/personal/posix/posix_shadow.tpl b/plugins/personal/posix/posix_shadow.tpl
index f123ae59ca54edb34acca59a48a4618bd7be0e74..2cf44ea829831f808ec2d11f71abdb07cef2d92e 100644 (file)
--- a/plugins/personal/posix/posix_shadow.tpl
+++ b/plugins/personal/posix/posix_shadow.tpl
@@ -10,11 +10,6 @@
    <input type=checkbox name="use_shadowMax" value="1" {$use_shadowMax} {$shadowMaxACL}>
    {$shadowmaxs}
    <br>
-  </td>
-  <td style="border-left:1px solid #A0A0A0">
-    &nbsp;
-  </td>
-  <td style="vertical-align:top">
    <input type=checkbox name="use_shadowExpire" value="1" {$use_shadowExpire} {$shadowExpireACL}>
    {t}Password expires on{/t}
    <select name=day onChange="createResult(this.form,this.form.shadowExpire);" {$shadowExpireACL}>