Included changes done in the train

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

diff --git a/html/images/list_new_conference.png b/html/images/list_new_conference.png
new file mode 100644 (file)
index 0000000..ee9cf5f
Binary files /dev/null and b/html/images/list_new_conference.png differ

diff --git a/html/images/select_conference.png b/html/images/select_conference.png
new file mode 100644 (file)
index 0000000..f331bfe
Binary files /dev/null and b/html/images/select_conference.png differ

diff --git a/plugins/admin/departments/generic.tpl b/plugins/admin/departments/generic.tpl
index 819e5aa3e14a1c9f8e4f0184a8305a5327d6836d..fc54d4ceafce8110ab556601997c1bdccef84c04 100644 (file)
--- a/plugins/admin/departments/generic.tpl
+++ b/plugins/admin/departments/generic.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
  <tr>
-   <td style="vertical-align:top;">
+   <td style="vertical-align:top; width:50%">
      <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Properties{/t}</h2>
      
      <table summary="">
@@ -41,7 +41,7 @@
    <td>
      <h2><img alt="" align="middle" src="images/house.png"> {t}Location{/t}</h2>
 
-     <table summary="">
+     <table summary="" style="width:100%">
       <tr>
        <td><LABEL for="st">{t}State{/t}</LABEL></td>
        <td><input id="st" name="st" size=25 maxlength=60 {$stACL} value="{$st}" title="{t}State where this subtree is located{/t}"></td>
@@ -52,7 +52,7 @@
       </tr>
       <tr>
        <td style="vertical-align:top;"><LABEL for="postalAddress">{t}Address{/t}</LABEL></td>
-       <td><textarea id="postalAddress" name="postalAddress" rows=3 cols=22 {$postalAddressACL} title="{t}Postal address of this subtree{/t}">{$postalAddress}</textarea>
+       <td><textarea id="postalAddress" name="postalAddress" style="width:100%" rows=3 cols=22 {$postalAddressACL} title="{t}Postal address of this subtree{/t}">{$postalAddress}</textarea>
       </tr>
       <tr>
        <td><LABEL for="telephoneNumber">{t}Phone{/t}</LABEL></td>

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index 520eade9e339621ed2d2d85517e90362da523012..133c432876b8ead04ee9a7cabb3d4058f1061351 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -359,6 +359,7 @@ class mailgroup extends plugin
 
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
       $smarty->assign("launchimage", get_template_path('images/small_filter.png'));

diff --git a/plugins/admin/groups/generic.tpl b/plugins/admin/groups/generic.tpl
index e6e786044b4d6fb4c7451094e37eca1974a11c97..136a54615b7dfcba2b275a5fd7a88c27fe3e606b 100644 (file)
--- a/plugins/admin/groups/generic.tpl
+++ b/plugins/admin/groups/generic.tpl
@@ -2,7 +2,7 @@
  <tr>
   <td style="width:50%; vertical-align:top;">
    <input type="hidden" name="groupedit" value="1">
-   <table summary="">
+   <table summary="" style="width:100%">
     <tr>
      <td><LABEL for="cn">{t}Group name{/t}</LABEL>{$must}</td>
      <td>
@@ -86,12 +86,12 @@
 
   <td style="vertical-align:top;">
 
-   <table summary="">
+   <table summary="" style="width:100%">
     <tr>
-     <td style="vertical-align:top;">
+     <td style="vertical-align:top; width:50%">
       <b><LABEL for="members">{t}Group members{/t}</LABEL></b>
       <br>
-      <select style="width:400px; height:300px;" id="members" name="members[]" size=15 multiple>
+      <select style="width:100%; height:450px;" id="members" name="members[]" size=15 multiple>
        {html_options options=$members}
                <option disabled>&nbsp;</option>
       </select>

diff --git a/plugins/admin/groups/group_objects.tpl b/plugins/admin/groups/group_objects.tpl
index 661d6a57abbeefe601bbbeb6e1f192039e99763c..bb58eceaae90dd65387ba060fff10484f403a74a 100644 (file)
--- a/plugins/admin/groups/group_objects.tpl
+++ b/plugins/admin/groups/group_objects.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
 <tr>
-  <td style="vertical-align:top;" width="500">
+  <td style="vertical-align:top; width:600px">
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
      <b><LABEL for="users">{t}Select users to add{/t}</LABEL> {$hint}</b>
@@ -8,7 +8,7 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select id="users" style="width:500px; height:450px; margin-top:4px;" name="users[]" size="15" multiple>
+     <select id="users" style="width:600px; height:450px; margin-top:4px;" name="users[]" size="15" multiple>
       {html_options options=$users}
      </select>
      <input type=hidden name="edit_helper">
@@ -25,11 +25,9 @@
      </table>
     <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
                <tr>
-                       <td width="50%">
-                               <img alt="" src="{$tree_image}" align=middle>
-                               &nbsp;<LABEL for="dselect">{t}Display users of department{/t}</LABEL>
-                       </td>
-               <td>
+                       <td>
+                               <img alt="" src="{$tree_image}" align=middle title="{t}Display users of department{/t}">
+                               &nbsp;
                                <select name="dselect" id="dselect" size=1 onChange="mainform.submit()" 
                                        title="{t}Choose the department the search will be based on{/t}">
                                {html_options options=$deplist selected=$dselect}
@@ -37,8 +35,8 @@
                        </td>
                </tr>
        </table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display users matching{/t}</td>
-    <td><input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching user names{/t}' onChange="mainform.submit()"></td></tr></table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td style="width:18px"><img alt="" src="{$search_image}" align=middle title="{t}Display users matching{/t}"></td>
+    <td><input type='text' name='regex' maxlength='20' style='width:99%' value='{$regex}' title='{t}Regular expression for matching user names{/t}' onChange="mainform.submit()"></td></tr></table>
    {$apply}
    </div>
   </td>

diff --git a/plugins/admin/groups/mail.tpl b/plugins/admin/groups/mail.tpl
index 34d7d931522bb2d4089548172aec83c5a9640ae2..7729169c4c0d61858929b6aae7f1ee9d98bd7158 100644 (file)
--- a/plugins/admin/groups/mail.tpl
+++ b/plugins/admin/groups/mail.tpl
@@ -3,7 +3,7 @@
 
  <!-- Headline container -->
  <tr>
-  <td style="width:50%; vertical-align:top;">
+  <td style="width:50%; border-right:1px solid #A0A0A0; vertical-align:top">
    <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Generic{/t}</h2>
    <table summary="">
     <tr>
@@ -40,12 +40,9 @@
    </table>
      
   </td>
-  <td style="border-left:1px solid #A0A0A0">
-   &nbsp;
-  </td>
-  <td style="vertical-align:top">
+  <td style="vertical-align:top;padding-left:2px;">
    <h2><img alt="" align="middle" src="images/alternatemail.png"> {t}Alternative addresses{/t}</h2>
-   <select style="width:350px; height:100px;" name="alternates_list[]" size=15 multiple title="{t}List of alternative mail addresses{/t}">
+   <select style="width:100%;" name="alternates_list[]" size=10 multiple title="{t}List of alternative mail addresses{/t}">
     {html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress}
        <option disabled>&nbsp;</option>
    </select>
