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

diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index 9ba9e7abc..d270421da 100644
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -27,26 +27,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}
@@ -88,28 +88,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'>
+						<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>
-					{$config[$key].SOLUTION}
 					</div>
 				</div>
 				{/if}
@@ -143,28 +143,28 @@
 			<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>
+				<div class='step2_successful'>{t}Ok{/t}</div>
 			{else}
 
 				{if $is_writeable[$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 $is_writeable[$key].SOLUTION != ""}
 	
 				<!-- Inforamtion popup -->
-				<div class='solution_hidden' id='sol_is_writeable{$key}'>
+				<div class='solution_visible' 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')">
+						{$is_writeable[$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')">
+						{$is_writeable[$key].SOLUTION}
+						<b>{t}GOsa will run without fixing this.{/t}</b>
 					{/if}
-					<br>
-					{$is_writeable[$key].SOLUTION}
 					</div>
 				</div>
 				{/if}
@@ -172,21 +172,7 @@
 			</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>
+
+<div style="clear:both"></div>