X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fsetup_step2.tpl;h=9ba9e7abcf49c05e831a2255b091b91de58e8c7d;hb=7dfb0099027c833555ea3018c40874fd314bf5f2;hp=4722bf1b9c41f1a420a07b1dfa0564c1e180d818;hpb=eb22c5da09dfb5ba54781d5b171a4001adfc6a4a;p=gosa.git

diff --git a/setup/setup_step2.tpl b/setup/setup_step2.tpl
index 4722bf1b9..9ba9e7abc 100644
--- a/setup/setup_step2.tpl
+++ b/setup/setup_step2.tpl
@@ -1,34 +1,192 @@
-<div style='float:left;'> 
+<!-- 
+	Div container with PHP module checks 
+-->
+<div style='float:left;width:50%;'> 
+
+	<!-- Set content styles -->	
 	<div class='default' style='margin:10px;'>
-		<h2>{t}PHP module and extension checks{/t}</h2>
+
+		<!-- Beginning PHP module check output -->
+		<h2 class='step2_container_title'>{t}PHP module and extension checks{/t}</h2>
 		{foreach from=$basic item=val key=key}
-			<div class='default' style='float:left'>
-				{$basic[$key].NAME}
-			</div>
-			<div class='default' style='text-align:right; '>
+	
+			<!-- Entry {$key} -->		
+			{if $basic[$key].SOLUTION != "" && !$basic[$key].RESULT}
+		
+				<!-- Add ability to display info popup -->	
+				<div class='step2_entry_container_info'
+					onMouseOver="javascript: display_solution('sol_{$key}');"
+					onMouseOut="javascript: hide_solution('sol_{$key}');" >
+			{else}
+
+				<!-- Normal entry everything is fine -->
+				<div class='step2_entry_container'>	
+			{/if}
+			
+			<div class='step2_entry_name'>{$basic[$key].NAME}</div>
+			<div class='step2_entry_status'>
+
 			{if $basic[$key].RESULT}
-				<font color='green'>{t}Success{/t}</font>
+				<div class='step2_successful'>{t}Successful{/t}</div>
 			{else}
-				<font color='red'>{t}Failed{/t}</font>
+				{if $basic[$key].MUST}
+					<div class='step2_failed'>{t}Failed{/t}</div>
+				{else}
+					<div class='step2_warning'>{t}Failed{/t}</div>
+				{/if}
+				{if $basic[$key].SOLUTION != ""}
+	
+				<!-- Inforamtion popup -->
+				<div class='solution_hidden' id='sol_{$key}'>
+					{if $basic[$key].MUST}
+						<div class='step2_failed_text'>
+						<b>{t}GOsa will NOT run without fixing this.{/t}</b>
+					{else}
+						<div class="step2_warning_text" style="background-image: url('images/warning.png')">
+						<i>{t}GOsa will run without fixing this.{/t}</i>
+					{/if}
+					<br>
+					{$basic[$key].SOLUTION}
+					</div>
+				</div>
+				{/if}
 			{/if}
+				</div>
 			</div>
 		{/foreach}
 	</div>
 </div>
-<div>
-	<div class='default' style='margin:10px; float:left;'>
-		<h2>{t}PHP setup configuration{/t}</h2>
+
+
+<!-- 
+	Div container with PHP config checks 
+-->
+<div style='width:50%; float:left;'>
+
+	<!-- Set content styles -->	
+	<div class='default' style='margin:10px;'>
+
+		<!-- Beginning PHP config check output -->
+		<h2 class='step2_container_title'>{t}PHP setup configuration{/t}</h2>
+
 		{foreach from=$config item=val key=key}