@@ -62,7 +59,7 @@
 
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
  <tr>
-  <td style="width:50%; vertical-align:top;">
+  <td style="vertical-align:top;width:50%; border-right:1px solid #A0A0A0">
    <h2><img alt="" align="middle" src="images/members.png"> {t}IMAP shared folders{/t}</h2>
 
    <table summary="" cellpadding=0 border=0>
@@ -87,12 +84,9 @@
    </table>
       
   </td>
-  <td style="border-left:1px solid #A0A0A0">
-       &nbsp;
-  </td>
-  <td style="vertical-align:top">
+  <td style="vertical-align:top;width:50%">
    <h2><img alt="" align="middle" src="images/envelope.png"> {t}Forward messages to non group members{/t}</h2>
-   <select style="width:350px; height:100px;" name="forwarder_list[]" size=15 multiple>
+   <select style="width:100%;" name="forwarder_list[]" size=10 multiple>
     {html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress}
        <option disabled>&nbsp;</option>
    </select>

diff --git a/plugins/admin/groups/mail_locals.tpl b/plugins/admin/groups/mail_locals.tpl
index 94be4bc095b13f43db605fb11c131fc144f45386..621669e478b398a46682fa92e6ca3712826d26ae 100644 (file)
--- a/plugins/admin/groups/mail_locals.tpl
+++ b/plugins/admin/groups/mail_locals.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
 <tr>
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top; width:600px">
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
      <b><LABEL for="local_list">{t}Select addresses to add{/t} {$hint}</LABEL ></b><br>
@@ -8,7 +8,7 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select style="width:500px; margin-top:4px; height:450px;" id="local_list" name="local_list[]" size="15" multiple>
+     <select style="width:600px; margin-top:4px; height:450px;" id="local_list" name="local_list[]" size="15" multiple>
                {html_options options=$mailusers}
                <option disabled>&nbsp;</option>
      </select>
@@ -28,10 +28,8 @@
      </table>
     <table summary="" width="100%" style="width:100%;border-top:1px solid #B0B0B0; background-color:#F8F8F8">
                <tr>
-                       <td width="50%">
-                               <img alt="" src="{$tree_image}" align=middle>&nbsp;{t}Display addresses of department{/t}
-                       </td>
-               <td>
+                       <td>
+                               <img alt="" src="{$tree_image}" align=middle title="{t}Display addresses of department{/t}">&nbsp;
                                <select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
                        {html_options options=$deplist selected=$depselect}
                                </select>
@@ -40,21 +38,21 @@
        </table>
     <table summary="" width="100%" style="width:100%;border-top:1px solid #B0B0B0; background-color:#F8F8F8">
                <tr>
-                       <td width="50%">
-                               <img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display addresses matching{/t}
+                       <td width="18px">
+                               <img alt="" src="{$search_image}" align=middle title="{t}Display addresses matching{/t}">
                        </td>
                <td>
-                               <input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()">
+                               <input type='text' name='regex' maxlength='20' style="width:99%"value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()">
                        </td>
                </tr>
        </table>
     <table summary="" width="100%"  style="width:100%;border-top:1px solid #B0B0B0; background-color:#F8F8F8">
                <tr>
-                       <td width="50%">
-                               <img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display addresses of user{/t}
+                       <td width="18px">
+                               <img alt="" src="{$usearch_image}" align=middle title="{t}Display addresses of user{/t}">
                        </td>
                <td>
-                               <input type='text' name='muser' maxlength='20' value='{$muser}' title='{t}User name of which addresses are shown{/t}' onChange="mainform.submit()">
+                               <input type='text' name='muser' maxlength='20' value='{$muser}' style="width:99%" title='{t}User name of which addresses are shown{/t}' onChange="mainform.submit()">
                        </td>
                </tr>
        </table>

diff --git a/plugins/admin/ogroups/generic.tpl b/plugins/admin/ogroups/generic.tpl
index 5e64cb34bdf15bf76b58d51bf0d08b64e8b9cc6f..6a8a7b3a8fb3cd9cc0b023b84b08918379609ac5 100644 (file)
--- a/plugins/admin/ogroups/generic.tpl
+++ b/plugins/admin/ogroups/generic.tpl
@@ -15,8 +15,9 @@
      </td>
     </tr>
     <tr>
-     <td colspan=2></td>
+     <td colspan=2>&nbsp;</td>
     </tr>
+    <tr>
     <tr>
      <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
      <td>
@@ -31,7 +32,7 @@
   <td style="border-left:1px solid #A0A0A0; padding-left:10px;">
    <b><LABEL for="members">{t}Member objects{/t}</LABEL></b>&nbsp;({$combinedObjects})
    <br>
-   <select style="width:400px; height:300px;" id="members" name="members[]" size="15" multiple>
+   <select style="width:100%; height:450px;" id="members" name="members[]" size="15" multiple>
     {$members}
    </select>
    <br>

diff --git a/plugins/admin/ogroups/ogroup_objects.tpl b/plugins/admin/ogroups/ogroup_objects.tpl
index abe6a141be960524f98fe8b0c3fbf112636f6622..cf248fe7819a6334b28956d0f69d8a1d38d2a695 100644 (file)
--- a/plugins/admin/ogroups/ogroup_objects.tpl
+++ b/plugins/admin/ogroups/ogroup_objects.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
 <tr>
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top; width:600px;">
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
      <b>{t}Select objects to add{/t} {$hint}</b>
@@ -8,7 +8,7 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select style="width:500px; height:450px; margin-top:4px;" name="objects[]" size="15" multiple>
+     <select style="width:600px; height:450px; margin-top:4px;" name="objects[]" size="15" multiple>
       {$objects}
      </select>
      <input type=hidden name="edit_helper">
@@ -34,12 +34,12 @@
     <input type=checkbox name="printers" value="1" {$printers} onClick="mainform.submit()" title="{t}Select to see printers{/t}">{t}Show printers{/t}<br>
     <input type=checkbox name="phones" value="1" {$phones} onClick="mainform.submit()" title="{t}Select to see phones{/t}">{t}Show phones{/t}<br>
  </p>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle>&nbsp;{t}Display objects of department{/t}</td>
-    <td><select name="dselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle title="{t}Display objects of department{/t}">&nbsp;
+    <select name="dselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
       {html_options options=$deplist selected=$dselect}
     </select></td></tr></table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display objects matching{/t}</td>
-    <td><input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching object names{/t}' onChange="mainform.submit()"></td></tr></table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td style="width:18px"><img alt="" src="{$search_image}" align=middle title="{t}Display objects matching{/t}"></td>
+    <td><input type='text' name='regex' maxlength='20' style="width:99%" value='{$regex}' title='{t}Regular expression for matching object names{/t}' onChange="mainform.submit()"></td></tr></table>
    {$apply}
    </div>
   </td>

