Installation clarity fixes

git-svn-id: https://code.elgg.org/elgg/trunk@2023 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 29 insertions, 21 deletions

diff --git a/languages/en.php b/languages/en.php
index be1963046..d6d9adda5 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -605,7 +605,7 @@ Alternatively, you can enter your database settings below and we will try and do
 			'installation:configuration:success' => "Your initial configuration settings have been saved. Now register your initial user; this will be your first system administrator.",

 	

 			'installation:settings' => "System settings",

-			'installation:settings:description' => "Now that the Elgg database has been successfully installed, you need to enter a couple of pieces of information to get your site fully up and running. We've tried to guess where we could, but you may find that you need to tweak these details.",

+			'installation:settings:description' => "Now that the Elgg database has been successfully installed, you need to enter a couple of pieces of information to get your site fully up and running. We've tried to guess where we could, but <b>you should check these details.</b>",

 	

 			'installation:settings:dbwizard:prompt' => "Enter your database settings below and hit save:",

 			'installation:settings:dbwizard:label:user' => "Database user",

@@ -616,17 +616,18 @@ Alternatively, you can enter your database settings below and we will try and do
 	

 			'installation:settings:dbwizard:savefail' => "We were unable to save the new settings.php. Please save the following file as engine/settings.php using a text editor.",

 	

-			'sitename' => "The name of your site (eg \"My social networking site\"):",

-			'sitedescription' => "Short description of your site (optional)",

-			'wwwroot' => "The site URL, followed by a trailing slash:",

-			'path' => "The full path to your site root on your disk, followed by a trailing slash:",

-			'dataroot' => "The full path to the directory where uploaded files will be stored, followed by a trailing slash:",

-			'language' => "The default language for your site:",

-			'debug' => "Debug mode provides extra information which can be used to diagnose faults, however it can slow your system down so should only be used if you are having problems:",

-			'debug:label' => "Turn on debug mode",

-			'usage' => "This option lets Elgg send anonymous usage statistics back to Curverider.",

-			'usage:label' => "Send anonymous usage statistics",

-			'view' => "Enter the view which will be used as the default for your site (e.g. 'mobile') or leave this blank for the default view:",

+			'installation:sitename' => "The name of your site (eg \"My social networking site\"):",

+			'installation:sitedescription' => "Short description of your site (optional)",

+			'installation:wwwroot' => "The site URL, followed by a trailing slash:",

+			'installation:path' => "The full path to your site root on your disk, followed by a trailing slash:",

+			'installation:dataroot' => "The full path to the directory where uploaded files will be stored, followed by a trailing slash:",

+			'installation:dataroot:warning' => "You must create this directory manually. If possible, it should not sit within your site URL.",

+			'installation:language' => "The default language for your site:",

+			'installation:debug' => "Debug mode provides extra information which can be used to diagnose faults, however it can slow your system down so should only be used if you are having problems:",

+			'installation:debug:label' => "Turn on debug mode",

+			'installation:usage' => "This option lets Elgg send anonymous usage statistics back to Curverider.",

+			'installation:usage:label' => "Send anonymous usage statistics",

+			'installation:view' => "Enter the view which will be used as the default for your site or leave this blank for the default view (if in doubt, leave as default):",

 	

 		/**

 		 * Welcome

diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index 55a515700..21724a8a4 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -25,7 +25,10 @@
 		foreach(array('sitename','sitedescription', 'wwwroot','path','dataroot', 'view') as $field) {

 			$form_body .= "<p>";

 			$form_body .= elgg_echo($field) . "<br />";

-			$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $vars['config']->$field));

+			$warning = elgg_echo('installation:warning:' . $field);

+			if ($warning != 'installation:warning:' . $field) echo "<b>" . $warning . "</b><br />";

+			$value = $vars['config']->$field;

+			$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));

 			$form_body .= "</p>";

 		}

 		

diff --git a/views/failsafe/settings/system.php b/views/failsafe/settings/system.php
index 55a515700..6e7c68999 100644
--- a/views/failsafe/settings/system.php
+++ b/views/failsafe/settings/system.php
@@ -24,22 +24,26 @@
 		$form_body = "";

 		foreach(array('sitename','sitedescription', 'wwwroot','path','dataroot', 'view') as $field) {

 			$form_body .= "<p>";

-			$form_body .= elgg_echo($field) . "<br />";

-			$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $vars['config']->$field));

+			$form_body .= elgg_echo('installation:' . $field) . "<br />";

+			$warning = elgg_echo('installation:warning:' . $field);

+			if ($warning != 'installation:warning:' . $field) echo "<b>" . $warning . "</b><br />";

+			$value = $vars['config']->$field;

+			if ($field == 'view') $value = 'default';

+			$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));

 			$form_body .= "</p>";

 		}

 		

 		$languages = get_installed_translations();

-		$form_body .= "<p>" . elgg_echo('language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";

+		$form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";

 		

-		$form_body .= "<p class=\"admin_debug\">" . elgg_echo('debug') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('debug:label') : "") )) . "</p>";

+		$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:debug') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "</p>";

 		

-		$form_body .= "<p class=\"admin_usage\">" . elgg_echo('usage') . "<br />";

-		$on = elgg_echo('usage:label');

+		$form_body .= "<p class=\"admin_usage\">" . elgg_echo('installation:usage') . "<br />";

+		$on = elgg_echo('installation:usage:label');

 

 		if (isset($CONFIG->ping_home))

-			$on = ($vars['config']->ping_home!='disabled' ? elgg_echo('usage:label') : "");

-		$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('usage:label')), 'internalname' => 'usage', 'value' => $on )); 

+			$on = ($vars['config']->ping_home!='disabled' ? elgg_echo('installation:usage:label') : "");

+		$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:usage:label')), 'internalname' => 'usage', 'value' => $on )); 

 		$form_body .= "</p>";

 		

 		$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));