From f1bcf6ef0289504f1f00e1265ad8ad88aa2302db Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Mon, 8 Apr 2013 07:11:35 +0200
Subject: Improve the password reset screen.

Fixing #2752
---
 core/css/styles.css                          |  2 ++
 core/lostpassword/templates/lostpassword.php | 34 ++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)

(limited to 'core')

diff --git a/core/css/styles.css b/core/css/styles.css
index 4dfa3f64a37..6eea2be433d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -220,6 +220,8 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 }
 #login #databaseField .infield { padding-left:0; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
+#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
+#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
 
 /* Show password toggle */
 #show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index dc9f0bc8ad3..4009ba44050 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,17 +1,31 @@
-<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post">
-	<fieldset>
-		<?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
-		<?php if ($_['requested']): ?>
-			<?php echo $l->t('Reset email send.'); ?>
-		<?php else: ?>
+<?php if $_['requested']): ?>
+	<div class="success"><p>
+	<?php
+		echo $l->t('The link to reset your password has been sent to your email.');
+		echo "</p><p>";
+		echo $l->t('If you do not receive it within a reasonable amount of time, check your spam/junk folders.');
+		echo "</p><p>";
+		echo $l->t('If it is not there ask your local administrator .');
+	?>
+	</p></div>
+<?php else: ?>
+	<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post">
+		<fieldset>
 			<?php if ($_['error']): ?>
-				<?php echo $l->t('Request failed!'); ?>
+				<div class="errors"><p>
+				<?php
+					echo $l->t('Request failed!');
+					echo "</p><p>";
+					echo $l->t('Did you make sure the Email was right?');
+				?>
+				</p></div>
 			<?php endif; ?>
+			<?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
 			<p class="infield">
 				<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
 			</p>
 			<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
-		<?php endif; ?>
-	</fieldset>
-</form>
+		</fieldset>
+	</form>
+<?php endif; ?>
-- 
cgit v1.2.3


From 06dfc951227375ae3729e93d5c0a3f90e4cdc566 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Mon, 8 Apr 2013 22:41:15 +0200
Subject: Fix syntax error.

---
 core/lostpassword/templates/lostpassword.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 4009ba44050..dd4d05d25c0 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,4 +1,4 @@
-<?php if $_['requested']): ?>
+<?php if ($_['requested']): ?>
 	<div class="success"><p>
 	<?php
 		echo $l->t('The link to reset your password has been sent to your email.');
-- 
cgit v1.2.3


From 0d3afadab28c5d4008c6b0c1051c31f0c67a462e Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Thu, 11 Apr 2013 17:20:14 +0200
Subject: Don't split translation lines

---
 core/lostpassword/templates/lostpassword.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'core')

diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index dd4d05d25c0..bb06249b722 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,11 +1,9 @@
 <?php if ($_['requested']): ?>
 	<div class="success"><p>
 	<?php
-		echo $l->t('The link to reset your password has been sent to your email.');
-		echo "</p><p>";
-		echo $l->t('If you do not receive it within a reasonable amount of time, check your spam/junk folders.');
-		echo "</p><p>";
-		echo $l->t('If it is not there ask your local administrator .');
+		echo $l->t('The link to reset your password has been sent to your email.</p>
+		<p>If you do not receive it within a reasonable amount of time, check your spam/junk folders.</p>
+		<p>If it is not there ask your local administrator .');
 	?>
 	</p></div>
 <?php else: ?>
@@ -13,11 +11,7 @@
 		<fieldset>
 			<?php if ($_['error']): ?>
 				<div class="errors"><p>
-				<?php
-					echo $l->t('Request failed!');
-					echo "</p><p>";
-					echo $l->t('Did you make sure the Email was right?');
-				?>
+				<?php echo $l->t('Request failed!</p><p>Did you make sure the Email was right?'); ?>
 				</p></div>
 			<?php endif; ?>
 			<?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
-- 
cgit v1.2.3


From 1e2efdddc9a8770f483a3a368fdc9a7fe6927420 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Tue, 23 Apr 2013 12:36:27 +0200
Subject: Oneliners, <br>, proper errors & print_unescaped()

---
 core/lostpassword/templates/lostpassword.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'core')

diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index bb06249b722..4f884195799 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,25 +1,23 @@
 <?php if ($_['requested']): ?>
 	<div class="success"><p>
 	<?php
-		echo $l->t('The link to reset your password has been sent to your email.</p>
-		<p>If you do not receive it within a reasonable amount of time, check your spam/junk folders.</p>
-		<p>If it is not there ask your local administrator .');
+		print_unescaped($l->t('The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator .'));
 	?>
 	</p></div>
 <?php else: ?>
-	<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post">
+	<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
 		<fieldset>
 			<?php if ($_['error']): ?>
 				<div class="errors"><p>
-				<?php echo $l->t('Request failed!</p><p>Did you make sure the Email was right?'); ?>
+				<?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?>
 				</p></div>
 			<?php endif; ?>
-			<?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
+			<?php print_unescaped($l->t('You will receive a link to reset your password via Email.')=; ?>
 			<p class="infield">
-				<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
+				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
 				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
 			</p>
-			<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
+			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
 		</fieldset>
 	</form>
 <?php endif; ?>
-- 
cgit v1.2.3


From 6f5501bbc88bff2e14e54420d44d770028586c85 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Wed, 24 Apr 2013 14:17:13 +0200
Subject: Fis syntax error and add user icon.

---
 core/lostpassword/templates/lostpassword.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 4f884195799..c19c6893f13 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -12,10 +12,11 @@
 				<?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?>
 				</p></div>
 			<?php endif; ?>
-			<?php print_unescaped($l->t('You will receive a link to reset your password via Email.')=; ?>
+			<?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?>
 			<p class="infield">
-				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
 				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
+				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
+				<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 			</p>
 			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
 		</fieldset>
-- 
cgit v1.2.3