From 0d824354c94d69b08345cdf8bf322aa07b4958c3 Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 11 Aug 2008 12:52:17 +0000 Subject: Refs #210 & #211 : Some more core settings / admin pages moved to use admin_gatekeeper. Install script action now also refuses to be run if the site has already been installed. git-svn-id: https://code.elgg.org/elgg/trunk@1824 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/settings/system.php | 84 +++++++++++++------------------------ views/default/usersettings/form.php | 22 ++++------ 2 files changed, 36 insertions(+), 70 deletions(-) (limited to 'views') diff --git a/views/default/settings/system.php b/views/default/settings/system.php index 13e730029..857c64d03 100644 --- a/views/default/settings/system.php +++ b/views/default/settings/system.php @@ -19,59 +19,33 @@ $action = $vars['url'] . "action/systemsettings/save"; } else { $action = $vars['action']; - } - -?> - -
- - -

-
- $field, 'value' => $vars['config']->$field)); - ?> -

- - -

- - 'language', 'value' => $vars['config']->language, 'options_values' => $languages)); - ?> -

- -

-
- array(elgg_echo('debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('debug:label') : "") )); - ?> -

- -

-
- ping_home)) - $on = ($vars['config']->ping_home!='disabled' ? elgg_echo('usage:label') : ""); - echo elgg_view("input/checkboxes", array('options' => array(elgg_echo('usage:label')), 'internalname' => 'usage', 'value' => $on )); - ?> -

+ } + + $form_body = ""; + foreach(array('sitename','sitedescription', 'wwwroot','path','dataroot', 'view') as $field) { + $form_body .= "

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

"; + } + + $languages = get_installed_translations(); + $form_body .= "

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

"; + + $form_body .= "

" . elgg_echo('debug') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('debug:label') : "") )) . "

"; + + $form_body .= "

" . elgg_echo('usage') . "
"; + $on = elgg_echo('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 )); + $form_body .= "

"; + + $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go')); + + $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); + + echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); -

- - " /> -

- -
+?> \ No newline at end of file diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php index e245a0da1..509146162 100644 --- a/views/default/usersettings/form.php +++ b/views/default/usersettings/form.php @@ -1,15 +1,7 @@ -
- -
- -
- -

- -

- -
\ No newline at end of file +" . elgg_view("usersettings/user") . ""; + $form_body .= "

" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "

"; + + echo elgg_view('input/form', array('action' => "{$vars['url']}action/usersettings/save", 'body' => $form_body)); +?> \ No newline at end of file -- cgit v1.2.3