diff --git a/plugins/admin/systems/class_selectUserToPrinterDialog.inc b/plugins/admin/systems/class_selectUserToPrinterDialog.inc
index 4321e412da2f93d1ba395f936b3894d1b6ea30af..d07f482daa435e107e1e8849fbe3e6cc16453c41 100644 (file)
--- a/plugins/admin/systems/class_selectUserToPrinterDialog.inc
+++ b/plugins/admin/systems/class_selectUserToPrinterDialog.inc
@@ -82,7 +82,7 @@ class selectUserToPrinterDialog extends plugin
     $smarty->assign("search_image"        , get_template_path('images/search.png'));
     $smarty->assign("tree_image"          , get_template_path('images/tree.png'));
     $smarty->assign("infoimage"           , get_template_path('images/info.png'));
-    $smarty->assign("launchimage"         , get_template_path('images/launch.png'));
+    $smarty->assign("launchimage"         , get_template_path('images/small_filter.png'));
     $smarty->assign("deplist"             , $this->config->idepartments);
 
     $display.= $smarty->fetch(get_template_path('selectUserToPrinterDialog.tpl', TRUE,dirname(__FILE__)));

diff --git a/plugins/admin/systems/component.tpl b/plugins/admin/systems/component.tpl
index a4952887d242b8056228a5e357c6e942be53a940..ce04d6ffec7a9e853ec8f126384d099c65b51a74 100644 (file)
--- a/plugins/admin/systems/component.tpl
+++ b/plugins/admin/systems/component.tpl
@@ -1,6 +1,6 @@
 <table summary="" width="100%">
  <tr>
-  <td style="vertical-align:top; width:50%;">
+  <td style="vertical-align:top; width:50%; border-right:1px solid #A0A0A0">
        <table summary="">
         <tr>
          <td><LABEL for="cn">{t}Device name{/t}</LABEL>{$must}</td>

diff --git a/plugins/admin/systems/phone.tpl b/plugins/admin/systems/phone.tpl
index 76a0c8703143cb1dcf0fa87043719f53a14e1152..a431d4c852ad2bf26bb281f7d56230d8b092fd96 100644 (file)
--- a/plugins/admin/systems/phone.tpl
+++ b/plugins/admin/systems/phone.tpl
@@ -1,6 +1,6 @@
 <table summary="" width="100%">
  <tr>
-  <td style="vertical-align:top; width:50%;">
+  <td style="vertical-align:top; width:50%; border-right:1px solid #A0A0A0">
        <table summary="">
         <tr>
          <td><LABEL for="cn">{t}Phone name{/t}</LABEL>{$must}</td>

diff --git a/plugins/admin/systems/phonesettings.tpl b/plugins/admin/systems/phonesettings.tpl
index 45cec1b5dc9d8ff3ea24f5305cbf8b15a8475bfe..310f204bfb7a42e37a928c3f27c10c6ce67d254c 100644 (file)
--- a/plugins/admin/systems/phonesettings.tpl
+++ b/plugins/admin/systems/phonesettings.tpl
@@ -1,29 +1,26 @@
-<h2><img alt="" align="middle" src="images/select_phone.png"> {t}Specific Phone settings{/t}</h2>
+<h2><img alt="" align="middle" src="images/select_phone.png"> {t}Advanced phone settings{/t}</h2>
 
-<table summary="" width="100%" cellpadding=10>
+<table summary="" style="width:100%" border=0>
        <tr>
-               <td colspan="3">
-                       <table summary="" width="100%">
-                       <tr>
-                               <td>
-                                       <LABEL for="selected_categorie">{t}Phone type{/t}</LABEL>{$staticAddress}
-                                       <select id="selected_categorie" size="1" name="selected_categorie" title="{t}Choose a phone type{/t}" onchange="mainform.submit();">
-                                               {html_options options=$categories selected=$selected_categorie}
-                                       </select>
-                                       <input type="submit" value="{t}refresh{/t}" name="refresh">
-                               </td>
-                       </table>
+               <td colspan="2">
+               <LABEL for="selected_categorie">{t}Phone type{/t}</LABEL>{$staticAddress}
+               <select id="selected_categorie" size="1" name="selected_categorie" title="{t}Choose a phone type{/t}" onchange="mainform.submit();">
+                       {html_options options=$categories selected=$selected_categorie}
+               </select>
+               <input type="submit" value="{t}refresh{/t}" name="refresh">
+               <br>
+               <br>
+       </td>
        </tr>
-
 {if $selected_categorie eq '0'}
-       
        <tr>
-               <td>
-                       <table summary="">
+               <td style="width:50%; border-right:1px solid #A0A0A0">
+                       <table summary="" border=0>
                         <tr>
                                <td>
                                        <LABEL for="goFonType">{t}Mode{/t}</LABEL>{$staticAddress}
-
+                                       
+                               </td>
                                <td>
                                        <select id="goFonType" size="1" name="goFonType" title="{t}Choose a phone type{/t}" style="width:200px;" {$goFonTypeUSED}>
                                                {html_options options=$goFonTypes selected=$goFonType}
@@ -43,7 +40,7 @@
                </table>
           </td>
           <td>
-               <table summary="">
+               <table summary="" border=0>
                        <tr>
                                <td >
                                        <LABEL for="goFonDefaultIP">{t}Default IP{/t}</LABEL>
@@ -64,8 +61,6 @@
                        </tr>
                        </table>
                </td>
-               <td>
-               </td>
         </tr>
 </table>
 {/if}
@@ -73,7 +68,7 @@
 {if $selected_categorie eq '1'}
                
        <tr>
-               <td style="vertical-align:top">
+               <td style="vertical-align:top; width:50%; border-right:1px solid #A0A0A0">
                        <table summary="" width="100%">
                         <tr>
                                <td>
@@ -158,7 +153,7 @@
                     <LABEL for="goFonTrunk">{t}Trunk lines{/t}</LABEL>
                 </td>
                 <td>
-                     <select size="1" id="goFonTrunk" name="goFonTrunk" title="{t}Choose a phone type{/t}" style="width:200px;" {$goFonTrunkUSED}>
+                     <select size="1" id="goFonTrunk" name="goFonTrunk" title="{t}Choose a phone type{/t}" {$goFonTrunkUSED}>
                         {html_options options=$goFonTrunks selected=$goFonTrunk}
                      </select>
                  </td>
@@ -171,7 +166,7 @@
                <tr>
                     <td style="vertical-align:top;">
                         <LABEL for="goFonPermitS">{t}Hosts that are allowed to connect{/t}</LABEL><br>
-                        <select id="goFonPermitS" style="width:300px; height:80px;" name="goFonPermitS" size=15
+                        <select id="goFonPermitS" style="width:100%; height:80px;" name="goFonPermitS" size=15
                             multiple title="{t}List of alternative mail addresses{/t}">
                             {html_options values=$goFonPermit output=$goFonPermit}
                             <option disabled>&nbsp;</option>
@@ -186,7 +181,7 @@
                                <tr>
                     <td style="vertical-align:top;">
                        <LABEL for="goFonDenyS">{t}Hosts that are not allowed to connect{/t}</LABEL><br>
