Cleaned up registration terms and updated to 1.8 style

Upped version.

2 files changed, 11 insertions, 51 deletions

diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
deleted file mode 100644
index 3e53b6f05..000000000
--- a/views/default/account/forms/register.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Elgg register form
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$username = get_input('u');
-$email = get_input('e');
-$name = get_input('n');
-
-$admin_option = false;
-if (($_SESSION['user']->admin) && ($vars['show_admin'])) {
-	$admin_option = true;
-}
-
-$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "general-textarea", 'value' => $name)) . "</label><br />";
-
-$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "general-textarea", 'value' => $email)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "general-textarea", 'value' => $username)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "general-textarea")) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "general-textarea")) . "</label><br />";
-
-// view to extend to add more fields to the registration form
-$form_body .= elgg_view('register/extend');
-
-// Add captcha hook
-$form_body .= elgg_view('input/captcha');
-
-if ($admin_option) {
-	$form_body .= elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option'))));
-}
-
-$form_body .= elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' => $vars['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>";
-?>
-
-<div id="register-box">
-<h2><?php echo elgg_echo('register'); ?></h2>
-<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>
-</div>
\ No newline at end of file
diff --git a/views/default/registrationterms/register.php b/views/default/registrationterms/register.php
index a8ad88cdb..7f746719b 100644
--- a/views/default/registrationterms/register.php
+++ b/views/default/registrationterms/register.php
@@ -1,9 +1,15 @@
 <?php

 /**

- * 

+ *

  */

+

+$label = elgg_echo('registrationterms:agree', array(elgg_get_site_url() . 'expages/read/Terms'));

+

+$input = elgg_view('input/checkbox', array(

+	'name' => 'agreetoterms',

+	'value' => 'true',

+));

 ?>

-<label>

-	<input type="checkbox" name="agreetoterms" value="true">

-	<?php echo elgg_echo('agreetoterms')." <a href=\"{$vars['url']}pg/expages/read/Terms/\">".elgg_echo('terms')."</a>"; ?>

-</label><br/>
\ No newline at end of file
+<div>

+	<label><?php echo "$input $label"; ?></label>

+</div>
\ No newline at end of file