First style update for migration

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

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 0b8466a3af57759744d4514f4cb15107112f995a..240c0d61ca50c05e679abd630d9f316375da61ec 100644 (file)
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -960,21 +960,22 @@ div.solution_visible {
 
 /* Container headline */
 h2.step2_container_title {
-       background-color:#DDDDDD;
+       background-color:#F0F0F0;
        border: solid 1px #CCCCCC;
-       padding:2px;
+       width:100%; 
+       padding:3px;
 }
 
 /* Container for name and status */
 div.step2_entry_container { 
-       padding:1px;
+       padding:3px;
        width:100%; 
        cursor:default;
 }
 
 /* Container for name and status, when status is failed */
 div.step2_entry_container_info { 
-       padding:1px;
+       padding:3px;
        border: 1px dashed #AAAAAA;
        width:100%;
        cursor:default;

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 0e01b82d09bba48336ed4d1cf3fa8cb146182367..6e3da57206e23c4d684c122a6b123b9e1ea276ee 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -140,31 +140,31 @@ class Step_Migrate extends setup_step
     $this->checks['acls']['ERROR_MSG'] = "";
     $this->check_administrativeAccount();
 
-    $this->checks['outside_users']['TITLE']     = _("Checking for users outside the people department.");
+    $this->checks['outside_users']['TITLE']     = _("Checking for users outside the people department");
     $this->checks['outside_users']['STATUS']    = FALSE;
     $this->checks['outside_users']['STATUS_MSG']= "";
     $this->checks['outside_users']['ERROR_MSG'] = "";
     $this->search_outside_users();
     
-    $this->checks['outside_groups']['TITLE']     = _("Checking for groups outside the groups department.");
+    $this->checks['outside_groups']['TITLE']     = _("Checking for groups outside the groups department");
     $this->checks['outside_groups']['STATUS']    = FALSE;
     $this->checks['outside_groups']['STATUS_MSG']= "";
     $this->checks['outside_groups']['ERROR_MSG'] = "";
     $this->search_outside_groups();
 
-    $this->checks['outside_winstations']['TITLE']     = _("Checking for windows workstations outside the winstation department.");
+    $this->checks['outside_winstations']['TITLE']     = _("Checking for windows workstations outside the winstation department");
     $this->checks['outside_winstations']['STATUS']    = FALSE;
     $this->checks['outside_winstations']['STATUS_MSG']= "";
     $this->checks['outside_winstations']['ERROR_MSG'] = "";
     $this->search_outside_winstations();
 
-    $this->checks['uidNumber_usage']['TITLE']     = _("Checking for multiple use of same uidNumber value.");
+    $this->checks['uidNumber_usage']['TITLE']     = _("Checking for multiple use of same uidNumber value");
     $this->checks['uidNumber_usage']['STATUS']    = FALSE;
     $this->checks['uidNumber_usage']['STATUS_MSG']= "";
     $this->checks['uidNumber_usage']['ERROR_MSG'] = "";
     $this->check_uidNumber();
     
-    $this->checks['gidNumber_usage']['TITLE']     = _("Checking for multiple use of same gidNumber value.");
+    $this->checks['gidNumber_usage']['TITLE']     = _("Checking for multiple use of same gidNumber value");
     $this->checks['gidNumber_usage']['STATUS']    = FALSE;
     $this->checks['gidNumber_usage']['STATUS_MSG']= "";
     $this->checks['gidNumber_usage']['ERROR_MSG'] = "";

diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index f029a26e0f3929adea699e21f72152a5fa0cf63c..90275fc27a7387359c988a99d538e8f10439bb03 100644 (file)
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -7,17 +7,17 @@
        <div class='default' style='margin:10px;'>
                <!-- Beginning PHP module check output -->
                <h2 class='step2_container_title'>{t}PHP module and extension checks{/t}</h2>
+               <!-- {cycle reset=true values="#F0F0F0, #FFF"} -->
                {foreach from=$basic item=val key=key}
-       
                        <!-- Entry {$key} -->           
                        {if $basic[$key].SOLUTION != "" && !$basic[$key].RESULT}
                
                                <!-- Add ability to display info popup -->      
-                               <div class='step2_entry_container_info'>
+                               <div class='step2_entry_container_info' style='background-color:{cycle values="#F0F0F0, #FFF"}'>
                        {else}
 
                                <!-- Normal entry everything is fine -->
-                               <div class='step2_entry_container'>     
+                               <div class='step2_entry_container' style='background-color:{cycle values="#F0F0F0, #FFF"}'>     
                        {/if}
                        
                        <div class='step2_entry_name'>{$basic[$key].NAME}</div>
@@ -66,17 +66,18 @@
                <!-- Beginning PHP config check output -->
                <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>
 
+               <!-- {cycle reset=true values="#F0F0F0, #FFF"} -->
                {foreach from=$config item=val key=key}
 
                        <!-- Entry {$key} -->
             {if $config[$key].SOLUTION != "" && !$config[$key].RESULT}
 
                 <!-- Add ability to display info popup -->
-                <div class='step2_entry_container_info'>
+                <div class='step2_entry_container_info' style='background-color:{cycle values="#FFF, #F0F0F0"}'>
             {else}
 
                 <!-- Normal entry everything is fine -->
-                <div class='step2_entry_container'>
+                <div class='step2_entry_container' style='background-color:{cycle values="#FFF, #F0F0F0"}'>
             {/if}
 
 

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 3e6ff4c26cc46fbacaefdabc1a9ec9aad7fad8bc..cc59d6ee70097899d606601f8948d7ad2585aacc 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -1,32 +1,36 @@
 <div>
-
-       <h1 style='color:red'>Style fixes necessary here ;-)</h1>
     <div class='default'>
 
        {if $method == "default"}
-
-               <input type='submit' name='reload' value='{t}Check again{/t}'>
-               <p>&nbsp;</p>
+                       <p>{t}During the LDAP inspection, we're going to check for several common pitfalls that may occur when migration to GOsa base LDAP administration. You may want to fix the problems below, in order to provide smooth services.{/t}
+                       </p>
 
                        {foreach from=$checks item=val key=key}
-                               <div class='step2_entry_name'><b>{$checks.$key.TITLE}</b></div>
+                               <div style='width:98%; padding:4px; background-color:{cycle values="#F0F0F0, #FFF"}'>
+
+                       {if $checks.$key.ERROR_MSG}
+                                <!-- Add ability to display info popup -->
+                                <div class='step2_entry_container_info'>
+                        {else}
+                                <!-- Normal entry everything is fine -->
+                                <div class='step2_entry_container'>
+                        {/if}
+                               <div class='step2_entry_name'>{$checks.$key.TITLE}</div>
+                               <div class='step2_entry_status'>
                                {if $checks.$key.STATUS}
-                                       <div class='step2_successful'>{$checks.$key.STATUS_MSG}
-                                       {if $checks.$key.ERROR_MSG}
-                                               {$checks.$key.ERROR_MSG}
-                                       {/if}
-                                       </div>
+                                       <div class='step2_successful'>{$checks.$key.STATUS_MSG}</div>
                                {else}
-                                       <div class='step2_failed' style='float:none'>{$checks.$key.STATUS_MSG}
-                                       </div>
-                                       <div>
+                                       <div class='step2_failed'>{$checks.$key.STATUS_MSG}</div>
+                               {/if}
+                               </div>
                                        {if $checks.$key.ERROR_MSG}
                                                {$checks.$key.ERROR_MSG}
                                        {/if}
-                                       </div>
-                               {/if}
-                               <div>&nbsp;</div>
+                               </div>
+                               </div>
                        {/foreach}
+               <br>
+               <input type='submit' name='reload' value='{t}Check again{/t}'>
 
                {elseif $method == "outside_winstations"}