From 25bf2850a98d3f5784df9c998c906a118708c0be Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 20 May 2010 13:35:10 +0000
Subject: Updated Register and ForgottenLogin forms to use default canvases.

git-svn-id: http://code.elgg.org/elgg/trunk@6109 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/account/forms/register.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'views/default/account/forms/register.php')

diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index 580922eb7..819646bd5 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -19,12 +19,11 @@ if ($loggedin_user && $loggedin_user->isAdmin() && isset($vars['show_admin'])) {
 	$admin_option = true;
 }
 
-$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "input_text", 'value' => $name)) . "</label><br />";
-
-$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "input_text", 'value' => $email)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "input_text", 'value' => $username)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "input_password")) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "input_password")) . "</label><br />";
+$form_body  = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "input_text", 'value' => $name)) . "</label></p>";
+$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "input_text", 'value' => $email)) . "</label></p>";
+$form_body .= "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "input_text", 'value' => $username)) . "</label></p>";
+$form_body .= "<p><label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "input_password")) . "</label></p>";
+$form_body .= "<p><label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "input_password")) . "</label></p>";
 
 // view to extend to add more fields to the registration form
 $form_body .= elgg_view('register/extend');
@@ -40,13 +39,10 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'friend_guid', '
 $form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'value' => $vars['invitecode']));
 $form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register'));
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
+
+echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body, 'class' => "margin_top"));
 ?>
-<div id="elgg_content" class="clearfloat sidebar">
-	<div id="elgg_page_contents" class="clearfloat register">
-		<h2><?php echo elgg_echo('register'); ?></h2>
-		<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body, 'class' => "margin_top")) ?>
-	</div>
-</div>
+
 <script type="text/javascript">
 	$(document).ready(function() { $('input[name=name]').focus(); });
 </script>
-- 
cgit v1.2.3