From 43d19469537f22022c8d6309dae24bed0758af18 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 18 Apr 2007 13:11:29 +0000 Subject: [PATCH] Style tuning git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6090 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/images/small_error.png | Bin 0 -> 890 bytes html/images/small_warning.png | Bin 0 -> 571 bytes html/themes/default/style.css | 32 +++++++------- setup/class_setupStep_Checks.inc | 54 ++++++++++++------------ setup/setup_checks.tpl | 70 +++++++++++++------------------ setup/setup_language.tpl | 2 +- 6 files changed, 71 insertions(+), 87 deletions(-) create mode 100644 html/images/small_error.png create mode 100644 html/images/small_warning.png diff --git a/html/images/small_error.png b/html/images/small_error.png new file mode 100644 index 0000000000000000000000000000000000000000..6b990a2f7793a1c3c5ea305f8b716ff98517213a GIT binary patch literal 890 zcmV-=1BLvFP)= z9~4vsDJm9GRx7>;7JbkP+Mu+QmR`~(sVz2HY-G(+bJ?($Y&Py>XU2zUv`s(w-p)C2 zzH>g|HgkDfzt3^qJ_ov7Tyc@>69B6HS zJC;m7>VNSC^pJ_Cr3EXW$EnrU7o{)~akO|0?YHTG%+3Y1NA{1Xi@kk54?O4Hw->uw zMUO_&fHMW54B&e65M`20E^##hxy5;v{#mJl`=ak)tx%fr6Lg;g#w~!pcIQozb5kd zV|Y8-G4>_^SUUU>fuB#{U0MbKpQhmv>CyqwEDJ3+gBS*482AbcFgFixzOi<_@d<)Q zzxgjWR{??}qLhnVcgkg=Q&}QcuF`yIj6f)a_kU!zrs0D_{|E@^8g-|^ib!5nbZxY3 z+hq|!G=-#l(B6G#4SetwcjjO>6XKOX#$gC179UVB& zKC|Ze(EAkYb&B_NQ~Wr?>QolFuZP;6L1vY(;L(re;;|b7Fw#HJ9I+dtEjxB}8ZFVa z2y?j&MKV$;s+Y!CICn1pQ(Nnk(}~#VdX>K)*xi}5tdVd!eYe@&jmXVp*M;ijB&CUo z{OM%kz^}>p=}ab5xe4~=?gv{_wUyTcfxwV)SIYD@H3LvD6|sKLEf?#59Xp?hAD&Lc zu4FQq%7$+Q7#>U@?=)SpVYx2KHYj68q7Z QjQ{`u07*qoM6N<$g2bwzdjJ3c literal 0 HcmV?d00001 diff --git a/html/images/small_warning.png b/html/images/small_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..fd49f31f29876d426c89678fcdf87d53198b6b28 GIT binary patch literal 571 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0pdd@S zqpu?a!^Xav-+_~Xe1&9>AYTTCDpdxChGqtapZ|gMO9qBg0|tgy2@DKYGZ+}e^C!h0 zbz@*)-011z7*cU7>CgZF_ROjb3Jns4o@=<%Ua$wT2E1!ou$8Cv#uY{u0ll+)4uAe1 zp4#;Py}#5S_Kl87H?At0M@E(Qb#e*~GcK5DGpwxHyMlo&Y#DPwp&1_=o23b;59FpB{FzOb?Ao`tQWgI_%(^I?63_vS43ZI3XN^=?vh;%SkO zVau{O#;~RHpnyVygWd{u);V)dGVah-`14kl`S4s}hZ?REb>|zD)Ymid1PB&1Tw`Vt zIMKl3YtQI$V4>s(-i+hh`vs&T`vhO8#@23lE(G)gtINNCdIvr{mtJMOvyoA4J^#n1 z28|1U-mmyH-`=5#9qgh&|FpCm77hhBug%5|4U7y6f+wBb=2+SSjA#Z=S3j3^P6* literal 0 HcmV?d00001 diff --git a/html/themes/default/style.css b/html/themes/default/style.css index 8ae29188a..848364cd5 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -951,17 +951,9 @@ div.navigation_info { Setup step 2 styles */ -/* used to hide display info div */ -div.solution_hidden { - display: none; -} - /* used to hide display info div */ div.solution_visible { display: block; - background-color: orange; - background-image: url('images/personal.png'); - border: dotted 2px red; width: 100%; text-align:left; } @@ -970,44 +962,49 @@ div.solution_visible { h2.step2_container_title { background-color:#DDDDDD; border: solid 1px #CCCCCC; + padding:2px; } /* Container for name and status */ div.step2_entry_container { + padding:1px; width:100%; cursor:default; } /* Container for name and status, when status is failed */ div.step2_entry_container_info { + padding:1px; + border: 1px dashed #AAAAAA; width:100%; - background: #DDDDFF; cursor:default; } /* Text shown for each entry */ div.step2_entry_name { float:left; - padding: 2px; - vertical-align: middle; + padding-bottom:4px; + vertical-align: middle; } /* Status container */ div.step2_entry_status { float:none; text-align:right; - padding: 2px; - vertical-align: middle; + padding-bottom:4px; + vertical-align: middle; } /* Status failed */ div.step2_failed { color:red; + padding-bottom:4px; } /* Status failed but not necessary for setup */ div.step2_warning { - color:blue; + color:orange; + padding-bottom:4px; } /* Status successful */ @@ -1017,15 +1014,14 @@ div.step2_successful { /* Text used in info div. */ div.step2_failed_text { - background-image: url('images/error.png'); background-repeat: no-repeat; - padding-left: 35px; + padding-left: 25px; } /* Text used in info div. On warnings */ div.step2_warning_text{ background-repeat: no-repeat; - padding-left: 35px; + padding-left: 25px; } @@ -1062,7 +1058,7 @@ li.step4_status, div.step4_status { ul.step4_container, div.step4_container { background-color: #E7E7E7; - border: solid 2px #D7D7D7; + border: solid 1px #D7D7D7; width:100%; height:2.0em; margin-top:2px; diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc index bf25f7bda..144bfc704 100644 --- a/setup/class_setupStep_Checks.inc +++ b/setup/class_setupStep_Checks.inc @@ -36,8 +36,8 @@ class Step_Checks extends setup_step function update_strings() { $this->s_title = _("Installation check"); - $this->s_title_long = _("Basic installation checks"); - $this->s_info = _("Some basic checks for PHP version, ldap extension..."); + $this->s_title_long = _("Installation check"); + $this->s_info = _("Basic checks for PHP version and required extensions."); } @@ -62,24 +62,24 @@ class Step_Checks extends setup_step /* PHP version check */ $N = _("Checking PHP version"); - $D = sprintf(_("PHP must be of version %s or %s or above for some functions."),"4.3.10","5.2.0"); - $S = _("GOsa requires functions that may not be available in older PHP versions, just update to a supported PHP version."); + $D = sprintf(_("PHP must be of version %s / %s or above."),"4.3.10","5.2.0"); + $S = _("GOsa requires functionality that is not available (or buggy) in older PHP versions. Please update to a supported version."); $R = $this->check_php_version(); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Checking imap extension */ - $N = _("Checking for ldap module"); - $D = _("This is the main module used by GOsa and therefore really required."); - $S = _("The ldap module (PHP4-ldap/PHP5-ldap) is required to communicate with your ldap server."); + $N = _("Checking for LDAP support"); + $D = _("This is the main extension used by GOsa and therefore really required."); + $S = _("The ldap extension (php4-ldap/php5-ldap) is required to communicate with your LDAP server."); $R = is_callable("ldap_bind"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Check for gettext support */ $N = _("Checking for gettext support"); - $D = _("Gettext support is required for internationalized GOsa."); - $S = _("This should be activated while compiling your PHP. (--with-gettext)"); + $D = _("Gettext support is required for internationalization."); + $S = _("Please make sure that the extension is activated."); $R = is_callable("bindtextdomain"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); @@ -87,45 +87,45 @@ class Step_Checks extends setup_step /* Checing for iconv */ $N = _("Checking for iconv support"); $D = _("This module is used by GOsa to convert samba munged dial informations and is therefore required. "); - $S = _("This should be activated while compiling your PHP. (--with-iconv)"); + $S = _("Please make sure that the extension is activated."); $R = is_callable("iconv"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Check for installed mhash module */ - $N = _("Checking for mhash module"); - $D = _("To use SSHA encryption, you'll need this module. GOsa will run without it."); - $S = _("The mhash module for PHP 4/5 is not available, please install it. (php4-mhash/php5-mhash)"); + $N = _("Checking for mhash support"); + $D = _("You'll need this module to make use of SSHA encryption"); + $S = _("The mhash module for PHP 4/5 is not available.Pplease install php4-mhash/php5-mhash."); $R = is_callable("mhash"); $M = FALSE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Is imap module available */ - $N = _("Checking for imap module"); - $D = _("The IMAP module is needed to communicate with the IMAP server. It gets status informations, creates and deletes mail users."); - $S = _("This module is used to communicate with your mail server. Please install (PHP4-imap PHP5-imap)"); + $N = _("Checking for IMAP support"); + $D = _("The IMAP module is needed to communicate with the IMAP server. GOsa retrieves status information, creates and deletes mail users, etc."); + $S = _("This module is used to communicate with your mail server. Please install php4-imap/php5-imap."); $R = is_callable("imap_open"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Check getacl in imap module */ - $N = _("Checking for getacl in imap"); - $D = _("The getacl support is needed for shared folder permissions. The standard IMAP module is not capable of reading acl's. You need a recend PHP version for this feature."); + $N = _("Checking for getacl in IMAP implementation"); + $D = _("The getacl support is needed to handle shared folder permissions. Old IMAP extensions are not capable of reading acl's. You need a recent PHP version to use this feature."); $S = $D; $R = is_callable("imap_getacl"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Mysql module loaded ? */ - $N = _("Checking for mysql module"); - $D = _("MySQL support is needed for reading GOfax reports from databases."); - $S = _("This module is required to communicate with database servers, for example used in phone and fax addons. Please install (PHP4-mysql PHP5-mysql)"); + $N = _("Checking for MySQL support"); + $D = _("MySQL support is needed to communicate with several supported databases."); + $S = _("This module is required to communicate with database servers (GOfax, asterisk, GLPI, etc.). Please install php4-mysql/php5-mysql"); $R = is_callable("mysql_query"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Checking for kadm5 module */ - $N = _("Checking for kadm5 module"); + $N = _("Checking for kadm5 support"); $D = _("Managing users in kerberos requires the kadm5 module which is downloadable via PEAR network."); $S = _("This module is required to manage user in kerberos, it is downloadable via PEAR network"); $R = is_callable("kadm5_init_with_password"); @@ -133,16 +133,16 @@ class Step_Checks extends setup_step $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Snmp module available ? */ - $N = _("Checking for snmp Module"); - $D = _("Simple Network Management Protocol (SNMP) is required for client monitoring."); - $S = _("This module is required for client monitoring. (PHP4-snmp/PHP5-snmp)"); + $N = _("Checking for SNMP support"); + $D = _("The simple network management protocol is needed to get status information from clients."); + $S = _("This module is required for client monitoring. Please install php4-snmp/php5-snmp."); $R = is_callable("snmpget"); $M = FALSE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Checking for Cups module */ - $N = _("Checking for cups module"); - $D = _("In order to read available printers from IPP protocol instead of printcap files, you've to install the CUPS module."); + $N = _("Checking for CUPS support"); + $D = _("In order to read available printers via the IPP protocol instead of printcap files, you've to install the CUPS module."); $S = $D; $R = is_callable("cups_get_dest_list"); $M = FALSE; diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl index 9ba9e7abc..52d57557f 100644 --- a/setup/setup_checks.tpl +++ b/setup/setup_checks.tpl @@ -27,26 +27,26 @@
{if $basic[$key].RESULT} -
{t}Successful{/t}
+
{t}Ok{/t}
{else} {if $basic[$key].MUST} -
{t}Failed{/t}
+
{t}Error{/t}
{else} -
{t}Failed{/t}
+
{t}Warning{/t}
{/if} {if $basic[$key].SOLUTION != ""} -
+
{if $basic[$key].MUST} -
+
+ {$basic[$key].SOLUTION} {t}GOsa will NOT run without fixing this.{/t} {else} -
- {t}GOsa will run without fixing this.{/t} +
+ {$basic[$key].SOLUTION} + {t}GOsa will run without fixing this.{/t} {/if} -
- {$basic[$key].SOLUTION}
{/if} @@ -61,7 +61,7 @@ -
+
@@ -88,28 +88,28 @@
{$config[$key].NAME}
{if $config[$key].RESULT} -
{t}Successful{/t}
+
{t}Ok{/t}
{else} {if $config[$key].MUST} -
{t}Failed{/t}
+
{t}Error{/t}
{else} -
{t}Failed{/t}
+
{t}Warning{/t}
{/if} {if $config[$key].SOLUTION != ""} -
+
{if $config[$key].MUST} -
+
+ {$config[$key].SOLUTION} {t}GOsa will NOT run without fixing this.{/t} {else} -
- {t}GOsa will run without fixing this.{/t} +
+ {$config[$key].SOLUTION} + {t}GOsa will run without fixing this.{/t} {/if} -
- {$config[$key].SOLUTION}
{/if} @@ -143,28 +143,28 @@
{$is_writeable[$key].NAME}
{if $is_writeable[$key].RESULT} -
{t}Successful{/t}
+
{t}Ok{/t}
{else} {if $is_writeable[$key].MUST} -
{t}Failed{/t}
+
{t}Error{/t}
{else} -
{t}Failed{/t}
+
{t}Warning{/t}
{/if} {if $is_writeable[$key].SOLUTION != ""} -
+
{if $is_writeable[$key].MUST} -
+
+ {$is_writeable[$key].SOLUTION} {t}GOsa will NOT run without fixing this.{/t} {else} -
- {t}GOsa will run without fixing this.{/t} +
+ {$is_writeable[$key].SOLUTION} + {t}GOsa will run without fixing this.{/t} {/if} -
- {$is_writeable[$key].SOLUTION}
{/if} @@ -177,16 +177,4 @@
- + diff --git a/setup/setup_language.tpl b/setup/setup_language.tpl index 247008373..d60e244ec 100644 --- a/setup/setup_language.tpl +++ b/setup/setup_language.tpl @@ -6,7 +6,7 @@

- {html_options options=$languages selected=$lang_selected}
-- 2.30.2