Closes #195 & #191

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

2 files changed, 20 insertions, 1 deletions

diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
new file mode 100644
index 000000000..18a9888fd
--- /dev/null
+++ b/views/default/account/forms/forgotten_password.php
@@ -0,0 +1,19 @@
+<?php
+	/**
+	 * Elgg forgotten password.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+?>
+<div id="forgotten_box">
+	<form action="<?php echo $vars['url']; ?>actions/user/requestnewpassword" method="post">
+		<p><?php echo elgg_echo('user:password:text'); ?></p>
+		<p><b><?php echo elgg_echo('username'); ?></b> <?php echo elgg_view('input/text', array('internalname' => 'username')); ?></p>
+		<p><input type="submit" name="submit" class="submit_button" value="<?php echo elgg_echo('request'); ?>" /></p>
+	</form>
+</div>
\ No newline at end of file
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 105c4499d..1723cf81a 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -20,6 +20,6 @@
 			<br />

 			<label><?php echo elgg_echo('password'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />

 			<input type="submit" name="submit" class="submit_button" value="<?php echo elgg_echo('login'); ?>" /></p>

-			<?php if (!$CONFIG->disable_registration) { ?><p><a href="<?php echo $vars['url']; ?>register.php"><?php echo elgg_echo('register'); ?></a></p><?php } ?>

+			<p><?php if (!$CONFIG->disable_registration) { ?><a href="<?php echo $vars['url']; ?>account/register.php"><?php echo elgg_echo('register'); ?></a> : <?php } ?> <a href="<?php echo $vars['url']; ?>account/forgotten_password.php"><?php echo elgg_echo('user:password:lost'); ?></a></p>

 	    </form>

 	</div>
\ No newline at end of file