diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-14 15:35:24 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-14 15:35:24 +0000 |
| commit | 318f0ca5b828c960eba0407f2fdfbf354e334d50 (patch) | |
| tree | 05997af92fe690fa5e466c3d266c6794a49b2c72 | |
| parent | fec8d3858c5c30b7211188287804d4e77fc33240 (diff) | |
| download | forums-318f0ca5b828c960eba0407f2fdfbf354e334d50.tar forums-318f0ca5b828c960eba0407f2fdfbf354e334d50.tar.gz forums-318f0ca5b828c960eba0407f2fdfbf354e334d50.tar.bz2 forums-318f0ca5b828c960eba0407f2fdfbf354e334d50.tar.xz forums-318f0ca5b828c960eba0407f2fdfbf354e334d50.zip | |
Couple extra strings, bold text
git-svn-id: file:///svn/phpbb/trunk@4131 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/install/install.php | 32 | ||||
| -rw-r--r-- | phpBB/language/en/lang_admin.php | 7 |
2 files changed, 23 insertions, 16 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php index d62131e50d..1270ecf2f2 100644 --- a/phpBB/install/install.php +++ b/phpBB/install/install.php @@ -302,11 +302,11 @@ if ($stage == 0) { if (!can_load_dll($dll)) { - $dlls_db[$db_name] = '<span style="color:red">' . $lang['UNAVAILABLE'] . '</span>'; + $dlls_db[$db_name] = '<b style="color:red">' . $lang['UNAVAILABLE'] . '</b>'; continue; } } - $dlls_db[$db_name] = '<span style="color:green">' . $lang['AVAILABLE'] . '</span>'; + $dlls_db[$db_name] = '<b style="color:green">' . $lang['AVAILABLE'] . '</b>'; $passed['db'] = true; } @@ -318,19 +318,23 @@ if ($stage == 0) { if (!can_load_dll($dll)) { - $dlls_other[$dll] = '<span style="color:red">' . $lang['UNAVAILABLE'] . '</span>'; + $dlls_other[$dll] = '<b style="color:red">' . $lang['UNAVAILABLE'] . '</b>'; continue; } } - $dlls_other[$dll] = '<span style="color:green">' . $lang['AVAILABLE'] . '</span>'; + $dlls_other[$dll] = '<b style="color:green">' . $lang['AVAILABLE'] . '</b>'; } inst_page_header(); ?> +<h1><?php echo $lang['INSTALL_ADVICE']; ?></h1> + <p><?php echo $lang['INSTALL_ADVICE_EXPLAIN']; ?></p> +<hr /> + <h1><?php echo $lang['PHP_AND_APPS']; ?></h1> <h2><?php echo $lang['INSTALL_REQUIRED']; ?></h2> @@ -347,17 +351,17 @@ if ($stage == 0) if (version_compare($php_version, '4.1.0') < 0) { $passed['db'] = false; - echo '<span style="color:red">' . $lang['NO'] . '</span>'; + echo '<b style="color:red">' . $lang['NO'] . '</b>'; } else { // We also give feedback on whether we're running in safe mode - echo '<span style="color:green">' . $lang['YES']; + echo '<b style="color:green">' . $lang['YES']; if (@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') { echo ', ' . $lang['PHP_SAFE_MODE']; } - echo '</span>'; + echo '</b>'; } ?></td> @@ -428,7 +432,7 @@ if ($stage == 0) ?> <tr> <td>• <b><?php echo $lang['APP_MAGICK']; ?>: </b></td> - <td><?php echo ($imagemagick) ? '<span style="color:green">' . $lang['AVAILABLE'] . ', ' . $imagemagick . '</span>' : '<span style="color:blue">' . $lang['NO_LOCATION'] . '</span>'; ?></td> + <td><?php echo ($imagemagick) ? '<b style="color:green">' . $lang['AVAILABLE'] . ', ' . $imagemagick . '</b>' : '<b style="color:blue">' . $lang['NO_LOCATION'] . '</b>'; ?></td> </tr> </table> @@ -467,8 +471,8 @@ if ($stage == 0) $passed['files'] = ($exists && $write && $passed['files']) ? true : false; - $exists = ($exists) ? '<span style="color:green">' . $lang['FILE_FOUND'] . '</span>' : '<span style="color:red">' . $lang['FILE_NOT_FOUND'] . '</span>'; - $write = ($write) ? ', <span style="color:green">' . $lang['FILE_WRITEABLE'] . '</span>' : (($exists) ? ', <span style="color:red">' . $lang['FILE_UNWRITEABLE'] . '</span>' : ''); + $exists = ($exists) ? '<b style="color:green">' . $lang['FILE_FOUND'] . '</b>' : '<b style="color:red">' . $lang['FILE_NOT_FOUND'] . '</b>'; + $write = ($write) ? ', <b style="color:green">' . $lang['FILE_WRITEABLE'] . '</b>' : (($exists) ? ', <b style="color:red">' . $lang['FILE_UNWRITEABLE'] . '</b>' : ''); ?> <tr> @@ -504,8 +508,8 @@ if ($stage == 0) $write = $exists = false; } - $exists = ($exists) ? '<span style="color:green">' . $lang['FILE_FOUND'] . '</span>' : '<span style="color:red">' . $lang['FILE_NOT_FOUND'] . '</span>'; - $write = ($write) ? ', <span style="color:green">' . $lang['FILE_WRITEABLE'] . '</span>' : (($exists) ? ', <span style="color:red">' . $lang['FILE_UNWRITEABLE'] . '</span>' : ''); + $exists = ($exists) ? '<b style="color:green">' . $lang['FILE_FOUND'] . '</b>' : '<b style="color:red">' . $lang['FILE_NOT_FOUND'] . '</b>'; + $write = ($write) ? ', <b style="color:green">' . $lang['FILE_WRITEABLE'] . '</b>' : (($exists) ? ', <b style="color:red">' . $lang['FILE_UNWRITEABLE'] . '</b>' : ''); ?> <tr> @@ -524,13 +528,15 @@ if ($stage == 0) $next_text = ($passed['db'] && $passed['files']) ? $lang['INSTALL_NEXT_PASS'] : $lang['INSTALL_NEXT_FAIL']; + $s_hidden_fields = ($imagemagick) ? '<input type="hidden" name="imagemagick" value="' . $imagemagick . '" />' : ''; + ?> <p><?php echo $next_text; ?></p> <table class="bg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center"> <tr> - <td class="cat" colspan="2" align="center"><input type="hidden" name="stage" value="1" /><input class="liteoption" name="retest" type="submit" value="Test Again" /><?php + <td class="cat" colspan="2" align="center"><?php echo $s_hidden_fields; ?><input type="hidden" name="stage" value="1" /><input class="liteoption" name="retest" type="submit" value="Test Again" /><?php if ($passed['db'] && $passed['files']) { diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index b7c8e69741..7340f35cb6 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -1064,7 +1064,6 @@ $lang = array_merge($lang, array( 'WELCOME_INSTALL' => 'Welcome to phpBB 2 Installation', - 'INSTALL_ADVICE_EXPLAIN'=> 'Before proceeding with full installation phpBB will carry out some tests on your server and basic install. Please ensure you read through the results thoroughly and do not proceed until all tests are passed.', 'INSTALL_REQUIRED' => 'Required', 'INSTALL_OPTIONAL' => 'Optional', 'UNAVAILABLE' => 'Unavailable', @@ -1072,6 +1071,8 @@ $lang = array_merge($lang, array( 'TESTS_PASSED' => 'Tests passed', 'TESTS_FAILED' => 'Tests failed', + 'INSTALL_ADVICE' => 'Installation Compatibility', + 'INSTALL_ADVICE_EXPLAIN'=> 'Before proceeding with full installation phpBB will carry out some tests on your server and basic install. Please ensure you read through the results thoroughly and do not proceed until all tests are passed.', 'PHP_AND_APPS' => 'PHP and Applications', 'INSTALL_REQUIRED_PHP' => 'You must be running at least PHP 4.1.0 with support for at least one compatible database. If no support modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice.', 'INSTALL_OPTIONAL_PHP' => 'These modules or applications are optional, you do not need these to use phpBB 2.2. However if you do have them they will will enable greater functionality.', @@ -1107,9 +1108,9 @@ $lang = array_merge($lang, array( 'ADMIN_CONFIG' => 'Admin Configuration', 'DEFAULT_LANG' => 'Default board language', 'ADMIN_USERNAME' => 'Administrator Username', - 'ADMIN_EMAIL_CONFIRM' => 'Admin Email Address [ Confirm ]', + 'ADMIN_EMAIL_CONFIRM' => 'Confirm Admin Email Address', 'ADMIN_PASSWORD' => 'Administrator Password', - 'ADMIN_PASSWORD_CONFIRM'=> 'Administrator Password [ Confirm ]', + 'ADMIN_PASSWORD_CONFIRM'=> 'Confirm Administrator Password', 'DB_CONFIG' => 'Database Configuration', 'DBMS' => 'Database Type', 'DB_HOST' => 'Database Server Hostname or DSN', |