From fbc1fdd0b7244d2f03164b62eb893223ff930319 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sat, 12 Feb 2011 01:07:33 +0000 Subject: Converted most forms to use elgg_view_form (therefore also moved the views to forms/*). Some views are left that _only_ do elgg_view_form, so I wonder if those should even be kept around. git-svn-id: http://code.elgg.org/elgg/trunk@8127 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/admin/site/advanced.php | 98 +-------------------- views/default/admin/site/basic.php | 31 +------ views/default/core/account/login_box.php | 4 +- views/default/core/account/login_dropdown.php | 6 ++ views/default/core/account/login_walled_garden.php | 2 + views/default/core/river/footer.php | 11 +-- views/default/core/settings/account.php | 7 +- views/default/forms/admin/site/update_advanced.php | 99 ++++++++++++++++++++++ views/default/forms/admin/site/update_basic.php | 32 +++++++ views/default/forms/friends/edit.php | 2 + views/default/forms/user/passwordreset.php | 19 +++++ views/default/forms/useradd.php | 2 + views/default/forms/usersettings/save.php | 8 ++ views/default/forms/widgets/save.php | 39 +++++++++ views/default/layout/objects/widget/settings.php | 47 ++-------- views/installation/install/forms/admin.php | 2 + views/installation/install/forms/database.php | 2 + views/installation/install/forms/settings.php | 2 + 18 files changed, 228 insertions(+), 185 deletions(-) create mode 100644 views/default/forms/admin/site/update_advanced.php create mode 100644 views/default/forms/admin/site/update_basic.php create mode 100644 views/default/forms/user/passwordreset.php create mode 100644 views/default/forms/usersettings/save.php create mode 100644 views/default/forms/widgets/save.php (limited to 'views') diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php index 202f8686c..12e4303e7 100644 --- a/views/default/admin/site/advanced.php +++ b/views/default/admin/site/advanced.php @@ -6,100 +6,4 @@ * @subpackage Core */ -$action = elgg_get_site_url() . "action/admin/site/update_advanced"; - -$form_body = ""; - -foreach (array('wwwroot', 'path', 'dataroot', 'view') as $field) { - $form_body .= "

"; - $form_body .= elgg_echo('installation:' . $field) . "
"; - $warning = elgg_echo('installation:warning:' . $field); - if ($warning != 'installation:warning:' . $field) { - echo "" . $warning . "
"; - } - $value = elgg_get_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'); -$form_body .= elgg_view('input/access', array( - 'internalname' => 'default_access', - 'value' => elgg_get_config('default_access'), -)) . "

"; -$form_body .= "

" . elgg_echo('installation:allow_user_default_access:description') . "
"; -$form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:allow_user_default_access:label')), - 'internalname' => 'allow_user_default_access', - 'value' => (elgg_get_config('allow_user_default_access') ? elgg_echo('installation:allow_user_default_access:label') : ""), -)) . "

"; -$form_body .= "

" . elgg_echo('installation:simplecache:description') . "
"; -$form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:simplecache:label')), - 'internalname' => 'simplecache_enabled', - 'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""), -)) . "

"; -$form_body .= "

" . elgg_echo('installation:viewpathcache:description') . "
"; -$form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:viewpathcache:label')), - 'internalname' => 'viewpath_cache_enabled', - 'value' => (elgg_get_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/dropdown', array( - 'options_values' => $debug_options, - 'internalname' => 'debug', - 'value' => elgg_get_config('debug'), -)); -$form_body .= '

'; - -// control new user registration -$options = array( - 'options' => array(elgg_echo('installation:registration:label')), - 'internalname' => 'allow_registration', - 'value' => elgg_get_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 -$walled_garden = elgg_get_config(walled_garden); -$options = array( - 'options' => array(elgg_echo('installation:walled_garden:label')), - 'internalname' => 'walled_garden', - 'value' => $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') . "
"; -$form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:httpslogin:label')), - 'internalname' => 'https_login', - 'value' => (elgg_get_config('https_login') ? elgg_echo('installation:httpslogin:label') : "") -)) . "

"; - -$form_body .= "

" . elgg_echo('installation:disableapi') . "
"; -$on = elgg_echo('installation:disableapi:label'); -$disable_api = elgg_get_config('disable_api'); -if ($disable_api) { - $on = (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 .= '

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

'; -$form_body = "
" . $form_body . "
"; - -echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); +echo elgg_view_form('admin/site/update_advanced'); diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php index 628088392..3b8f4f183 100644 --- a/views/default/admin/site/basic.php +++ b/views/default/admin/site/basic.php @@ -6,33 +6,4 @@ * @subpackage Core */ -$action = elgg_get_site_url() . "action/admin/site/update_basic"; - -$form_body = ""; - -foreach (array('sitename','sitedescription', 'siteemail') as $field) { - $form_body .= "

"; - $form_body .= elgg_echo('installation:' . $field) . "
"; - $warning = elgg_echo('installation:warning:' . $field); - if ($warning != 'installation:warning:' . $field) { - echo "" . $warning . "
"; - } - $value = elgg_get_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'); -$form_body .= elgg_view("input/dropdown", array( - 'internalname' => 'language', - 'value' => elgg_get_config('language'), - 'options_values' => $languages, -)) . "

"; - -$form_body .= '

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

'; -$form_body = "
".$form_body."
"; - -echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); +echo elgg_view_form('admin/site/update_basic'); diff --git a/views/default/core/account/login_box.php b/views/default/core/account/login_box.php index 89612ef1b..c2d19f904 100644 --- a/views/default/core/account/login_box.php +++ b/views/default/core/account/login_box.php @@ -6,8 +6,6 @@ * @subpackage Core */ -$form_body = elgg_view('forms/login'); - $login_url = elgg_get_site_url(); if (elgg_get_config('https_login')) { $login_url = str_replace("http:", "https:", $login_url); @@ -17,7 +15,7 @@ if (elgg_get_config('https_login')) {

$form_body, 'action' => "{$login_url}action/login")); + echo elgg_view_form('login', array('action' => "{$login_url}action/login")); ?>
diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php index aa67c6756..a3fdab7ca 100644 --- a/views/default/core/account/login_dropdown.php +++ b/views/default/core/account/login_dropdown.php @@ -2,12 +2,18 @@ /** * Elgg drop-down login form * + * @todo Forms 1.8: Convert to use elgg_view_form() */ if (elgg_is_logged_in()) { return true; } +/** + * @todo forms/login should take a "forward_to" argument, or something similar + * Enter description here ... + * @var unknown_type + */ $form_body = elgg_view('forms/login'); $form_body .= ""; diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php index 0caaa3101..7b298a8c5 100644 --- a/views/default/core/account/login_walled_garden.php +++ b/views/default/core/account/login_walled_garden.php @@ -13,6 +13,7 @@ if (elgg_get_config('https_login')) { ?>

$form_body, 'action' => "{$login_url}action/login")); echo elgg_view('login/extend'); // view for plugins to extend ?> @@ -46,6 +47,7 @@ __HTML;

