From dd6d6f2c896b0ab1dee8c4c70cf26c968fd7ba74 Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 4 May 2007 15:27:28 +0000 Subject: [PATCH] First style update for migration git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6269 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/themes/default/style.css | 9 ++++---- setup/class_setupStep_Migrate.inc | 10 ++++---- setup/setup_checks.tpl | 11 +++++---- setup/setup_migrate.tpl | 38 +++++++++++++++++-------------- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/html/themes/default/style.css b/html/themes/default/style.css index 0b8466a3a..240c0d61c 100644 --- 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 0e01b82d0..6e3da5720 100644 --- 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 f029a26e0..90275fc27 100644 --- a/setup/setup_checks.tpl +++ b/setup/setup_checks.tpl @@ -7,17 +7,17 @@

{t}PHP module and extension checks{/t}

+ {foreach from=$basic item=val key=key} - {if $basic[$key].SOLUTION != "" && !$basic[$key].RESULT} -
+
{else} -
+
{/if}
{$basic[$key].NAME}
@@ -66,17 +66,18 @@

{t}PHP setup configuration{/t} ({t}show information{/t})

+ {foreach from=$config item=val key=key} {if $config[$key].SOLUTION != "" && !$config[$key].RESULT} -
+
{else} -
+
{/if} diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl index 3e6ff4c26..cc59d6ee7 100644 --- a/setup/setup_migrate.tpl +++ b/setup/setup_migrate.tpl @@ -1,32 +1,36 @@
- -

Style fixes necessary here ;-)

{if $method == "default"} - - -

 

+

{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} +

{foreach from=$checks item=val key=key} -
{$checks.$key.TITLE}
+
+ + {if $checks.$key.ERROR_MSG} + +
+ {else} + +
+ {/if} +
{$checks.$key.TITLE}
+
{if $checks.$key.STATUS} -
{$checks.$key.STATUS_MSG} - {if $checks.$key.ERROR_MSG} - {$checks.$key.ERROR_MSG} - {/if} -
+
{$checks.$key.STATUS_MSG}
{else} -
{$checks.$key.STATUS_MSG} -
-
+
{$checks.$key.STATUS_MSG}
+ {/if} +
{if $checks.$key.ERROR_MSG} {$checks.$key.ERROR_MSG} {/if} -
- {/if} -
 
+
+
{/foreach} +
+ {elseif $method == "outside_winstations"} -- 2.30.2