Some fixes

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

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 725fbdf93f7923dc1805bfd51c62df4442ffb565..cd023e8504603777245df01a028b5f533e5f202f 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -494,9 +494,6 @@ class environment extends plugin
       $smarty->assign("gotoProfileServerACL"," disabled ");
     }
 
-
-
-
     /* Als smarty vars are set. Get smarty template and generate output */
     $display.= $smarty->fetch(get_template_path('environment.tpl', TRUE,dirname(__FILE__)));
     
@@ -574,9 +571,6 @@ class environment extends plugin
 
     $realyUsedAttrs= array();
   
- 
-    
-  
     /* Save already used objectClasses */
     $ocs        = $this->attrs['objectClass'];
     unset($ocs['count']);
@@ -810,7 +804,7 @@ class environment extends plugin
     while($entry = $ldap->fetch($a_res)){
       $shareAttrs = split("\|",$entry['goExportEntry'][0]);
       if($listboxEntry) { 
-        $return[$shareAttrs[0]] = $shareAttrs[0]." - ".$shareAttrs[3];
+        $return[$shareAttrs[0]] = $shareAttrs[0]." - ".$shareAttrs[4];
       }else{
         $return[$shareAttrs[0]]['name']         = $shareAttrs[0]; 
         $return[$shareAttrs[0]]['description']  = $shareAttrs[1]; 
@@ -877,7 +871,7 @@ function printOutHotPlugDevices()
     $a_return = array();
     if(is_array($this->gotoLogonScripts)){
       foreach($this->gotoLogonScripts as $script){
-        $a_return[$script['LogonName']]= $script['LogonName']; 
+        $a_return[$script['LogonName']]= $script['LogonPriority']." - ".$script['LogonName']; 
       }
     }
     return($a_return);

diff --git a/plugins/personal/environment/class_hotplugDialog.inc b/plugins/personal/environment/class_hotplugDialog.inc
index fee4b846ec1583d512819c29d662e62c141492fe..4911d29d76b423beeb986632863d3487f073f31a 100644 (file)
--- a/plugins/personal/environment/class_hotplugDialog.inc
+++ b/plugins/personal/environment/class_hotplugDialog.inc
@@ -29,6 +29,7 @@ class hotplugDialog extends plugin
   {
     $this->use_existing = $use_existing;
     plugin::plugin ($config, $dn);
+    $this->depselect = $this->config->current['BASE'];
   }
 
   function execute()

diff --git a/plugins/personal/environment/hotplugDialog.tpl b/plugins/personal/environment/hotplugDialog.tpl
index e071ef37ced7d8b6833cbfee0aa5ece1678d0d7f..5e8bbc068465c2b4f9b3f97f31887fc5a2eab4df 100644 (file)
--- a/plugins/personal/environment/hotplugDialog.tpl
+++ b/plugins/personal/environment/hotplugDialog.tpl
@@ -2,15 +2,24 @@
 
     <input type="hidden" name="dialogissubmitted" value="1">
 
-       <table summary="">
+       <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 cellspacing=2>
         <tr>
-            <td width="50%">
-                <select style="width:350px;" size=20 name="hotplugName">
-                {html_options values=$hotplugDeviceKeys output=$hotplugDevices}
-                <option disabled>&nbsp;</option>
-                </select><br>
+            <td width="50%" style="vertical-align:top;">
+                               <div class="contentboxh" style="height:20px;">
+                               <p class="contentboxh" style="font-size:12px">
+                                       <b>Select hotplug to add </b>
+                               </p>
+                               </div>
+                               <div class="contentboxb">
+                               <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+                                               <select style="width:550px;" size=20 name="hotplugName">
+                                               {html_options values=$hotplugDeviceKeys output=$hotplugDevices}
+                                               <option disabled>&nbsp;</option>
+                                               </select><br>
+                                       </p>
+                               </div>
             </td>
-                       <td>
+                       <td style="vertical-align:top;">
                 <div class="contentboxh">
                     <p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
                 </div>

diff --git a/plugins/personal/environment/selectPrinterDialog.tpl b/plugins/personal/environment/selectPrinterDialog.tpl
index eb88d15fa71182b38759c8de5cc9632bcbe6e01b..52b5402ee2784a0bc2fafa9c844b447db5ce5804 100644 (file)
--- a/plugins/personal/environment/selectPrinterDialog.tpl
+++ b/plugins/personal/environment/selectPrinterDialog.tpl
@@ -1,16 +1,25 @@
-<h2><img alt="" src="images/house.png" align="middle">&nbsp;{t}Select hotplug entry{/t}</h2>
+<h2><img alt="" src="images/house.png" align="middle">&nbsp;{t}Select printer entry{/t}</h2>
 
     <input type="hidden" name="dialogissubmitted" value="1">
 
-       <table summary="">
+       <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
         <tr>
             <td width="50%">
-                <select style="width:350px;" size=20 name="gotoPrinter">
-                {html_options values=$gotoPrinterKeys output=$gotoPrinters}
-                <option disabled>&nbsp;</option>
-                </select><br>
+                               <div class="contentboxh" style="height:20px;">
+                               <p class="contentboxh" style="font-size:12px">
+                                       <b>Select printer to add </b>
+                               </p>
+                               </div>
+                               <div class="contentboxb">
+                               <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+                               <select style="width:550px;" size=20 name="gotoPrinter">
+                               {html_options values=$gotoPrinterKeys output=$gotoPrinters}
+                               <option disabled>&nbsp;</option>
+                                        </select><br>
+                                       </p>
+                               </div>
             </td>
-            <td>
+            <td valign="top">
                                <div class="contentboxh">
                                <p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
                                </div>