-                        <select id="goFonDenyS" style="width:300px; height:80px;" name="goFonDenyS" size=15
+                        <select id="goFonDenyS" style="width:100%; height:80px;" name="goFonDenyS" size=15
                             multiple title="{t}List of alternative mail addresses{/t}">
                             {html_options values=$goFonDeny output=$goFonDeny}
                             <option disabled>&nbsp;</option>
@@ -203,7 +198,7 @@
 
 {if $selected_categorie eq '2'}
        <tr>
-               <td>
+               <td style="width:50%">
                        <table summary="" width="100%">
                                <tr>
                                        <td>

diff --git a/plugins/admin/systems/printerPPDSelectionDialog.tpl b/plugins/admin/systems/printerPPDSelectionDialog.tpl
index d0f0c25e5b7585d207908da0c5fd3ce72838bf40..5c628e11d97f873775b7a1ece2bb7f73484b4ef7 100644 (file)
--- a/plugins/admin/systems/printerPPDSelectionDialog.tpl
+++ b/plugins/admin/systems/printerPPDSelectionDialog.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
        <tr>
-               <td style="vertical-align:top;width=50%;">
+               <td style="vertical-align:top;width=50%;width:600px">
                        <div class="contentboxh" style="height:20px;">
                                <p class="contentboxh" style="font-size:12px">
                                        <b>{t}Select objects to add{/t}</b>
@@ -28,20 +28,11 @@
         </table>
         <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
           <tr>
-            <td width="50%">
-              <img alt="" src="{$tree_image}" align=middle> 
-              &nbsp;{t}Display objects of department{/t}
-            </td>
-          </tr>
-        </table>
-        <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-          <tr>
-            <td width="50%">
-              <img alt="" src="{$search_image}" align=middle>
-              &nbsp;{t}Display objects matching{/t}
+            <td style="width:18px">
+              <img alt="" src="{$search_image}" align=middle title="{t}Display objects matching{/t}">
             </td>
             <td>
-              <input type='text' name='regex' maxlength='20' value='{$regex}' 
+              <input type='text' style="width:99%" name='regex' maxlength='20' value='{$regex}' 
                 title='{t}Regular expression for matching object names{/t}' onChange="mainform.submit();">
             </td>
           </tr>

diff --git a/plugins/admin/systems/selectUserToPrinterDialog.tpl b/plugins/admin/systems/selectUserToPrinterDialog.tpl
index d20c56bae9dd191847f87a27ccde834f9b8bcfe1..aefe36130b4d6e5e92fa0c6aec6503c603f31b49 100644 (file)
--- a/plugins/admin/systems/selectUserToPrinterDialog.tpl
+++ b/plugins/admin/systems/selectUserToPrinterDialog.tpl
@@ -2,7 +2,7 @@
 
        <table summary="{t}Select printer to add{/t}" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
         <tr>
-            <td width="50%">
+            <td style="width:600px">
                                <div class="contentboxh" style="height:20px;">
                                <p class="contentboxh" style="font-size:12px">
                                        <b><LABEL for="gotoPrinter">{t}Select entries to add{/t}</LABEL></b>
@@ -10,7 +10,7 @@
                                </div>
                                <div class="contentboxb">
                                <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-                               <select style="width:500px;height:480px;" size=20 name="gotoPrinter[]" id="gotoPrinter" multiple>
+                               <select style="width:600px;height:450px;" size=20 name="gotoPrinter[]" id="gotoPrinter" multiple>
                                {html_options values=$gotoPrinterKeys output=$gotoPrinters}
                                <option disabled>&nbsp;</option>
                                         </select><br>
@@ -18,18 +18,8 @@
                                </div>
             </td>
             <td valign="top">
-                               <div class="contentboxh">
-                               <p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
-                               </div>
-                               <div class="contentboxb">
-                                       <p class="contentboxb" style="background-color:#F8F8F8">
-                                       {t}This menu allows you to select one or multiple entries to be added to the printer object for specific tasks. Having a great number of entries, you may want to use the range selectors below.{/t}
-                               </p>
-                               </div>
-                               <br>
-
-                               <div class="contentboxh">
-                               <p class="contentboxh"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
+                               <div class="contentboxh" style="height:20px">
+                               <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
                                </div>
                                <div class="contentboxb">
                                <table summary="" style="width:100%;border-top:1px solid #B0B0B0;background-color:#F8F8F8">

diff --git a/plugins/admin/systems/terminalStartup.tpl b/plugins/admin/systems/terminalStartup.tpl
index f544c44e2e8d19e4abe027995946a5dfb0e52f32..32e6e948ea88e7795007e3b1c506cf59c45d372b 100644 (file)
--- a/plugins/admin/systems/terminalStartup.tpl
+++ b/plugins/admin/systems/terminalStartup.tpl
@@ -52,7 +52,7 @@
    <h2>
     <img alt="" align="middle" src="images/hardware.png"> {t}Kernel modules (format: name parameters){/t}
    </h2>
-    <select style="width:100%; height:100px;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}">
+    <select style="width:100%;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}">
      {html_options values=$gotoModules output=$gotoModules}
         <option disabled>&nbsp;</option>
     </select>
@@ -62,12 +62,12 @@
     <input type=submit value="{t}Delete{/t}" name="delete_module" {$gotoModulesACL}>
   </td>
 
-  <td style="padding-left:10px;border-left:1px solid #A0A0A0" >
+  <td style="padding-left:10px;border-left:1px solid #A0A0A0;vertical-align:top">
         <h2><img alt="" src="images/fai_partitionTable.png" align="middle">&nbsp;<LABEL for="gotoShare">{t}Shares{/t}</LABEL></h2>
         <table summary="" style="width:100%">
                 <tr>
                         <td>
-                        <select style="width:100%;height:150px;" name="gotoShare" multiple size=4 {$gotoShareACL} id="gotoShare">
+                        <select style="width:100%;" name="gotoShare" multiple size=15 {$gotoShareACL} id="gotoShare">
         {html_options values=$gotoShareKeys output=$gotoShares}
         <option disabled>&nbsp;</option>
                                 </select>

diff --git a/plugins/gofax/blocklists/generic.tpl b/plugins/gofax/blocklists/generic.tpl
index 8d7dddb4bc126c1b876f5f57d5629491947b56e6..d2e80aae030021ca9651cd112df406b3cc2ca6bb 100644 (file)
--- a/plugins/gofax/blocklists/generic.tpl
+++ b/plugins/gofax/blocklists/generic.tpl
@@ -1,5 +1,5 @@
 <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Generic{/t}</h2>
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
+<table summary="" style="width:100%; vertical-align:top; text-align:left;">
 
  <tr>
    <td style="width:50%; vertical-align:top;">
@@ -50,11 +50,11 @@
 
 <p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
 
-<table summary="">
+<table summary="" style="width:100%">
  <tr>
-   <td>
+   <td style="width:50%;">
      <h2><img alt="" align="middle" src="images/false.png"> {t}Blocked numbers{/t}</h2>
