From 6a66883178714f471ff95f3ff75d4caa0855c180 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 13 Feb 2011 00:35:19 +0000
Subject: Progress refactoring the login dropdown and login forms -- not quite
 there yet, though

Added another module: dropdown.

git-svn-id: http://code.elgg.org/elgg/trunk@8191 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/forms/login.php | 44 ++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

(limited to 'views/default/forms/login.php')

diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 862b5ab9d..44d134ba8 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -7,29 +7,39 @@
  */
 ?>
 
-<div class='loginbox'>
-	<label><?php echo elgg_echo('loginusername'); ?></label><br />
-	<?php echo elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')); ?>
-	<label><?php echo elgg_echo('password'); ?></label><br />
-	<?php echo elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')); ?><br />
+<div>
+	<label><?php echo elgg_echo('loginusername'); ?></label>
+	<?php echo elgg_view('input/text', array('internalname' => 'username')); ?>
+</div>
+<div>
+	<label><?php echo elgg_echo('password'); ?></label>
+	<?php echo elgg_view('input/password', array('internalname' => 'password')); ?>
+</div>
 
-	<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
+<?php echo elgg_view('login/extend'); ?>
 
-	<span class='rememberme'>
-		<label>
-			<input type="checkbox" name="persistent" value="true" />
-			<?php echo elgg_echo('user:persistent'); ?>
-		</label>
-	</span><br />
+<div>
+	<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
 
-	<?php echo elgg_view('login/extend'); ?>
+	<label class="right mtm">
+		<input type="checkbox" name="persistent" value="true" />
+		<?php echo elgg_echo('user:persistent'); ?>
+	</label>
+	
+	<?php 
+	if ($vars['returntoreferer']) { 
+		echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
+	}
+	?>
+</div>
 
+<ul class="elgg-menu elgg-menu-footer">
 <?php
 	if (elgg_get_config('allow_registration')) {
-		echo '<a class="registration_link" href="' . elgg_get_site_url() . 'pg/register/">' . elgg_echo('register') . '</a> | ';
+		echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'pg/register/">' . elgg_echo('register') . '</a></li>';
 	}
 ?>
-	<a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>pages/account/forgotten_password.php">
+	<li><a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>pages/account/forgotten_password.php">
 		<?php echo elgg_echo('user:password:lost'); ?>
-	</a>
-</div>
\ No newline at end of file
+	</a></li>
+</ul>
\ No newline at end of file
-- 
cgit v1.2.3