clean up the last few commits

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

diff --git a/mod/twitterservice/views/default/settings/twitterservice/edit.php b/mod/twitterservice/views/default/settings/twitterservice/edit.php
index 93de0d99392f3682073371ad073b1bd7e9091c70..7e43762cebb13f22738e691e7bddb9be6ed38936 100644 (file)
--- 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 7b298a8c5f93f55337b3c672d44f277af1d7ffec..6bd028da68fb62929cf78722c0f210765861ac2e 100644 (file)
--- 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 2e802193893d5e6e84e88129970aad3be8fe821f..af41002e908597191d9e87eeb7fce8ab5b3dbee9 100644 (file)
--- 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 30d3b6173b7bc013bedf259f7ca2374cc4925bb3..e9e2e6c13fee84823abd93cff589dfe27efc1f1a 100644 (file)
--- 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