-     <select style="width:400px; height:200px;" name="numbers[]" size=15 multiple>
+     <select style="width:100%; height:200px;" name="numbers[]" size=15 multiple>
       {html_options values=$goFaxBlocklist output=$goFaxBlocklist}
          <option disabled>&nbsp;</option>
      </select>
@@ -63,6 +63,9 @@
      <input type=submit value="{t}Add{/t}" {$goFaxBlocklistACL} name="add_number">&nbsp;
      <input type=submit value="{t}Delete{/t}" {$goFaxBlocklistACL} name="delete_number">
    </td>
+  <td style="border-left:1px solid #A0A0A0">
+   &nbsp;
+  </td>
    <td style="vertical-align:top;">
      <h2><img alt="" align="middle" src="images/info_small.png"> {t}Information{/t}</h2>
      <p>

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 12221b6e76e6b83b9cb3f01e1cc2e8c567cc16ca..2ec35c9ea3efb75b856c260b4f407fa13c7bf87f 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -315,6 +315,7 @@ class gofaxAccount extends plugin
 
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
       $smarty->assign("launchimage", get_template_path('images/small_filter.png'));

diff --git a/plugins/gofax/faxaccount/generic.tpl b/plugins/gofax/faxaccount/generic.tpl
index 89b0277045246db05f78ae2318f15f8e43ad8946..e35352bf234ccb50181d931087006421d824be23 100644 (file)
--- a/plugins/gofax/faxaccount/generic.tpl
+++ b/plugins/gofax/faxaccount/generic.tpl
@@ -65,25 +65,21 @@
 
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
   <tr>
-    <td style="width:50%;">
+    <td style="width:50%; border-right:1px solid #A0A0A0">
     <h2><img alt="" align="middle" src="images/fax_small.png"> {t}Alternate fax numbers{/t}</h2>
-     <select style="width:350px; height:100px;" name="alternate_list[]" size=15 multiple {$facsimileAlternateTelephoneNumberACL}>
+    <select style="width:100%" name="alternate_list[]" size="10" multiple {$facsimileAlternateTelephoneNumberACL}>
                        {html_options values=$facsimileAlternateTelephoneNumber output=$facsimileAlternateTelephoneNumber}
                        <option disabled>&nbsp;</option>
-     </select><br>
-     <input name="forward_address" size=20 align="middle" maxlength=65 {$facsimileAlternateTelephoneNumberACL} value="">
-     <input type=submit value="{t}Add{/t}" name="add_alternate" {$facsimileAlternateTelephoneNumberACL}>&nbsp;
-     <input type=submit value="{t}Add local{/t}" name="add_local_alternate" {$facsimileAlternateTelephoneNumberACL}>&nbsp;
-     <input type=submit value="{t}Delete{/t}" name="delete_alternate" {$facsimileAlternateTelephoneNumberACL}>
-    </td>
-
-    <td style="border-left:1px solid #A0A0A0">
-     &nbsp;
-    </td>
-    
-    <td style="vertical-align:top; width:100%">
+    </select>
+    <br>
+    <input name="forward_address" size=20 align="middle" maxlength=65 {$facsimileAlternateTelephoneNumberACL} value="">
+    <input type=submit value="{t}Add{/t}" name="add_alternate" {$facsimileAlternateTelephoneNumberACL}>&nbsp;
+    <input type=submit value="{t}Add local{/t}" name="add_local_alternate" {$facsimileAlternateTelephoneNumberACL}>&nbsp;
+    <input type=submit value="{t}Delete{/t}" name="delete_alternate" {$facsimileAlternateTelephoneNumberACL}>
+   </td>
+   <td style="vertical-align:top; width:50%">
       <h2><img alt="" align="middle" src="images/false.png"> {t}Blocklists{/t}</h2>
-      <table summary="">
+      <table summary="" style="width:100%">
         <tr>
           <td>{t}Blocklists for incoming fax{/t}</td>
           <td>

diff --git a/plugins/gofax/faxaccount/locals.tpl b/plugins/gofax/faxaccount/locals.tpl
index 0eafe0a459cbd3c5e7857af1195a735d1b4ee143..4182f7a08ff7e017b4af880babe5612cd9b536b9 100644 (file)
--- a/plugins/gofax/faxaccount/locals.tpl
+++ b/plugins/gofax/faxaccount/locals.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
 <tr>
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top; width:600px">
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
      <b>{t}Select numbers to add{/t} {$hint}</b><br>
@@ -8,7 +8,7 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select style="width:500px; margin-top:4px; height:450px;" name="local_list[]" size="15" multiple>
+     <select style="width:100%; margin-top:4px; height:450px;" name="local_list[]" size="15" multiple>
        {html_options options=$list}
      </select>
     </p>
@@ -24,10 +24,8 @@
      </table>
     <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
                <tr>
-                       <td width="50%">
-                               <img alt="" src="{$tree_image}" align="middle">&nbsp;{t}Display numbers of department{/t}
-                       </td>
-               <td>
+                       <td>
+                               <img alt="" src="{$tree_image}" align="middle" title="{t}Display numbers of department{/t}">&nbsp;
                                <select name="depselect" size="1" onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
                              {html_options options=$deplist selected=$depselect}
                            </select>
@@ -36,20 +34,20 @@
        </table>
     <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
                <tr>
-                       <td width="50%">
-                               <img alt="" src="{$search_image}" align="middle">&nbsp;{t}Display numbers matching{/t}
+                       <td width="18px">
+                               <img alt="" src="{$search_image}" align="middle" title="{t}Display numbers matching{/t}">
                        </td>
                <td>
-                               <input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching numbers{/t}' onChange="mainform.submit()">    </td>
+                               <input type='text' name='regex' maxlength='20' value='{$regex}' style="width:99%" title='{t}Regular expression for matching numbers{/t}' onChange="mainform.submit()">  </td>
                </tr>
        </table>
     <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
                <tr>
-                       <td width="50%">
-                               <img alt="" src="{$search_image}" align="middle">&nbsp;{t}Display numbers of user{/t}
+                       <td width="18px">
+                               <img alt="" src="{$usearch_image}" align="middle" title="{t}Display numbers of user{/t}">
                        </td>
                    <td>
-                               <input type='text' name='fuser' maxlength='20' value='{$fuser}' title='{t}User name of which numbers are shown{/t}' onChange="mainform.submit()">       </td>
+                               <input type='text' name='fuser' style="width:99%" maxlength='20' value='{$fuser}' title='{t}User name of which numbers are shown{/t}' onChange="mainform.submit()">     </td>
                </tr>
        </table>
    {$apply}

diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 4a5e95ab8901d5016309301ff24cd93c7a46af99..68c9d21297013e187463d453c81d310077655c66 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -292,7 +292,7 @@ class phoneConferenceManagment extends plugin
       " <input type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
       " <input type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
       " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
-      " <input type='image' align='middle' src='images/list_new_user.png' title='"._("Create new conference")."' alt='"._("New conference")."' name='user_new'>&nbsp;".
+      " <input type='image' align='middle' src='images/list_new_conference.png' title='"._("Create new conference")."' alt='"._("New conference")."' name='user_new'>&nbsp;".
       " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
       _("Current base")."&nbsp;<select name='depselect' onChange='mainform.submit()'>$options</select>".
       " <input type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit").     "'>&nbsp;".
