Checked and fixed layout. Closes #194.

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

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index d06ad5f02d031cce39c4e91237bbed5450cbb15a..21b1539e8ca96b78be9f58f7979b8ea26943a96c 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -246,8 +246,8 @@ class environment extends plugin
 
   function update_kiosk_profiles()
   { 
-    $tmp1  = array("none" => array(_("None")));
-    $tmp2  = array("none" => _("None"));
+    $tmp1  = array("none" => array(_("disabled")));
+    $tmp2  = array("none" => _("disabled"));
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->config->current['BASE']);
     $ldap->search("(&(objectClass=goEnvironmentServer)(gotoKioskProfile=*)(cn=*))",array("cn","gotoKioskProfile"));
@@ -1065,7 +1065,7 @@ class environment extends plugin
     /* If group was renamed, all printer settings get lost
      */ 
     /* only save changed variables ....*/
-    if ($this->gotoKioskProfile_Server !="none"){
+    if ($this->gotoKioskProfile_Server != "none"){
       if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){
         $method="https://".$this->gotoKioskProfile_Server."/kiosk/".$this->gotoKioskProfile_Profile;
       }else{

diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index 9cd024de5ab397c623434bde83a090ac7c514f37..b5a596b8bce0b30230e4d05d9ee873506e6b8d22 100644 (file)
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -84,7 +84,7 @@
 
    <table summary="{t}Kiosk profile settings{/t}">
     <tr>
-     <td>
+     <td colwidth=2>
       <label for="kiosk_server">{t}Kiosk profile{/t}</label>
      </td>
     </tr>
@@ -96,10 +96,14 @@
       </select>
      </td>
      <td>
+      {if $kiosk_server != "none"}
       {t}Profile{/t}
       <select name='kiosk_profile'>
        {html_options values=$kiosk_profiles output=$kiosk_profiles selected=$kiosk_profile}
       </select>
+      {else}
+        &nbsp;
+      {/if}
      </td>
     </tr>
     <tr>