From c10f7d3cf0aa68d2325199ba787702e125907c11 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 12 Feb 2011 16:58:10 +0000 Subject: Refs #2032 core forms use divs git-svn-id: http://code.elgg.org/elgg/trunk@8164 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css/admin.php | 6 +++ views/default/forms/admin/site/update_advanced.php | 44 +++++++++++----------- views/default/forms/admin/site/update_basic.php | 12 +++--- views/default/forms/avatar/crop.php | 4 +- views/default/forms/avatar/upload.php | 4 +- views/default/forms/comments/add.php | 4 +- views/default/forms/friends/edit.php | 16 ++++---- views/default/forms/login.php | 4 +- views/default/forms/plugins/settings/save.php | 4 +- views/default/forms/profile/edit.php | 12 +++--- views/default/forms/register.php | 20 +++++----- views/default/forms/user/requestnewpassword.php | 12 +++--- views/default/forms/useradd.php | 16 ++++---- views/default/forms/usersettings/save.php | 4 +- views/default/forms/widgets/save.php | 4 +- views/default/group/default.php | 1 - 16 files changed, 86 insertions(+), 81 deletions(-) (limited to 'views/default') diff --git a/views/default/css/admin.php b/views/default/css/admin.php index e30cb4d7a..9aac987d3 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -382,6 +382,12 @@ label { color:#333333; font-size: 110%; } +fieldset > div { + margin-bottom: 15px; +} +fieldset > div:last-child { + margin-bottom: 0; +} input { font: 120% Arial, Helvetica, sans-serif; padding: 5px; diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php index 3085921d9..2e8021938 100644 --- a/views/default/forms/admin/site/update_advanced.php +++ b/views/default/forms/admin/site/update_advanced.php @@ -5,7 +5,7 @@ $form_body = ""; foreach (array('wwwroot', 'path', 'dataroot', 'view') as $field) { - $form_body .= "

"; + $form_body .= "

"; $form_body .= elgg_echo('installation:' . $field) . "
"; $warning = elgg_echo('installation:warning:' . $field); if ($warning != 'installation:warning:' . $field) { @@ -13,42 +13,42 @@ foreach (array('wwwroot', 'path', 'dataroot', 'view') as $field) { } $value = elgg_get_config($field); $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); - $form_body .= "

"; + $form_body .= "
"; } -$form_body .= "

" . elgg_echo('admin:site:access:warning') . "
"; +$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_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_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_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_echo('installation:debug'); $form_body .= elgg_view('input/dropdown', array( 'options_values' => $debug_options, 'internalname' => 'debug', 'value' => elgg_get_config('debug'), )); -$form_body .= '

'; +$form_body .= '
'; // control new user registration $options = array( @@ -56,8 +56,8 @@ $options = array( '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) . '

'; +$form_body .= '
' . elgg_echo('installation:registration:description'); +$form_body .= '
' .elgg_view('input/checkboxes', $options) . '
'; // control walled garden $walled_garden = elgg_get_config(walled_garden); @@ -66,17 +66,17 @@ $options = array( '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:walled_garden:description'); +$form_body .= '
' . elgg_view('input/checkboxes', $options) . '
'; -$form_body .= "

" . elgg_echo('installation:httpslogin') . "
"; +$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') . "
"; +$form_body .= "

" . elgg_echo('installation:disableapi') . "
"; $on = elgg_echo('installation:disableapi:label'); $disable_api = elgg_get_config('disable_api'); if ($disable_api) { @@ -87,13 +87,13 @@ $form_body .= elgg_view("input/checkboxes", array( 'internalname' => 'api', 'value' => $on, )); -$form_body .= "

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

'; +$form_body .= '

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

'; +$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 index f8cefaa7c..30d3b6173 100644 --- a/views/default/forms/admin/site/update_basic.php +++ b/views/default/forms/admin/site/update_basic.php @@ -5,7 +5,7 @@ $form_body = ""; foreach (array('sitename','sitedescription', 'siteemail') as $field) { - $form_body .= "

"; + $form_body .= "

