From d7f37fc752418661e0dadae8dfc40f07e7603740 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 12 Feb 2011 17:10:30 +0000
Subject: clean up the last few commits

git-svn-id: http://code.elgg.org/elgg/trunk@8165 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../views/default/settings/twitterservice/edit.php             | 10 ++++------
 views/default/core/account/login_walled_garden.php             |  8 ++++----
 views/default/forms/admin/site/update_advanced.php             |  1 -
 views/default/forms/admin/site/update_basic.php                |  1 -
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/mod/twitterservice/views/default/settings/twitterservice/edit.php b/mod/twitterservice/views/default/settings/twitterservice/edit.php
index 93de0d993..7e43762ce 100644
--- a/mod/twitterservice/views/default/settings/twitterservice/edit.php
+++ b/mod/twitterservice/views/default/settings/twitterservice/edit.php
@@ -29,12 +29,10 @@ $sign_on_with_twitter_view = elgg_view('input/dropdown', array(
 ));
 
 $settings = <<<__HTML
-<div id="twitterservice_site_settings">
-	<div>$insert_view</div>
-	<div>$consumer_key_string $consumer_key_view</div>
-	<div>$consumer_secret_string $consumer_secret_view</div>
-	<div>$sign_on_with_twitter_string $sign_on_with_twitter_view</div>
-</div>
+<div>$insert_view</div>
+<div>$consumer_key_string $consumer_key_view</div>
+<div>$consumer_secret_string $consumer_secret_view</div>
+<div>$sign_on_with_twitter_string $sign_on_with_twitter_view</div>
 __HTML;
 
 echo $settings;
diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php
index 7b298a8c5..6bd028da6 100644
--- a/views/default/core/account/login_walled_garden.php
+++ b/views/default/core/account/login_walled_garden.php
@@ -36,11 +36,11 @@ __HTML;
 }
 ?>
 	<?php
-	$lostpassword_form_body = "<p>" . elgg_echo('user:password:text') . "</p>";
-	$lostpassword_form_body .= "<p class='margin-none'><label>". elgg_echo('username') . " "
-		. elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea lostusername')) . "</label></p>";
+	$lostpassword_form_body = "<div>" . elgg_echo('user:password:text') . "</div>";
+	$lostpassword_form_body .= "<div class='margin-none'><label>". elgg_echo('username') . " "
+		. elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea lostusername')) . "</label></div>";
 	$lostpassword_form_body .= elgg_view('input/captcha');
-	$lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='elgg-button-action elgg-state-disabled cancel_request' type='reset' value='Cancel'></p>";
+	$lostpassword_form_body .= "<div>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='elgg-button-action elgg-state-disabled cancel_request' type='reset' value='Cancel'></div>";
 	
 	?>
 <div id="lostpassword_form" class="hidden clearfix">
diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php
index 2e8021938..af41002e9 100644
--- a/views/default/forms/admin/site/update_advanced.php
+++ b/views/default/forms/admin/site/update_advanced.php
@@ -94,6 +94,5 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'val
 $form_body .= '<div class="bta">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 $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 30d3b6173..e9e2e6c13 100644
--- a/views/default/forms/admin/site/update_basic.php
+++ b/views/default/forms/admin/site/update_basic.php
@@ -27,6 +27,5 @@ $form_body .= elgg_view("input/dropdown", array(
 $form_body .= '<div class="bta">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 $form_body .= '</div>';
-$form_body = "<div class='admin_settings site_admin'>".$form_body."</div>";
 
 echo $form_body;
\ No newline at end of file
-- 
cgit v1.2.3