X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2FworkstationStartup.tpl;h=e68ed7577154cdfe1cff13ffa27a2ae1f5554e34;hb=d9f1895952e9b02c1b0c398cc5dc09b88178e603;hp=eef5aa03a0c352dbc86bc5a9252b7644998e18b9;hpb=475588d03afa8401cf37d95a69262f82ba66197c;p=gosa.git

diff --git a/plugins/admin/systems/workstationStartup.tpl b/plugins/admin/systems/workstationStartup.tpl
index eef5aa03a..e68ed7577 100644
--- a/plugins/admin/systems/workstationStartup.tpl
+++ b/plugins/admin/systems/workstationStartup.tpl
@@ -1,28 +1,28 @@
 <table summary="" style="width:100%;">
  <tr>
   <td style="width:50%; vertical-align:top;">
-<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="">
-    <tr>
-     <td><LABEL for="gotoLdapServer">{t}LDAP server{/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>
-     </td>
-    </tr>
+   <table summary="" style="width:100%">
     <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>
+     <td style="width:70%">
+        <select id="gotoBootKernel" name="gotoBootKernel" {$gotoBootKernelACL}>
+         {html_options options=$gotoBootKernels selected=$gotoBootKernel}
+         <option disabled>&nbsp;</option>
+	</select>
+      </td>
     </tr>
     <tr>
      <td><LABEL for="customParameters">{t}Custom options{/t}</LABEL></td>
-     <td><input name="customParameters" id="customParameters"  size=25 maxlength=500 {$gotoKernelParametersACL}
+     <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;'><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL><br>
+	  {$SelectBoxLdapServer}	
+     </td>
+    </tr>
    </table>
 
   </td>
@@ -32,25 +32,82 @@
   </td>
   
   <td style="vertical-align:top;">
-	<h2><img alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}FAI server{/t}</h2>
-		<!--<select name="FAIdebianMirror" {$FAIdebianMirrorACL} onchange="document.mainform.submit();">-->
-		<select name="FAIdebianMirror" {$FAIdebianMirrorACL}>
-        {html_options options=$FAIdebianMirrors output=$FAIdebianMirrors selected=$FAIdebianMirror}
-        <option disabled>&nbsp;</option>
-		</select>
-		<!--<input type="submit" value="{t}set{/t}" name="refresh">-->
-	<h2><img alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}Assigned FAI classes{/t}</h2>
+	
+{if $fai_activated}
+
+	{if $FAIdebianMirror == "inherited"}
+
+		<table>
+			<tr>
+				<td>
+					<h2><img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}FAI server{/t}
+					</h2>
+				</td>
+				<td>
+					<h2><img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}Release{/t}
+					</h2>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<select name="FAIdebianMirror"   onchange='document.mainform.submit()' {$FAIdebianMirrorACL}>
+						{html_options options=$FAIdebianMirrors output=$FAIdebianMirrors selected=$FAIdebianMirror}
+					</select>
+				</td>
+				<td>
+					<select name="FAIrelease"  disabled>
+					{html_options options=$InheritedFAIrelease output=$InheritedFAIrelease selected=$InheritedFAIrelease}
+					</select>
+				</td>
+			</tr>
+		</table>
+		<h2>
+			<img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}Assigned FAI classes{/t}
+		</h2>
+		{$FAIScriptlist}	
+	{else}
+
+		<table>
+			<tr>
+				<td>
+					<h2><img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}FAI server{/t}
+					</h2>
+				</td>
+				<td>
+					<h2><img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}Release{/t}
+					</h2>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<select name="FAIdebianMirror" {$FAIdebianMirrorACL} onchange='document.mainform.submit()'>
+						{html_options options=$FAIdebianMirrors output=$FAIdebianMirrors selected=$FAIdebianMirror}
+						<option disabled>&nbsp;</option>
+					</select>
+				<!--<input type="submit" value="{t}set{/t}" name="refresh">-->
+				</td>
+				<td>
+					<select name="FAIrelease"  onchange='document.mainform.submit()' {$FAIclassACL}>
+					{html_options options=$FAIreleases output=$FAIreleases selected=$FAIrelease}
+					</select>
+				</td>
+			</tr>
+		</table>
+		<h2>
+			<img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}Assigned FAI classes{/t}
+		</h2>
 		{$FAIScriptlist}	
 
-    <br>
 		<select name="FAIclassesSel" {$FAIclassACL}>
-        {html_options values=$FAIclassesKeys output=$FAIclasses}
-        <option disabled>&nbsp;</option>
+			{html_options values=$FAIclassesKeys output=$FAIclasses}
+			<option disabled>&nbsp;</option>
 		</select>	
-   		<input name="AddClass" value="{t}Add{/t}" type="submit"> 
-   		<input name="DelClass" value="{t}Delete{/t}" type="submit"> 
-  </td>
- </tr>
+		<input name="AddClass" value="{t}Add{/t}" type="submit"> 
+<!--		<input name="DelClass" value="{t}Delete{/t}" type="submit"> -->
+	{/if}
+{/if}
+  		</td>
+	</tr>
 </table>
 
 <table summary="" style="width:100%;">
@@ -59,9 +116,10 @@
  <tr>
   <td style="width:50%; vertical-align:top; border-right:1px solid #B0B0B0">
    <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:150px;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}">
+    <select style="width:100%; height:150px;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}" 
+	{$gotoModulesACL}>
      {html_options values=$gotoModules output=$gotoModules}
 	 <option disabled>&nbsp;</option>
     </select>
@@ -72,29 +130,29 @@
   </td>
 
   <td style="vertical-align:top;">
-        <h2><img alt="" src="images/fai_partitionTable.png" align="middle">&nbsp;<LABEL for="gotoShare">{t}Shares{/t}</LABEL></h2>
+        <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%;height:150px;" name="gotoShare" multiple size=4 {$gotoShareACL} id="gotoShare">
-        {html_options values=$gotoShareKeys output=$gotoShares}
-        <option disabled>&nbsp;</option>
+   					     {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>
+    						    {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}">
+                                <input type="submit" {$gotoShareACL} name="gotoShareDel" value="{t}Remove{/t}" {if $gotoSharesCount == 0} disabled {/if}>
                         </td>
                 </tr>
         </table>
   </td>
  </tr>
 </table>
-
+<input name="WorkstationStarttabPosted" type="hidden" value="1">
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
   <!-- // First input field on page