5 files changed, 14 insertions, 16 deletions
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')) {
 <div id="login">
 <h2><?php echo elgg_echo('login'); ?></h2>
 	<?php
-		echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
+		echo elgg_view_form('login', array('action' => "{$login_url}action/login"));
 	?>
 </div>
 <?php //@todo JS 1.8: no ?>
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 .= "<input type='hidden' name='returntoreferer' value='true' />";
 
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')) {
 ?>
 <h2><?php echo elgg_echo('login'); ?></h2>
 <?php
+	//@todo Forms 1.8: Convert to use elgg_view_form()
 	echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
 	echo elgg_view('login/extend'); // view for plugins to extend
 ?>
@@ -46,6 +47,7 @@ __HTML;
 	<div id="hiddenform_body" class="clearfix">
 		<h2><?php echo elgg_echo('user:password:lost'); ?></h2>
 		<?php
+			//@todo Forms 1.8: Use elgg_view_form()
 			echo elgg_view('input/form', array(
 				'action' => "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 .= '<p class="bta">';
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
-$form_body .= '</p>';
-
-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