"action/user/requestnewpassword", 'body' => $lostpassword_form_body diff --git a/views/default/core/river/footer.php b/views/default/core/river/footer.php index de27f265f..1b0d14987 100644 --- a/views/default/core/river/footer.php +++ b/views/default/core/river/footer.php @@ -37,10 +37,7 @@ if ($comments) { } // inline comment form -$body = elgg_view('forms/comments/inline', array('entity' => $object)); -$params = array( - 'body' => $body, - 'action' => 'action/comments/add', - 'internalid' => "elgg-togglee-{$object->getGUID()}", -); -echo elgg_view('input/form', $params); +echo elgg_view_form('comments/inline', array( + 'action' => 'action/comments/add', + 'internalid' => "elgg-togglee-{$object->getGUID()}", +), array('entity' => $object)); diff --git a/views/default/core/settings/account.php b/views/default/core/settings/account.php index 9e16d4892..22a58c58a 100644 --- a/views/default/core/settings/account.php +++ b/views/default/core/settings/account.php @@ -6,9 +6,4 @@ * @subpackage Core */ -$form_body = elgg_view("forms/account/settings"); -$form_body .= '

'; -$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); -$form_body .= '

'; - -echo elgg_view('input/form', array('action' => "action/usersettings/save", 'body' => $form_body)); +echo elgg_view_form('usersettings/save'); \ No newline at end of file diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php new file mode 100644 index 000000000..3085921d9 --- /dev/null +++ b/views/default/forms/admin/site/update_advanced.php @@ -0,0 +1,99 @@ +"; + $form_body .= elgg_echo('installation:' . $field) . "
"; + $warning = elgg_echo('installation:warning:' . $field); + if ($warning != 'installation:warning:' . $field) { + echo "" . $warning . "
"; + } + $value = elgg_get_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'); +$form_body .= elgg_view('input/access', array( + 'internalname' => 'default_access', + 'value' => elgg_get_config('default_access'), +)) . "

