From 1b3512f61edbde3c3d071df064d58efd49911b2d Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 30 Dec 2010 00:05:02 +0000 Subject: fixed a few issues with the admin backend - need to look into better ways to structure admin sub views git-svn-id: http://code.elgg.org/elgg/trunk@7764 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/admin/site/advanced.php | 67 ------------------------------ views/default/admin/site/basic.php | 29 ------------- views/default/admin/site/site_advanced.php | 67 ++++++++++++++++++++++++++++++ views/default/admin/site/site_basic.php | 29 +++++++++++++ 4 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 views/default/admin/site/advanced.php delete mode 100644 views/default/admin/site/basic.php create mode 100644 views/default/admin/site/site_advanced.php create mode 100644 views/default/admin/site/site_basic.php (limited to 'views/default/admin/site') diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php deleted file mode 100644 index 048ffa883..000000000 --- a/views/default/admin/site/advanced.php +++ /dev/null @@ -1,67 +0,0 @@ -"; - $form_body .= elgg_echo('installation:' . $field) . "
"; - $warning = elgg_echo('installation:warning:' . $field); - if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
"; - $value = $vars['config']->$field; - $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); - $form_body .= "

"; -} - -$form_body .= "

" . elgg_echo('admin:site:access:warning') . "
"; -$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "

"; -$form_body .= "

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

"; -$form_body .= "

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

"; -$form_body .= "

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

"; - -$debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice')); -$form_body .= "

" . elgg_echo('installation:debug'); -$form_body .= elgg_view('input/pulldown', array('options_values' => $debug_options, 'internalname' => 'debug', 'value' => $vars['config']->debug)); -$form_body .= '

'; - -// control new user registration -$options = array( - 'options' => array(elgg_echo('installation:registration:label')), - 'internalname' => 'allow_registration', - 'value' => $vars['config']->allow_registration ? elgg_echo('installation:registration:label') : '', -); -$form_body .= '

' . elgg_echo('installation:registration:description'); -$form_body .= '
' .elgg_view('input/checkboxes', $options) . '

'; - -// control walled garden -$options = array( - 'options' => array(elgg_echo('installation:walled_garden:label')), - 'internalname' => 'walled_garden', - 'value' => $vars['config']->walled_garden ? elgg_echo('installation:walled_garden:label') : '', -); -$form_body .= '

' . elgg_echo('installation:walled_garden:description'); -$form_body .= '
' . elgg_view('input/checkboxes', $options) . '

'; - -$form_body .= "

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

"; - -$form_body .= "

" . elgg_echo('installation:disableapi') . "
"; -$on = elgg_echo('installation:disableapi:label'); -if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) { - $on = ($vars['config']->disable_api ? "" : elgg_echo('installation:disableapi:label')); -} -$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', '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"))); -$form_body = "
".$form_body."
"; -echo elgg_view_title(elgg_echo('admin:site:advanced') . " " . elgg_echo('admin:site')); -echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php deleted file mode 100644 index 9b8f4652d..000000000 --- a/views/default/admin/site/basic.php +++ /dev/null @@ -1,29 +0,0 @@ -"; - $form_body .= elgg_echo('installation:' . $field) . "
"; - $warning = elgg_echo('installation:warning:' . $field); - if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
"; - $value = $vars['config']->$field; - $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); - $form_body .= "

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

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

"; - -$form_body .= "
".elgg_view('input/submit', array('value' => elgg_echo("save"))); -$form_body = "
".$form_body."
"; -echo elgg_view_title(elgg_echo('admin:site')); -echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/admin/site/site_advanced.php b/views/default/admin/site/site_advanced.php new file mode 100644 index 000000000..048ffa883 --- /dev/null +++ b/views/default/admin/site/site_advanced.php @@ -0,0 +1,67 @@ +"; + $form_body .= elgg_echo('installation:' . $field) . "
"; + $warning = elgg_echo('installation:warning:' . $field); + if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
"; + $value = $vars['config']->$field; + $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); + $form_body .= "

"; +} + +$form_body .= "

" . elgg_echo('admin:site:access:warning') . "
"; +$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "

"; +$form_body .= "

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

"; +$form_body .= "

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

"; +$form_body .= "

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

"; + +$debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice')); +$form_body .= "

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

'; + +// control new user registration +$options = array( + 'options' => array(elgg_echo('installation:registration:label')), + 'internalname' => 'allow_registration', + 'value' => $vars['config']->allow_registration ? elgg_echo('installation:registration:label') : '', +); +$form_body .= '

' . elgg_echo('installation:registration:description'); +$form_body .= '
' .elgg_view('input/checkboxes', $options) . '

'; + +// control walled garden +$options = array( + 'options' => array(elgg_echo('installation:walled_garden:label')), + 'internalname' => 'walled_garden', + 'value' => $vars['config']->walled_garden ? elgg_echo('installation:walled_garden:label') : '', +); +$form_body .= '

' . elgg_echo('installation:walled_garden:description'); +$form_body .= '
' . elgg_view('input/checkboxes', $options) . '

'; + +$form_body .= "

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

"; + +$form_body .= "

" . elgg_echo('installation:disableapi') . "
"; +$on = elgg_echo('installation:disableapi:label'); +if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) { + $on = ($vars['config']->disable_api ? "" : elgg_echo('installation:disableapi:label')); +} +$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', '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"))); +$form_body = "
".$form_body."
"; +echo elgg_view_title(elgg_echo('admin:site:advanced') . " " . elgg_echo('admin:site')); +echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/admin/site/site_basic.php b/views/default/admin/site/site_basic.php new file mode 100644 index 000000000..9b8f4652d --- /dev/null +++ b/views/default/admin/site/site_basic.php @@ -0,0 +1,29 @@ +"; + $form_body .= elgg_echo('installation:' . $field) . "
"; + $warning = elgg_echo('installation:warning:' . $field); + if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
"; + $value = $vars['config']->$field; + $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); + $form_body .= "

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

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

"; + +$form_body .= "
".elgg_view('input/submit', array('value' => elgg_echo("save"))); +$form_body = "
".$form_body."
"; +echo elgg_view_title(elgg_echo('admin:site')); +echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); -- cgit v1.2.3