Added conflict with kolab

[gosa.git] / plugins / admin / systems / terminalStartup.tpl

diff --git a/plugins/admin/systems/terminalStartup.tpl b/plugins/admin/systems/terminalStartup.tpl
index 12321d0c1be2f40cf5df3cbe89c58cffacc2e5e1..e45fa874a85cc0039f1b09636471ee324a29492d 100644 (file)
--- a/plugins/admin/systems/terminalStartup.tpl
+++ b/plugins/admin/systems/terminalStartup.tpl
@@ -1,28 +1,28 @@
-<h2><img alt="" align="middle" src="images/penguin.png"> {t}Boot parameters{/t}</h2>
+<h2><img class="center" alt="" align="middle" src="images/penguin.png"> {t}Boot parameters{/t}</h2>
 <table summary="" style="width:100%;">
  <tr>
   <td style="width:50%; vertical-align:top;">
 
-   <table summary="">
+   <table summary="" style="width:100%">
     <tr>
-     <td><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL></td>
+     <td style="width:30%"><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
      <td>
-      <select name="gotoLdapServer" id="gotoLdapServer" title="{t}Choose LDAP server to use for accounts and terminal management{/t}" {$gotoLdapServerACL}>
-       {html_options values=$ldapservers output=$ldapservers selected=$gotoLdapServer_select}
-          <option disabled>&nbsp;</option>
-      </select>
+       <select id="gotoBootKernel" name="gotoBootKernel" {$gotoBootKernelACL} onchange='document.mainform.submit()'>
+       {html_options options=$gotoBootKernels  selected=$gotoBootKernel}
+       <option disabled>&nbsp;</option>
+       </select>
      </td>
     </tr>
-    <tr>
-     <td><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
-     <td><input id="gotoBootKernel" name="gotoBootKernel" size=20 maxlength=60 {$gotoBootKernelACL}
-                value="{$gotoBootKernel}" title="{t}Enter the filename of the kernel to use{/t}"></td>
-    </tr>
     <tr>
      <td><LABEL for="customParameters">{t}Custom options{/t}</LABEL></td>
      <td><input name="customParameters" id="customParameters"  size=25 maxlength=500 {$gotoKernelParametersACL}
                 value="{$customParameters}" title="{t}Enter any parameters that should be passed to the kernel as append line during bootup{/t}"></td>
     </tr>
+    <tr>
+     <td colspan="2" style='vertical-align:top;padding-top:3px;width:100%'><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL>
+               {$SelectBoxLdapServer}
+     </td>
+    </tr>
    </table>
 
   </td>
@@ -50,9 +50,9 @@
  <tr>
   <td style="width:50%; vertical-align:top;">
    <h2>
-    <img alt="" align="middle" src="images/hardware.png"> {t}Kernel modules (format: name parameters){/t}
+    <img class="center" 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,38 +62,26 @@
     <input type=submit value="{t}Delete{/t}" name="delete_module" {$gotoModulesACL}>
   </td>
 
-  <td style="vertical-align:top;">
-   <h2>
-    <img alt="" align="middle" src="images/zip.png"> {t}Automount devices (format: complete autofs entry){/t}
-   </h2>
-   <select style="width:100%; height:100px;" name="autofs_list[]" size=15 multiple title='{t}Add additional automount entries{/t}'>
-    {html_options values=$gotoAutoFs output=$gotoAutoFs}
-       <option disabled>&nbsp;</option>
-   </select>
-   <br>
-   <input name="autofs" size=30 align=middle maxlength=80>
-   <input type=submit value="{t}Add{/t}" name="add_autofs">&nbsp;
-   <input type=submit value="{t}Delete{/t}" name="delete_autofs">
-  </td>
- </tr>
-</table>
-
-<table summary="" style="width:100%;">
- <tr><td colspan=2><p class="plugbottom" style="margin-top:0px;"></p></td></tr>
-
- <tr>
-  <td style="width:50%; vertical-align:top;">
-   <h2>
-    <img alt="" align="middle" src="images/folder.png"> {t}Additional fstab entries{/t}
-   </h2>
-   <select style="width:100%; height:100px;" name="fstab_list[]" size=15 multiple title="{t}Add additional filesystems to be mounted during startup{/t}">
-    {html_options values=$gotoFilesystem output=$gotoFilesystem}
-       <option disabled>&nbsp;</option>
-   </select>
-   <br>
-   <input name="fstab" size=80 align=middle maxlength=200 {$gotoFilesystemACL}>
-   <input type=submit value="{t}Add{/t}" name="add_fs" {$gotoFilesystemACL}>&nbsp;
-   <input type=submit value="{t}Delete{/t}" name="delete_fs" {$gotoFilesystemACL}>
+  <td style="padding-left:10px;border-left:1px solid #A0A0A0;vertical-align:top">
+        <h2><img class="center" 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%;" name="gotoShare" multiple size=15 {$gotoShareACL} id="gotoShare">
+        {html_options values=$gotoShareKeys output=$gotoShares}
+        <option disabled>&nbsp;</option>
+                                </select>
+                                <br>
+                        <select name="gotoShareSelection" {$gotoShareACL}>
+        {html_options values=$gotoShareSelectionKeys output=$gotoShareSelections}
+        <option disabled>&nbsp;</option>
+                                </select>
+                                <input type="text" size=15 {$gotoShareACL} name="gotoShareMountPoint" value="{t}Mountpoint{/t}">
+                                <input type="submit" {$gotoShareACL} name="gotoShareAdd" value="{t}Add{/t}">
+                                <input type="submit" {$gotoShareACL} name="gotoShareDel" value="{t}Remove{/t}">
+                        </td>
+                </tr>
+        </table>
   </td>
  </tr>
 </table>