"; +$form_body .= "

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

"; +$form_body .= "

" . elgg_echo('installation:simplecache:description') . "
"; +$form_body .= elgg_view("input/checkboxes", array( + 'options' => array(elgg_echo('installation:simplecache:label')), + 'internalname' => 'simplecache_enabled', + 'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""), +)) . "

"; +$form_body .= "

" . elgg_echo('installation:viewpathcache:description') . "
"; +$form_body .= elgg_view("input/checkboxes", array( + 'options' => array(elgg_echo('installation:viewpathcache:label')), + 'internalname' => 'viewpath_cache_enabled', + 'value' => (elgg_get_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/dropdown', array( + 'options_values' => $debug_options, + 'internalname' => 'debug', + 'value' => elgg_get_config('debug'), +)); +$form_body .= '

'; + +// control new user registration +$options = array( + 'options' => array(elgg_echo('installation:registration:label')), + 'internalname' => 'allow_registration', + 'value' => elgg_get_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 +$walled_garden = elgg_get_config(walled_garden); +$options = array( + 'options' => array(elgg_echo('installation:walled_garden:label')), + 'internalname' => 'walled_garden', + 'value' => $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') . "
"; +$form_body .= elgg_view("input/checkboxes", array( + 'options' => array(elgg_echo('installation:httpslogin:label')), + 'internalname' => 'https_login', + 'value' => (elgg_get_config('https_login') ? elgg_echo('installation:httpslogin:label') : "") +)) . "

"; + +$form_body .= "

" . elgg_echo('installation:disableapi') . "
"; +$on = elgg_echo('installation:disableapi:label'); +$disable_api = elgg_get_config('disable_api'); +if ($disable_api) { + $on = (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 .= '

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

'; +$form_body = "
" . $form_body . "
"; + +echo $form_body; \ No newline at end of file diff --git a/views/default/forms/admin/site/update_basic.php b/views/default/forms/admin/site/update_basic.php new file mode 100644 index 000000000..f8cefaa7c --- /dev/null +++ b/views/default/forms/admin/site/update_basic.php @@ -0,0 +1,32 @@ +"; + $form_body .= elgg_echo('installation:' . $field) . "
"; + $warning = elgg_echo('installation:warning:' . $field); + if ($warning != 'installation:warning:' . $field) { + echo "" . $warning . "
"; + } + $value = elgg_get_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'); +$form_body .= elgg_view("input/dropdown", array( + 'internalname' => 'language', + 'value' => elgg_get_config('language'), + 'options_values' => $languages, +)) . "

"; + +$form_body .= '

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