"; $form_body .= elgg_echo('installation:' . $field) . "
"; $warning = elgg_echo('installation:warning:' . $field); if ($warning != 'installation:warning:' . $field) { @@ -13,20 +13,20 @@ foreach (array('sitename','sitedescription', 'siteemail') as $field) { } $value = elgg_get_config($field); $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); - $form_body .= "

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

" . elgg_echo('installation:language'); +$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 .= '

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

'; +$form_body .= '
'; $form_body = "
".$form_body."
"; echo $form_body; \ No newline at end of file diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php index cceb42e44..01ceb3fec 100644 --- a/views/default/forms/avatar/crop.php +++ b/views/default/forms/avatar/crop.php @@ -8,9 +8,9 @@ $master_image = $vars['entity']->getIcon('master'); ?> -

+

<?php echo elgg_echo('avatar'); ?> -

+
'guid', 'value' => $vars['entity']->guid)); ?> -

+


'avatar')); ?>
elgg_echo('upload'))); ?> -

+
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php index 238777422..b4f63b814 100644 --- a/views/default/forms/comments/add.php +++ b/views/default/forms/comments/add.php @@ -9,10 +9,10 @@ if (isset($vars['entity']) && elgg_is_logged_in()) { ?> -

+

'generic_comment')); ?> -

+

"; + )) . "
"; -$form_body .= "

"; +$form_body .= "

"; if($vars['collection_members']){ $form_body .= elgg_echo("friends:collectionfriends") . "
"; @@ -40,16 +40,16 @@ if($vars['collection_members']){ } } -$form_body .= "

"; +$form_body .= "
"; -$form_body .= "

". - elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "

"; +$form_body .= "
". + elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "
"; -$form_body .= "

"; +$form_body .= "

"; if (isset($vars['collection'])) { $form_body .= elgg_view('input/hidden', array('internalname' => 'collection_id', 'value' => "{$vars['collection'][0]->id}")); } $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); -$form_body .= "

"; +$form_body .= "
"; echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/$action")); \ No newline at end of file diff --git a/views/default/forms/login.php b/views/default/forms/login.php index 99d9cdd22..862b5ab9d 100644 --- a/views/default/forms/login.php +++ b/views/default/forms/login.php @@ -7,7 +7,7 @@ */ ?> -

+


'username', 'class' => 'login-textarea')); ?>
@@ -32,4 +32,4 @@ -

\ No newline at end of file +
\ No newline at end of file diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php index 68c6b1f52..8cd05471f 100644 --- a/views/default/forms/plugins/settings/save.php +++ b/views/default/forms/plugins/settings/save.php @@ -19,8 +19,8 @@ if ($type != 'user') { echo elgg_view("{$type}settings/$plugin_id/edit", $vars); -echo "

"; +echo "

"; echo elgg_view('input/hidden', array('internalname' => 'plugin_id', 'value' => $plugin_id)); echo elgg_view('input/hidden', array('internalname' => 'user_guid', 'value' => $user_guid)); echo elgg_view('input/submit', array('value' => elgg_echo('save'))); -echo "

"; +echo "
"; diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php index 108e7f9f2..4de6c47fe 100644 --- a/views/default/forms/profile/edit.php +++ b/views/default/forms/profile/edit.php @@ -7,10 +7,10 @@ ?> -

+

'name', 'value' => $vars['entity']->name)); ?> -

+
0) { } ?> -

+

0) { ); echo elgg_view('input/access', $params); ?> -

+
-

+

'guid', 'value' => $vars['entity']->guid)); echo elgg_view('input/submit', array('value' => elgg_echo('save'))); ?> -

+
diff --git a/views/default/forms/register.php b/views/default/forms/register.php index c2a23ad8c..a7f34f777 100644 --- a/views/default/forms/register.php +++ b/views/default/forms/register.php @@ -16,31 +16,31 @@ if (elgg_is_admin_logged_in() && isset($vars['show_admin'])) { } ?> -

+


'name', 'value' => $name)); ?> -

-

+

+

'email', 'value' => $email)); ?> -

-

+

+

'username', 'value' => $username)); ?> -

-

+

+

'password')); ?> -

-

+

+

'password2')); ?> -

+
-

+

-

-

+

+
'username')); ?> -

+
-

+

elgg_echo('request'))); ?> -

+