X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fgoto%2Fadmin%2Fsystems%2Fgoto%2FworkstationStartup.tpl;h=ed9037f2b92eec4934ab75c86873b9e20a07d11f;hb=a6ce5a202d803fb12c8fda2d7dc19c02bae336e4;hp=2523fae7c15a803d3f89a14c79f50b446945260b;hpb=e2cbc4aee06089585ffc6b8e06bc6d1f691e7b80;p=gosa.git

diff --git a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
index 2523fae7c..ed9037f2b 100644
--- a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
@@ -4,16 +4,18 @@
 <h2><img class="center" alt="" align="middle" src="images/penguin.png"> {t}Boot parameters{/t}</h2>
 
    <table summary="" style="width:100%">
+	{if $fai_activated && $si_active && !$si_fai_action_failed}
     <tr>
      <td><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
      <td style="width:70%">
 {render acl=$gotoBootKernelACL}
         <select id="gotoBootKernel" name="gotoBootKernel">
          {html_options options=$gotoBootKernels selected=$gotoBootKernel}
-	</select>
+		</select>
 {/render}
       </td>
     </tr>
+	{/if}
     <tr>
      <td><LABEL for="customParameters">{t}Custom options{/t}</LABEL></td>
      <td>
@@ -31,7 +33,7 @@
 	onClick="document.mainform.submit();" class='center'>
 &nbsp;{t}inherit from group{/t})
 {if !$JS}
-	<input type='image' src="images/list_reload.png" alt='{t}Reload{/t}' class='center'>
+	<input type='image' src="images/lists/reload.png" alt='{t}Reload{/t}' class='center'>
 {/if}
 {/if}
 {/render}
@@ -58,9 +60,15 @@
   
   <td style="vertical-align:top;">
 
-	{if $si_fai_action_failed}
+	{if !$fai_activated}
+			<h2>{t}FAI Object assignment disabled. You can't use this feature until FAI is activated.{/t}</h2>			
+	{elseif !$si_active}
+		<b>{t}GOsa support daemon not configured{/t}</b><br>
+		{t}FAI settings cannot be modified{/t}
+	{elseif $si_fai_action_failed}
 		<b>{msgPool type=siError}</b><br>
 		{t}Check if the GOsa support daemon (gosa-si) is running.{/t}
+		<input type='submit' name='fai_si_retry' value="{t}retry{/t}">
 	{elseif $fai_activated}
 
 		{if $FAIdebianMirror == "inherited"}
@@ -68,11 +76,11 @@
 			<table>
 				<tr>
 					<td>
-						<h2><img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}FAI server{/t}
+						<h2><img class="center" alt="" align="middle" src="plugins/goto/images/fai_settings.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><img class="center" alt="" align="middle" src="plugins/goto/images/fai_settings.png">&nbsp;{t}Release{/t}
 						</h2>
 					</td>
 				</tr>
@@ -94,7 +102,7 @@
 				</tr>
 			</table>
 			<h2>
-				<img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}Assigned FAI classes{/t}
+				<img class="center" alt="" align="middle" src="plugins/goto/images/fai_settings.png">&nbsp;{t}Assigned FAI classes{/t}
 			</h2>
 	{render acl=$FAIclassACL}
 			{$FAIScriptlist}	
@@ -104,11 +112,11 @@
 			<table>
 				<tr>
 					<td>
-						<h2><img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}FAI server{/t}
+						<h2><img class="center" alt="" align="middle" src="plugins/goto/images/fai_settings.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><img class="center" alt="" align="middle" src="plugins/goto/images/fai_settings.png">&nbsp;{t}Release{/t}
 						</h2>
 					</td>
 				</tr>
@@ -139,7 +147,7 @@
 				</tr>
 			</table>
 			<h2>
-				<img class="center" alt="" align="middle" src="images/fai_profile.png">&nbsp;{t}Assigned FAI classes{/t}
+				<img class="center" alt="" align="middle" src="plugins/goto/images/fai_settings.png">&nbsp;{t}Assigned FAI classes{/t}
 			</h2>
 	{render acl=$FAIclassACL}
 			{$FAIScriptlist}	
@@ -156,11 +164,7 @@
 			<input name="AddClass" value="{msgPool type=addButton}" type="submit"> 
 	{/render}
 	<!--		<input name="DelClass" value="{msgPool type=delButton}" type="submit"> -->
-		{/if}
-
-		{else}
-
-			<h2>{t}FAI Object assignment disabled. You can't use this feature until FAI is activated.{/t}</h2>			
+			{/if}
 
 		{/if}
   		</td>
@@ -173,7 +177,7 @@
  <tr>
   <td style="width:50%; vertical-align:top; border-right:1px solid #B0B0B0">
    <h2>
-    <img class="center" alt="" align="middle" src="images/hardware.png"> {t}Kernel modules (format: name parameters){/t}
+    <img class="center" alt="" align="middle" src="plugins/goto/images/hardware.png"> {t}Kernel modules (format: name parameters){/t}
    </h2>
 {render acl=$gotoModulesACL}
     <select style="width:100%; height:150px;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}">
@@ -194,7 +198,7 @@
   </td>
 
   <td style="vertical-align:top;">
-        <h2><img class="center" alt="" src="images/fai_partitionTable.png" align="middle">&nbsp;<LABEL for="gotoShare">{t}Shares{/t}</LABEL></h2>
+        <h2><img class="center" alt="" src="plugins/goto/images/edit_share.png" align="middle">&nbsp;<LABEL for="gotoShare">{t}Shares{/t}</LABEL></h2>
         <table summary="" style="width:100%">
                 <tr>
                         <td>