diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/settings/system.php | 5 | ||||
| -rw-r--r-- | views/failsafe/settings/system.php | 20 |
2 files changed, 16 insertions, 9 deletions
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'));
|