X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fsetup_checks.tpl;h=f029a26e0f3929adea699e21f72152a5fa0cf63c;hb=4af8eca6e1b99d9f7eb446b3cab5ef5f865fc1b9;hp=9ba9e7abcf49c05e831a2255b091b91de58e8c7d;hpb=ed442811d407918c35ea5efc5509501e58d81fb9;p=gosa.git

diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index 9ba9e7abc..f029a26e0 100644
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -5,7 +5,6 @@
 
 	<!-- Set content styles -->	
 	<div class='default' style='margin:10px;'>
-
 		<!-- 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}
@@ -14,9 +13,7 @@
 			{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}');" >
+				<div class='step2_entry_container_info'>
 			{else}
 
 				<!-- Normal entry everything is fine -->
@@ -27,26 +24,26 @@
 			<div class='step2_entry_status'>
 
 			{if $basic[$key].RESULT}
-				<div class='step2_successful'>{t}Successful{/t}</div>
+				<div class='step2_successful'>{t}Ok{/t}</div>
 			{else}
 				{if $basic[$key].MUST}
-					<div class='step2_failed'>{t}Failed{/t}</div>
+					<div class='step2_failed'>{t}Error{/t}</div>
 				{else}
-					<div class='step2_warning'>{t}Failed{/t}</div>
+					<div class='step2_warning'>{t}Warning{/t}</div>
 				{/if}
 				{if $basic[$key].SOLUTION != ""}
 	
 				<!-- Inforamtion popup -->
-				<div class='solution_hidden' id='sol_{$key}'>
+				<div class='solution_visible' id='sol_{$key}'>
 					{if $basic[$key].MUST}
-						<div class='step2_failed_text'>
+						<div class='step2_failed_text' style="background-image: url('images/small_error.png')">
+						{$basic[$key].SOLUTION}
 						<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>
+						<div class="step2_warning_text" style="background-image: url('images/small_warning.png')">
+						{$basic[$key].SOLUTION}
+						<b>{t}GOsa will run without fixing this.{/t}</b>
 					{/if}
-					<br>
-					{$basic[$key].SOLUTION}
 					</div>
 				</div>
 				{/if}
@@ -67,7 +64,7 @@
 	<div class='default' style='margin:10px;'>
 
 		<!-- Beginning PHP config check output -->
-		<h2 class='step2_container_title'>{t}PHP setup configuration{/t}</h2>
+		<h2 class='step2_container_title'>{t}PHP setup configuration{/t} (<a style='text-decoration:underline' href='?info' target='_blank'>{t}show information{/t})</a></h2>
 
 		{foreach from=$config item=val key=key}
 
@@ -75,9 +72,7 @@
             {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}');" >
+                <div class='step2_entry_container_info'>
             {else}
 
                 <!-- Normal entry everything is fine -->
@@ -88,83 +83,28 @@
 			<div class='step2_entry_name'>{$config[$key].NAME}</div>
 			<div class='step2_entry_status'>
 			{if $config[$key].RESULT}
-				<div class='step2_successful'>{t}Successful{/t}</div>
+				<div class='step2_successful'>{t}Ok{/t}</div>
 			{else}
 
 				{if $config[$key].MUST}
-					<div class='step2_failed'>{t}Failed{/t}</div>
+					<div class='step2_failed'>{t}Error{/t}</div>
 				{else}
-					<div class='step2_warning'>{t}Failed{/t}</div>
+					<div class='step2_warning'>{t}Warning{/t}</div>
 				{/if}
 
 				{if $config[$key].SOLUTION != ""}
 	
 				<!-- Inforamtion popup -->
-				<div class='solution_hidden' id='sol_config_{$key}'>
+				<div class='solution_visible' 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'>
+						<div class='step2_failed_text' style="background-image: url('images/small_error.png')">
+						{$config[$key].SOLUTION}
 						<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>
+						<div class='step2_warning_text' style="background-image: url('images/small_warning.png')">
+						{$config[$key].SOLUTION}
+						<b>{t}GOsa will run without fixing this.{/t}</b>
 					{/if}
-					<br>
-					{$is_writeable[$key].SOLUTION}
 					</div>
 				</div>
 				{/if}
@@ -174,19 +114,8 @@
 		{/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>
+
+<div style="clear:both"></div>
+