From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 19 Apr 2007 08:32:38 +0000 (+0000)
Subject: Updated layout
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eab1000b439457e86b5cb77ce3d3868d2df815c1;p=gosa.git

Updated layout


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6114 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/setup/class_setupStep_Schema.inc b/setup/class_setupStep_Schema.inc
index d8e9e32c8..148c7df7d 100644
--- a/setup/class_setupStep_Schema.inc
+++ b/setup/class_setupStep_Schema.inc
@@ -37,9 +37,9 @@ class Step_Schema extends setup_step
   
   function update_strings()
   {
-    $this->s_title      = _("Ldap schema check");
-    $this->s_title_long = _("Ldap schema check");
-    $this->s_info       = _("This dialog checks your ldap schema setup");
+    $this->s_title      = _("LDAP schema check");
+    $this->s_title_long = _("LDAP schema check");
+    $this->s_info       = _("Perform test on your curren LDAP schema");
   }
 
   
diff --git a/setup/class_setupStep_Welcome.inc b/setup/class_setupStep_Welcome.inc
index 06c323747..7549aaae3 100644
--- a/setup/class_setupStep_Welcome.inc
+++ b/setup/class_setupStep_Welcome.inc
@@ -24,7 +24,7 @@ class Step_Welcome  extends setup_step
 {
   var $languages      = array();
   var $attributes     = array();
-  var $header_image   = "images/locale.png";
+  var $header_image   = "images/welcome.png";
 
   function Step_Welcome()
   {
@@ -36,8 +36,8 @@ class Step_Welcome  extends setup_step
   function update_strings()
   {
     $this->s_title      = _("Welcome");
-    $this->s_title_long = _("Welcome to GOsa setup");
-    $this->s_info       = _("Welcome to GOsa setup");
+    $this->s_info       = _("The welcome message");
+    $this->s_title_long = _("Welcome to GOsa setup wizard");
   }
   
   function execute()
diff --git a/setup/setup_schema.tpl b/setup/setup_schema.tpl
index fe1e0c582..c7e81b39a 100644
--- a/setup/setup_schema.tpl
+++ b/setup/setup_schema.tpl
@@ -1,40 +1,37 @@
-<div class='default' style='margin:12px; '>
-    <div style='float:left; '>
-        <br>
-        <b>{t}Validate schema when login into GOsa?{/t}</b>
-    </div>
-	<div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable schema validation{/t}
+<div class='default'>
+    <p>
+     <b>{t}Schema specific settings{/t}</b>
+    </p>
+    <div class='step4_container'>
+        <div class='step4_name' style='width:30%'>
+            {t}Enable schema validation when logging in{/t}
         </div>
         <div class='step4_value'>
 			<select name='enable_schema_check'>
 				{html_options options=$bool selected=$enable_schema_check}
             </select>
         </div>
-        <div class='step4_status'>
-            {t}Infos in FAQ{/t}&nbsp;
-            <img  alt='!'  class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
-        </div>
     </div>
-	<div style='float:left;' >
+    <p>
+     <b>{t}Check status{/t}</b>
+    </p>
+	<div>
 		{if $failed_checks == 0}
-			<h2>{t}Schema check was completely successful{/t}</h2>
+			<font style="color:green">{t}Schema check succeeded{/t}</font>
 		{else}
-			<h2><img src='images/warning.png' class='center'>
-				<font color='red'>{t}The schema check returned the following results{/t}</font></h2>
+			<img src='images/small_warning.png' class='center'>
+				<font style="color:red">{t}Schema check failed{/t}</font>
 		{/if}
-	<div style='float:left'>
+	</div>
+	<div style="margin-left:20px;">
 		{foreach from=$checks item=val key=key}
 				{if !$checks[$key].STATUS}
 				<br>
-				<b>{$key}</b>
 				{$checks[$key].INFO}
-				<br>
 					{if $checks[$key].IS_MUST_HAVE}
-						<i><font color='red'>{$checks[$key].MSG}</font></i>
+						<font color='red'>{$checks[$key].MSG}</font>
 					{else}
-						<i><font color='orange'>{$checks[$key].MSG}</font></i>
+						{$checks[$key].MSG}
 					{/if}
 				<br>
 				{/if}
diff --git a/setup/setup_welcome.tpl b/setup/setup_welcome.tpl
index 90a4d4c41..44a51bec7 100644
--- a/setup/setup_welcome.tpl
+++ b/setup/setup_welcome.tpl
@@ -1,6 +1,11 @@
 <div>
     <div class='default'>
-        <p><b>{t}Welcome to the GOsa setup routine{/t}</b></p>
-		Nothing yet 
-	</div>
+        <p><b>{t}Starting to configure GOsa to your needs{/t}</b></p>
+	<p>
+	{t}This seems to be the first time you start GOsa - we didn't find any configuration right now. This simple wizard intends to help you while setting it up.{/t}
+	</p>
+	<p>
+	{t}There needs to be more information here...{/t}
+	</p>
+     </div>
 </div>