'; +$form_body = "
".$form_body."
"; + +echo $form_body; \ No newline at end of file diff --git a/views/default/forms/friends/edit.php b/views/default/forms/friends/edit.php index 16bb32fd9..3258dae9d 100644 --- a/views/default/forms/friends/edit.php +++ b/views/default/forms/friends/edit.php @@ -6,6 +6,8 @@ * @subpackage Core * * @uses $vars['object'] Optionally, the collection edit + * + * @todo FIXME Forms 1.8: views in the forms/ directory should not output the
wrapper itself */ // var_export($vars['collection'][0]->id); diff --git a/views/default/forms/user/passwordreset.php b/views/default/forms/user/passwordreset.php new file mode 100644 index 000000000..d553bdc14 --- /dev/null +++ b/views/default/forms/user/passwordreset.php @@ -0,0 +1,19 @@ +"; + +echo elgg_view('input/hidden', array( + 'internalname' => 'u', + 'value' => $user->guid +)); + +echo elgg_view('input/hidden', array( + 'internalname' => 'c', + 'value' => $code +)); + +echo elgg_view('input/submit', array( + 'value' => elgg_echo('resetpassword') +)); \ No newline at end of file diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php index ae0049267..9032da73e 100644 --- a/views/default/forms/useradd.php +++ b/views/default/forms/useradd.php @@ -4,6 +4,8 @@ * * @package Elgg * @subpackage Core + * + * @todo FIXME Forms 1.8: views in the forms/ directory should not be generating the wrapper itself */ $admin_option = false; diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php new file mode 100644 index 000000000..f8136f226 --- /dev/null +++ b/views/default/forms/usersettings/save.php @@ -0,0 +1,8 @@ +'; +$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); +$form_body .= '

'; + +echo $form_body; \ No newline at end of file diff --git a/views/default/forms/widgets/save.php b/views/default/forms/widgets/save.php new file mode 100644 index 000000000..291f713c6 --- /dev/null +++ b/views/default/forms/widgets/save.php @@ -0,0 +1,39 @@ +handler/edit"; +$custom_form_section = elgg_view($edit_view, array('entity' => $widget)); + +$access = ''; +if ($show_access) { + $access = elgg_view('input/access', array( + 'internalname' => 'params[access_id]', + 'value' => $widget->access_id, + )); +} + +if (!$custom_form_section && !$access) { + return true; +} + +$hidden = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $widget->guid)); +$submit = elgg_view('input/submit', array('value' => elgg_echo('save'))); + +$body = <<<___END + $custom_form_section + $access +

+ $hidden + $submit +

+___END; + +echo $body; \ No newline at end of file diff --git a/views/default/layout/objects/widget/settings.php b/views/default/layout/objects/widget/settings.php index c53ea8fc6..3e97d3dd5 100644 --- a/views/default/layout/objects/widget/settings.php +++ b/views/default/layout/objects/widget/settings.php @@ -1,48 +1,11 @@ -handler/edit"; -$custom_form_section = elgg_view($edit_view, array('entity' => $widget)); - -$access = ''; -if ($show_access) { - $access = elgg_view('input/access', array( - 'internalname' => 'params[access_id]', - 'value' => $widget->access_id, - )); -} - -if (!$custom_form_section && !$access) { - return true; -} - -$hidden = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $widget->guid)); -$submit = elgg_view('input/submit', array('value' => elgg_echo('save'))); - -$body = <<<___END - $custom_form_section - $access -

- $hidden - $submit -

-___END; - ?>
- $body, - 'action' => "action/widgets/save" -); -echo elgg_view('input/form', $params); -?> + + +
diff --git a/views/installation/install/forms/admin.php b/views/installation/install/forms/admin.php index 1ecb389a3..d860096cf 100644 --- a/views/installation/install/forms/admin.php +++ b/views/installation/install/forms/admin.php @@ -3,6 +3,8 @@ * Admin account form * * @uses $vars['variables'] Array of form variables. See ElggInstaller. + * + * @todo Forms 1.8: Convert to use elgg_view_form */ $vars['type'] = 'admin'; diff --git a/views/installation/install/forms/database.php b/views/installation/install/forms/database.php index 0e798db09..02e3816ee 100644 --- a/views/installation/install/forms/database.php +++ b/views/installation/install/forms/database.php @@ -3,6 +3,8 @@ * Database form * * @uses $vars['variables'] Array of form variables. See ElggInstaller. + * + * @todo Forms 1.8: Convert to use elgg_view_form */ $vars['type'] = 'database'; diff --git a/views/installation/install/forms/settings.php b/views/installation/install/forms/settings.php index e9a818b92..3aa90c10b 100644 --- a/views/installation/install/forms/settings.php +++ b/views/installation/install/forms/settings.php @@ -3,6 +3,8 @@ * Site settings form * * @uses $vars['variables'] Array of form variables. See ElggInstaller. + * + * @todo Forms 1.8: Convert to use elgg_view_form */ $vars['type'] = 'settings'; -- cgit v1.2.3