@@ -343,7 +343,7 @@ class phoneConferenceManagment extends plugin
     }
 
     /* Image shown in divlist */
-    $userimg  = "<img src='images/select_user.png' alt='User' title='%s'>";
+    $userimg  = "<img src='images/select_conference.png' alt='User' title='%s'>";
 
     /* Edit entry link*/
     $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";

diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl
index 43ad90d25dd87db669a9c8cc952186698c24a1c9..23663bf574633e73a69bb9f479407992ea8530a7 100644 (file)
--- a/plugins/gofon/phoneaccount/generic.tpl
+++ b/plugins/gofon/phoneaccount/generic.tpl
@@ -2,7 +2,7 @@
  <tr>
   <td style="vertical-align:top; border-right:1px solid #A0A0A0; width:50%">
    <h2><img alt="" align="middle" src="images/banana.png"> {t}Phone numbers{/t}</h2>
-      <select style="width:380px;" name="phonenumber_list[]" size=4 multiple {$telephoneNumberACL}>
+      <select style="width:100%;" name="phonenumber_list[]" size=7 multiple {$telephoneNumberACL}>
        {html_options options=$phoneNumbers}
                <option disabled>
                        &nbsp;

diff --git a/plugins/personal/environment/class_hotplugDialog.inc b/plugins/personal/environment/class_hotplugDialog.inc
index aabdb75d9f2f6df59054178af17a19698ca3d064..22b11d98880c027770dc000a601b56d29f5678bf 100644 (file)
--- a/plugins/personal/environment/class_hotplugDialog.inc
+++ b/plugins/personal/environment/class_hotplugDialog.inc
@@ -67,8 +67,7 @@ class hotplugDialog extends plugin
       $smarty->assign("alphabet", generate_alphabet());
       $smarty->assign("search_image", get_template_path('images/search.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
-      $smarty->assign("infoimage", get_template_path('images/info.png'));
-      $smarty->assign("launchimage", get_template_path('images/launch.png'));
+      $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
       $smarty->assign("deplist", $this->config->idepartments);
 
 

diff --git a/plugins/personal/environment/class_selectPrinterDialog.inc b/plugins/personal/environment/class_selectPrinterDialog.inc
index c5584545a511fabee648aacb9b5939247857baf0..88bebb34b69aa54b3d9b24a8374b944c368e344e 100644 (file)
--- a/plugins/personal/environment/class_selectPrinterDialog.inc
+++ b/plugins/personal/environment/class_selectPrinterDialog.inc
@@ -25,8 +25,8 @@ class selectPrinterDialog extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     /* Fill templating stuff */
     $smarty= get_smarty();
@@ -54,7 +54,7 @@ class selectPrinterDialog extends plugin
     $smarty->assign("search_image", get_template_path('images/search.png'));
     $smarty->assign("tree_image", get_template_path('images/tree.png'));
     $smarty->assign("infoimage", get_template_path('images/info.png'));
-    $smarty->assign("launchimage", get_template_path('images/launch.png'));
+    $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
     $smarty->assign("deplist", $this->config->idepartments);
 
     $display.= $smarty->fetch(get_template_path('selectPrinterDialog.tpl', TRUE,dirname(__FILE__)));

diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index 8c6d53a033b405c48c5115016c7f09fc4617a810..67e2346b3f7aec92c684f12589a28fade66ca231 100644 (file)
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -104,7 +104,7 @@
        <table summary="" style="width:100%">
                <tr>
                        <td>
-                       <select style="width:100%;" name="gotoShare" multiple size=4 {$gotoShareACL} id="gotoShare">
+                       <select style="width:100%;" name="gotoShare" multiple size=5 {$gotoShareACL} id="gotoShare">
        {html_options values=$gotoShareKeys output=$gotoShares}
        <option disabled>&nbsp;</option>
                                </select>
@@ -125,7 +125,7 @@
        <table summary="{t}Logon script management{/t}" style="width:100%">
                <tr>
                        <td>
-                       <select style="width:100%;" name="gotoLogonScript" multiple size=4 {$gotoLogonScriptACL} id="gotoLogonScript">
+                       <select style="width:100%;" name="gotoLogonScript" multiple size=5 {$gotoLogonScriptACL} id="gotoLogonScript">
        {html_options values=$gotoLogonScriptKeys output=$gotoLogonScripts }
        <option disabled>&nbsp;</option>
                                </select>
@@ -150,7 +150,7 @@
        <table style="width:100%" summary="{t}Hotplug device settings{/t}">
                <tr>
                        <td>
-                               <select name="gotoHotplugDevice" {$gotoHotplugDeviceACL} size=4  style="width:100%;" id="gotoHotplugDevice">
+                               <select name="gotoHotplugDevice" {$gotoHotplugDeviceACL} size=5  style="width:100%;" id="gotoHotplugDevice">
        {html_options values=$gotoHotplugDeviceKeys output=$gotoHotplugDevices}
        <option disabled>&nbsp;</option>
                        </td>
@@ -169,7 +169,7 @@
     <table style="width:100%" summary="{t}Printer settings{/t}">
        <tr>
            <td>
-               <select style="width:100%;" name="gotoPrinterSel" multiple size=4 {$gotoPrinterACL} id="gotoPrinter">
+               <select style="width:100%;" name="gotoPrinterSel" multiple size=5 {$gotoPrinterACL} id="gotoPrinter">
                {html_options values=$gotoPrinterKeys output=$gotoPrinter}
                <option disabled>&nbsp;</option>
                </select>

diff --git a/plugins/personal/environment/hotplugDialog.tpl b/plugins/personal/environment/hotplugDialog.tpl
index 759b637bf39a6700c30ee1a222500dcad68e4b4b..ec8bff1b13ce0c9e295137394d0bb010370f6b7d 100644 (file)
--- a/plugins/personal/environment/hotplugDialog.tpl
+++ b/plugins/personal/environment/hotplugDialog.tpl
@@ -12,7 +12,7 @@
                                </div>
                                <div class="contentboxb">
                                <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-                                               <select style="width:550px;" size=20 name="hotplugName" id="hotplugName">
+                                               <select style="width:600px;height:450px" size=20 name="hotplugName" id="hotplugName">
                                                {html_options values=$hotplugDeviceKeys output=$hotplugDevices}
                                                <option disabled>&nbsp;</option>
                                                </select><br>
@@ -20,18 +20,8 @@
                                </div>
             </td>
                        <td style="vertical-align:top;">
-                <div class="contentboxh">
-                    <p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
-                </div>
-                <div class="contentboxb">
-                    <p class="contentboxb" style="background-color:#F8F8F8">
-                        {t}This menu allows you to select existing hotplug devices. All devices of all users are choosable here.{/t}
-                    </p>
-                </div>
-                <br>
-
-                <div class="contentboxh">
-                    <p class="contentboxh"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
+                <div class="contentboxh" style="height:20px">
+                    <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
                 </div>
                 <div class="contentboxb">
                     <table summary="" style="width:100%;border-top:1px solid #B0B0B0;background-color:#F8F8F8">

diff --git a/plugins/personal/environment/kioskManagement.tpl b/plugins/personal/environment/kioskManagement.tpl
index 88e9a40f325dae5593c2c0ab8f319ae1e2601dc3..7ff70baa860101ebb44f5fe0f10ba7c7bc5b17cd 100644 (file)
--- a/plugins/personal/environment/kioskManagement.tpl
+++ b/plugins/personal/environment/kioskManagement.tpl
@@ -5,7 +5,7 @@
        <table summary="{t}Kiosk profile management{/t}" width="100%">
                <tr>
                        <td>
-               <select style="width:100%;" size=8 name="gotoKioskProfile" {$gotoKioskProfileACL} id="gotoKioskProfile">
+               <select style="width:100%;" size=18 name="gotoKioskProfile" {$gotoKioskProfileACL} id="gotoKioskProfile">
                 {html_options values=$gotoKioskProfileKeys output=$gotoKioskProfiles}
                 <option disabled>&nbsp;</option>
                 </select><br>
@@ -18,7 +18,9 @@
                </tr>
        </table>
 
+    <p class="seperator">&nbsp;</p>
+
     <p align="right">
-    <input type="submit" name="KioskClose"     value="{t}Close{/t}">
+    <input type="submit" name="KioskClose"     value="{t}Back{/t}">
     </p>
 

diff --git a/plugins/personal/environment/logonManagement.tpl b/plugins/personal/environment/logonManagement.tpl
index 3917270c350a481ffe668b3679f45cdbd0821a42..6fb3820352d2b857bd285ab09f150895be332cca 100644 (file)
--- a/plugins/personal/environment/logonManagement.tpl
+++ b/plugins/personal/environment/logonManagement.tpl
@@ -72,6 +72,6 @@
 
        <p class="seperator">&nbsp;</p>
     <p align="right">
-    <input type="submit" name="LogonSave"     value="{t}Save{/t}">
+    <input type="submit" name="LogonSave"     value="{t}Apply{/t}">
     <input type="submit" name="LogonCancel"   value="{t}Cancel{/t}">
     </p>

diff --git a/plugins/personal/environment/selectPrinterDialog.tpl b/plugins/personal/environment/selectPrinterDialog.tpl
index 521c77f50bc75fac32c783b9292bbf14966b8ac2..855b08fd0c1bdd43b003e9caf599a3ab56a47f17 100644 (file)
--- a/plugins/personal/environment/selectPrinterDialog.tpl
+++ b/plugins/personal/environment/selectPrinterDialog.tpl
@@ -12,7 +12,7 @@
                                </div>
                                <div class="contentboxb">
                                <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-                               <select style="width:550px;" size=20 name="gotoPrinter" id="gotoPrinter">
+                               <select style="width:600px;height:450px" size=20 name="gotoPrinter" id="gotoPrinter">
                                {html_options values=$gotoPrinterKeys output=$gotoPrinters}
                                <option disabled>&nbsp;</option>
                                         </select><br>
@@ -20,18 +20,8 @@
                                </div>
             </td>
             <td valign="top">
-                               <div class="contentboxh">
-                               <p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
-                               </div>
-                               <div class="contentboxb">
-                                       <p class="contentboxb" style="background-color:#F8F8F8">
-                                       {t}This menu allows you to create, edit and delete selected printers. Having a great number of printers, you may want to use the range selectors on top of the printers list.{/t}
-                               </p>
-                               </div>
-                               <br>
-
-                               <div class="contentboxh">
-                               <p class="contentboxh"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
+                               <div class="contentboxh" style="height:20px">
+                               <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
                                </div>
                                <div class="contentboxb">
                                <table summary="" style="width:100%;border-top:1px solid #B0B0B0;background-color:#F8F8F8">

diff --git a/plugins/personal/generic/generic.tpl b/plugins/personal/generic/generic.tpl
index 0054dccd6798c47155884f8f2e9a4957601936b1..2271044db8cfbf7d3f599c4d5e6ec6ac29a64e0c 100644 (file)
--- a/plugins/personal/generic/generic.tpl
+++ b/plugins/personal/generic/generic.tpl
@@ -116,10 +116,10 @@
   <td style="vertical-align:top;">
 
    <!-- Address, ... -->
-   <table summary=""> 
+   <table summary="" style="width:100%"> 
     <tr>
      <td style="vertical-align:top;"><label for="homePostalAddress">{t}Address{/t}</label></td>
-     <td><textarea id="homePostalAddress" name="homePostalAddress" rows="3" cols="22" {$homePostalAddressACL}>{$homePostalAddress}</textarea></td>
+     <td><textarea id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%" {$homePostalAddressACL}>{$homePostalAddress}</textarea></td>
     </tr>
     <tr>
      <td><label for="homePhone">{t}Private phone{/t}</label></td>
@@ -252,7 +252,7 @@
 
   <!-- Location, ... -->
   <td style="vertical-align:top;">
-   <table summary=""> 
+   <table summary="" style="width:100%"> 
     <tr>
      <td><label for="l">{t}Location{/t}</l></td>
      <td><input id="l" name="l" size=22 maxlength=60 {$lACL} value="{$l}"></td>
@@ -264,7 +264,7 @@
     <tr>
      <td style="vertical-align:top;"><label for="postalAddress">{t}Address{/t}</label></td>
      <td>
-      <textarea id="postalAddress" name="postalAddress" rows=3 cols=22 {$postalAddressACL}>{$postalAddress}</textarea>
+      <textarea id="postalAddress" name="postalAddress" rows=3 style="width:100%" {$postalAddressACL}>{$postalAddress}</textarea>
      </td>
     </tr>
    </table>

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 4587546aeb8efd6e1d58c963a4a1c3c0ff421b71..61a8327c2e31a50a15b102f5d02b671e7589a48b 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -413,6 +413,7 @@ class mailAccount extends plugin
 
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
       $smarty->assign("launchimage", get_template_path('images/small_filter.png'));

diff --git a/plugins/personal/mail/mail_locals.tpl b/plugins/personal/mail/mail_locals.tpl
index 2f1366166baefd45bc4407d86a01b3d9ecd55f92..3af89089dc533a470a0fc034fb5539fb4d2540c4 100644 (file)
--- a/plugins/personal/mail/mail_locals.tpl
+++ b/plugins/personal/mail/mail_locals.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
 <tr>
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top;width:600px">
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
      <b><LABEL for="local_list">{t}Select addresses to add{/t}</LABEL> {$hint}</b><br>
@@ -8,7 +8,7 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select id="local_list" style="width:500px; margin-top:4px; height:450px;" name="local_list[]" size="15" multiple>
+     <select id="local_list" style="width:600px; margin-top:4px; height:450px;" name="local_list[]" size="15" multiple>
                {html_options options=$mailusers}
      </select>
     </p>
@@ -23,14 +23,14 @@
      <table summary="" style="width:100%;border-top:1px solid #B0B0B0; background-color:#F8F8F8">
       {$alphabet}
      </table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle>&nbsp;<LABEL for="depselect">{t}Display addresses of department{/t}</LABEL></td>
-    <td><select id="depselect" name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td><LABEL for="depselect"><img alt="" src="{$tree_image}" align=middle>&nbsp;
+    <select id="depselect" name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
                {html_options options=$deplist selected=$depselect}
     </select></td></tr></table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display addresses matching{/t}</td>
-    <td><input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()"></td></tr></table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display addresses of user{/t}</td>
-    <td><input type='text' name='muser' maxlength='20' value='{$muser}' title='{t}User name of which addresses are shown{/t}' onChange="mainform.submit()"></td></tr></table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td style="width:18px"><img alt="" src="{$search_image}" align=middle></td><td>
+    <input type='text' name='regex' maxlength='20' style="width:99%" value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()"></td></tr></table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="18px"><img src="{$usearch_image}" align=middle alt={t}Display addresses of user{/t}""></td>
+    <td><input type='text' name='muser' maxlength='20' style="width:99%" value='{$muser}' title='{t}User name of which addresses are shown{/t}' onChange="mainform.submit()"></td></tr></table>
    {$apply}
    </div>
   </td>

diff --git a/plugins/personal/posix/generic.tpl b/plugins/personal/posix/generic.tpl
index 6edc392fb1defe21bd0d12f8f4687db5a7fedae7..98c66e4c7fc18cba748a083fb5d2785c8d93070b 100644 (file)
--- a/plugins/personal/posix/generic.tpl
+++ b/plugins/personal/posix/generic.tpl
@@ -80,7 +80,7 @@
 
 <table summary="" style="width:100% ; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
-  <td style='width:50%'>
+  <td style='width:50%;vertical-align:top'>
    <h2><img alt="" align="middle" src="images/terminal_small.png"> {t}Account{/t}</h2>
    {include file="$pwmode.tpl"}
   </td>
@@ -92,7 +92,7 @@
     {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>
-   <select style="width:100%" id="wslist" name="workstation_list[]" size=5 multiple {$trustmodeACL} {$trusthide}>
+   <select style="width:100%" id="wslist" name="workstation_list[]" size=8 multiple {$trustmodeACL} {$trusthide}>
     {html_options values=$workstations output=$workstations}
        {if $emptyArrAccess}
                <option disabled>&nbsp;</option>

diff --git a/plugins/personal/posix/posix_groups.tpl b/plugins/personal/posix/posix_groups.tpl
index ed113f54f2031d0d1cf5bbd86a7a5d1f3fc5fef5..394ea838144c5caae43dfea1c15be512eed04b7a 100644 (file)
--- a/plugins/personal/posix/posix_groups.tpl
+++ b/plugins/personal/posix/posix_groups.tpl
@@ -8,7 +8,7 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select style="width:500px; height:450px; margin-top:4px;" name="groups[]" size="15" multiple>
+     <select style="width:600px; height:450px; margin-top:4px;" name="groups[]" size="15" multiple>
        {html_options options=$groups}
      </select>
      <input type=hidden name="edit_helper">
@@ -19,7 +19,7 @@
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]"><b>{t}Filters{/t}</b></p>
    </div>
-   <div class="contentboxb" style="background-color:#F8F8F8">
+   <div class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
      <table summary="" style="width:100%;">
       {$alphabet}
      </table>

diff --git a/plugins/personal/posix/trust_machines.tpl b/plugins/personal/posix/trust_machines.tpl
index f353ef602cdb338f3a71a80df99388b116a9fe76..3550fcf29c389b982d36b6467bf8e7b9ba760cf0 100644 (file)
--- a/plugins/personal/posix/trust_machines.tpl
+++ b/plugins/personal/posix/trust_machines.tpl
@@ -8,7 +8,7 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select style="width:500px; margin-top:4px; height:450px;" name="wslist[]" size="15" multiple>
+     <select style="width:600px; margin-top:4px; height:450px;" name="wslist[]" size="15" multiple>
        {html_options values=$wslist output=$wslist}
      </select>
     </p>
@@ -19,7 +19,7 @@
     <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]"><b>{
 t}Filters{/t}</b></p>
    </div>
