From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 30 Sep 2008 13:21:46 +0000 (+0000)
Subject: Made NBD's visible
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=caa4d8357badafba6d60ab35122a9f843130b1df;p=gosa.git

Made NBD's visible


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

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index 9fdf6fabe..6c0510182 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
@@ -276,6 +276,19 @@ class termgeneric extends plugin
     /* Arrays */
     $smarty->assign("modes", $this->modes);
 
+    $tmp2 = array(); 
+    $tmp2['!']= _("Local swap");
+    foreach($this->config->data['SERVERS']['NBD'] as $server){
+      if($server != "default"){
+        $tmp2[$server]= $server;
+      }else{
+        if($this->member_of_ogroup){
+          $tmp2[$server]="["._("inherited")."]";
+        }
+      }
+    }
+  
+    $smarty->assign("swapservers",     $tmp2);
     $tmp2 = array(); 
     foreach($this->config->data['SERVERS']['NFS'] as $server){
       if($server != "default"){
diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
index 7c574bf23..a43e53a7f 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
@@ -132,7 +132,7 @@ class termservice extends plugin
     }
 
     /* Additional values will be extracted from CONFIG_DIR.keyboardLayouts */
-    $this->XKbLayouts = array("de"=> "de","intl" =>"intl","us" =>"us");
+    $this->XKbLayouts = array("de"=> "de","en" =>"en", "es" => "es", "us" =>"us", "fr" => "fr");
     $this->XKbVariants= array("nodeadkeys"=>"nodeadkeys", "basic"=>"basic");
     $this->MouseTypes = array("ImPS/2"=>"ImPS/2","PS/2"=>"PS/2", "explorerps/2"=>"explorerps/2",
                               "Microsoft"=>"Microsoft","Logitech"=>"Logitech");
@@ -159,18 +159,18 @@ class termservice extends plugin
       }
     }
 
-    /* Terminal server methods 
-     */
+    /* Terminal server methods supported by LTSP */
     if($this->is_ogroup_member){
       $this->XMethods["default"]= _("inherited");
     }
     $this->XMethods["xdmcp"]  = _("XDMCP");
     $this->XMethods["ldm"]    = _("LDM");
-    $this->XMethods["rdp"]    = _("Windows RDP");
-    $this->XMethods["citrix"] = _("ICA client");
+    $this->XMethods["shell"]    = _("Shell");
+    $this->XMethods["telnet"]    = _("Telnet");
+    #$this->XMethods["rdp"]    = _("Windows RDP");
+    #$this->XMethods["citrix"] = _("ICA client");
 
-    /* Get selected gotoXdmcpServer 
-     */
+    /* Get selected gotoXdmcpServer */
     $this->selected_xdmcp_servers = array();
     if(isset($this->attrs['gotoXdmcpServer'])){
       for($i = 0 ; $i < $this->attrs['gotoXdmcpServer']['count'] ; $i++){
diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
index e03b719e9..37d6fb8f6 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
@@ -26,7 +26,6 @@ class workservice extends plugin
   var $base= "";
   var $cn= "";
   var $orig_dn= "";
-  var $XMethods= array();
   var $XDrivers= array();
   var $XResolutions = array();
   var $MouseTypes= array();
@@ -107,7 +106,7 @@ class workservice extends plugin
                              "/dev/input/mice"  => "/dev/input/mice");
 
     /* Additional values will be extracted from CONFIG_DIR./keyboardLayouts */
-    $this->XKbLayouts= array ("de"=> "de","intl" =>"intl","us" =>"us");
+    $this->XKbLayouts = array("de"=> "de","en" =>"en", "es" => "es", "us" =>"us", "fr" => "fr");
     $this->XKbVariants= array ("nodeadkeys"=>"nodeadkeys", "basic"=>"basic");
 
     /* try to read additional keyboard layouts 
@@ -128,17 +127,6 @@ class workservice extends plugin
       }
     }
 
-    /* Initialize methods */
-    $this->XMethods["indirect"]= _("show chooser");
-    $this->XMethods["query"]= _("direct");
-    #$this->XMethods["squery"]= _("direct via ssh");
-    #$this->XMethods["nquery"]= _("direct via nx");
-    $this->XMethods["load"]= _("load balanced");
-    #$this->XMethods["sload"]= _("load balanced via ssh");
-    #$this->XMethods["nload"]= _("load balanced via nx");
-    $this->XMethods["rdp"]= _("Windows RDP");
-    $this->XMethods["citrix"]= _("ICA client");
-
     $this->orig_dn= $this->dn;
 
     /* Load phone hardware list
@@ -273,7 +261,7 @@ class workservice extends plugin
     }
 
     /* Arrays */ 
-    foreach(array("XMethods", "XDrivers", "XResolutions", "XColordepths",
+    foreach(array("XDrivers", "XResolutions", "XColordepths",
           "XKbModels", "XKbVariants",
           "MouseTypes", "MousePorts") as $val){
       $smarty->assign("$val", $this->$val);
diff --git a/gosa-plugins/goto/admin/systems/goto/terminal.tpl b/gosa-plugins/goto/admin/systems/goto/terminal.tpl
index c8689a21e..d45a7c34e 100644
--- a/gosa-plugins/goto/admin/systems/goto/terminal.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/terminal.tpl
@@ -87,7 +87,7 @@
      <td>
 {render acl=$gotoSwapServerACL}
       <select name="gotoSwapServer" id="gotoSwapServer" title="{t}Choose NFS filesystem to place swap files on{/t}">
-       {html_options options=$nfsservers selected=$gotoSwapServer_select}
+       {html_options options=$swapservers selected=$gotoSwapServer_select}
       </select>
 {/render}
      </td>