-			<div class='default' style='float:left'>
-				{$config[$key].NAME}
-			</div>
-			<div class='default' style='text-align:right; '>
+
+			<!-- Entry {$key} -->
+            {if $config[$key].SOLUTION != "" && !$config[$key].RESULT}
+
+                <!-- Add ability to display info popup -->
+                <div class='step2_entry_container_info'
+                    onMouseOver="javascript: display_solution('sol_config_{$key}');"
+                    onMouseOut="javascript: hide_solution('sol_config_{$key}');" >
+            {else}
+
+                <!-- Normal entry everything is fine -->
+                <div class='step2_entry_container'>
+            {/if}
+
+
+			<div class='step2_entry_name'>{$config[$key].NAME}</div>
+			<div class='step2_entry_status'>
 			{if $config[$key].RESULT}
-				<font color='green'>{t}Success{/t}</font>
+				<div class='step2_successful'>{t}Successful{/t}</div>
 			{else}
-				<font color='red'>{t}Failed{/t}</font>
+
+				{if $config[$key].MUST}
+					<div class='step2_failed'>{t}Failed{/t}</div>
+				{else}
+					<div class='step2_warning'>{t}Failed{/t}</div>
+				{/if}
+
+				{if $config[$key].SOLUTION != ""}
+	
+				<!-- Inforamtion popup -->
+				<div class='solution_hidden' id='sol_config_{$key}'>
+					{if $config[$key].MUST}
+						<div class='step2_failed_text'>
+						<b>{t}GOsa will NOT run without fixing this.{/t}</b>
+					{else}
+						<div class='step2_warning_text' style="background-image: url('images/warning.png')">
+						<i>{t}GOsa will run without fixing this.{/t}</i>
+					{/if}
+					<br>
+					{$config[$key].SOLUTION}
+					</div>
+				</div>
+				{/if}
 			{/if}
 			</div>
+			</div>
+		{/foreach}
+
+
+<!-- 
+	Beginning PHP config check output 
+-->
+		<h2 class='step2_container_title'>{t}Configuration file writeable{/t}</h2>
+		
+		{foreach from=$is_writeable item=val key=key}
+
+			<!-- Entry {$key} -->
+            {if $is_writeable[$key].SOLUTION != "" && !$is_writeable[$key].RESULT}
+
+                <!-- Add ability to display info popup -->
+                <div class='step2_entry_container_info'
+                    onMouseOver="javascript: display_solution('sol_is_writeable{$key}');"
+                    onMouseOut="javascript: hide_solution('sol_is_writeable{$key}');" >
+            {else}
+
+                <!-- Normal entry everything is fine -->
+                <div class='step2_entry_container'>
+            {/if}
+
+
+			<div class='step2_entry_name'>{$is_writeable[$key].NAME}</div>
+			<div class='step2_entry_status'>
+			{if $is_writeable[$key].RESULT}
+				<div class='step2_successful'>{t}Successful{/t}</div>
+			{else}
+
+				{if $is_writeable[$key].MUST}
+					<div class='step2_failed'>{t}Failed{/t}</div>
+				{else}
+					<div class='step2_warning'>{t}Failed{/t}</div>
+				{/if}
+
+				{if $is_writeable[$key].SOLUTION != ""}
+	
+				<!-- Inforamtion popup -->
+				<div class='solution_hidden' id='sol_is_writeable{$key}'>
+					{if $is_writeable[$key].MUST}
+						<div class='step2_failed_text'>
+						<b>{t}GOsa will NOT run without fixing this.{/t}</b>
+					{else}
+						<div class='step2_warning_text' style="background-image: url('images/warning.png')">
+						<i>{t}GOsa will run without fixing this.{/t}</i>
+					{/if}
+					<br>
+					{$is_writeable[$key].SOLUTION}
+					</div>
+				</div>
+				{/if}
+			{/if}
+			</div>
+			</div>
 		{/foreach}
+
+
+			
 	</div>
 </div>
+<script type="text/javascript">
+{literal}
+	function display_solution(str){
+		obj = document.getElementById(str);
+		obj.className='solution_visible';
+	}
+	function hide_solution(str){
+		obj = document.getElementById(str);
+		obj.className='solution_hidden';
+	}
+
+{/literal}
+</script>