-   <div class="contentboxb" style="background-color:#F8F8F8">
+   <div class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
      <table summary="" style="width:100%;">
       {$alphabet}
      </table>

diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index 65adfd3e374d1316e39abc38e06288eb670c2e1d..c079647d915516ca86f79482cd956797808f376f 100644 (file)
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -190,7 +190,7 @@
   <td style="border-left:1px solid #A0A0A0">
    &nbsp;
   </td>
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top;width:50%">
    <i>{t}Miscellaneous{/t}</i>
    <table summary="">
     <tr>
@@ -300,7 +300,7 @@
   <td style="vertical-align:top;">
    <LABEL for="workstation_list">{t}Allow connection from these workstations only{/t}</LABEL>
    <br>
-   <select id="workstation_list" style="width:350px;" name="workstation_list[]" size=10 multiple {$sambaUserWorkstationACL}>
+   <select id="workstation_list" style="width:100%;" name="workstation_list[]" size=10 multiple {$sambaUserWorkstationACL}>
     {html_options values=$workstations output=$workstations}
    </select>
    <br>

diff --git a/plugins/personal/samba/samba3_workstations.tpl b/plugins/personal/samba/samba3_workstations.tpl
index e3987d2f146e532750dff8d0867859060adb0336..0bb0e3fee5ec78439bfe70ebb4e15259f219af18 100644 (file)
--- a/plugins/personal/samba/samba3_workstations.tpl
+++ b/plugins/personal/samba/samba3_workstations.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
 <tr>
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top;width:600px">
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
      <b><LABEL for="wslist">{t}Select workstations to add{/t}</LABEL> {$hint}</b><br>
@@ -8,7 +8,7 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select id="wslist" style="width:500px; margin-top:4px; height:450px;" name="wslist[]" size="15" multiple>
+     <select id="wslist" style="width:600px; margin-top:4px; height:450px;" name="wslist[]" size="15" multiple>
        {html_options values=$wslist output=$wslist}
      </select>
     </p>
@@ -23,12 +23,12 @@
      <table summary="" style="width:100%;border-top:1px solid #B0B0B0;background-color:#F8F8F8">
       {$alphabet}
      </table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align="middle">&nbsp;{t}Display workstations of department{/t}</td>
-    <td><select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td><img alt="{t}Display workstations of department{/t}" src="{$tree_image}" align="middle">&nbsp;
+    <select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
       {html_options options=$deplist selected=$depselect}
     </select></td></tr></table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$search_image}" align="middle">&nbsp;{t}Display workstations matching{/t}</td>
-    <td><input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()"></td></tr></table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="18px"><img alt="" src="{$search_image}" align="middle">&nbsp;</td>
+    <td><input type='text' name='regex' maxlength='20' style="width:99%" value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()"></td></tr></table>
    {$apply}
    </div>
   </td>