Refs #2032 core forms use divs

git-svn-id: http://code.elgg.org/elgg/trunk@8164 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 28 insertions, 28 deletions

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 .= "<p>";
+	$form_body .= "<div>";
 	$form_body .= elgg_echo('installation:' . $field) . "<br />";
 	$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 .= "</p>";
+	$form_body .= "</div>";
 }
 
-$form_body .= "<p>" . elgg_echo('admin:site:access:warning') . "<br />";
+$form_body .= "<div>" . elgg_echo('admin:site:access:warning') . "<br />";
 $form_body .= elgg_echo('installation:sitepermissions');
 $form_body .= elgg_view('input/access', array(
 	'internalname' => 'default_access',
 	'value' => elgg_get_config('default_access'),
-)) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:allow_user_default_access:description') . "<br />";
+)) . "</div>";
+$form_body .= "<div>" . elgg_echo('installation:allow_user_default_access:description') . "<br />";
 $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') : ""),
-)) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:simplecache:description') . "<br />";
+)) . "</div>";
+$form_body .= "<div>" . elgg_echo('installation:simplecache:description') . "<br />";
 $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') : ""),
-)) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:viewpathcache:description') . "<br />";
+)) . "</div>";
+$form_body .= "<div>" . elgg_echo('installation:viewpathcache:description') . "<br />";
 $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') : ""),
-)) . "</p>";
+)) . "</div>";
 
 $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 .= "<p>" . elgg_echo('installation:debug');
+$form_body .= "<div>" . elgg_echo('installation:debug');
 $form_body .= elgg_view('input/dropdown', array(
 	'options_values' => $debug_options,
 	'internalname' => 'debug',
 	'value' => elgg_get_config('debug'),
 ));
-$form_body .= '</p>';
+$form_body .= '</div>';
 
 // 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 .= '<p>' . elgg_echo('installation:registration:description');
-$form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</p>';
+$form_body .= '<div>' . elgg_echo('installation:registration:description');
+$form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</div>';
 
 // 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 .= '<p>' . elgg_echo('installation:walled_garden:description');
-$form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</p>';
+$form_body .= '<div>' . elgg_echo('installation:walled_garden:description');
+$form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</div>';
 
-$form_body .= "<p>" . elgg_echo('installation:httpslogin') . "<br />";
+$form_body .= "<div>" . elgg_echo('installation:httpslogin') . "<br />";
 $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') : "")
-)) . "</p>";
+)) . "</div>";
 
-$form_body .= "<p>" . elgg_echo('installation:disableapi') . "<br />";
+$form_body .= "<div>" . elgg_echo('installation:disableapi') . "<br />";
 $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 .= "</p>";
+$form_body .= "</div>";
 
 $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
 
-$form_body .= '<p class="bta">';
+$form_body .= '<div class="bta">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body .= '</p>';
+$form_body .= '</div>';
 $form_body = "<div class='admin_settings site_admin'>" . $form_body . "</div>";
 
 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 .= "<p>";
+	$form_body .= "<div>";
 	$form_body .= elgg_echo('installation:' . $field) . "<br />";
 	$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 .= "</p>";
+	$form_body .= "</div>";
 }
 
 $languages = get_installed_translations();
-$form_body .= "<p>" . elgg_echo('installation:language');
+$form_body .= "<div>" . elgg_echo('installation:language');
 $form_body .= elgg_view("input/dropdown", array(
 	'internalname' => 'language',
 	'value' => elgg_get_config('language'),
 	'options_values' => $languages,
-)) . "</p>";
+)) . "</div>";
 
-$form_body .= '<p class="bta">';
+$form_body .= '<div class="bta">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body .= '</p>';
+$form_body .= '</div>';
 $form_body = "<div class='admin_settings site_admin'>".$form_body."</div>";
 
 echo $form_body;
\ No newline at end of file