From cedca03ef524376135e9fa232879bd1df0da0c9d Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 13 Jun 2014 15:54:09 +0200
Subject: [PATCH] Remove infield label, add password icon, fix layout

---
 core/js/lostpassword.js                       | 3 ++-
 core/lostpassword/css/resetpassword.css       | 7 +++++++
 core/lostpassword/templates/resetpassword.php | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 core/lostpassword/css/resetpassword.css

diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index 19e2cf5a4b..b0bd0e01b7 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -57,7 +57,8 @@ OC.Lostpassword = {
 			
 	sendLinkSuccess : function(msg){
 		var node = OC.Lostpassword.getSendStatusNode();
-		node.addClass('success').css({width:'auto'});
+		// update is the better success message styling
+		node.addClass('update').css({width:'auto'});
 		node.html(OC.Lostpassword.sendSuccessMsg);
 	},
 			
diff --git a/core/lostpassword/css/resetpassword.css b/core/lostpassword/css/resetpassword.css
new file mode 100644
index 0000000000..012af672d9
--- /dev/null
+++ b/core/lostpassword/css/resetpassword.css
@@ -0,0 +1,7 @@
+#reset-password p {
+	position: relative;
+}
+
+#password-icon {
+	top: 20px;
+}
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index 0184ace8d1..118fe78711 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -1,8 +1,10 @@
+<?php OCP\Util::addStyle('lostpassword', 'resetpassword'); ?>
 <form action="<?php print_unescaped($_['link']) ?>" id="reset-password" method="post">
 	<fieldset>
 		<p>
 			<label for="password" class="infield"><?php p($l->t('New password')); ?></label>
-			<input type="password" name="password" id="password" value="" required />
+			<input type="password" name="password" id="password" value="" placeholder="<?php p($l->t('New Password')); ?>" required />
+			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
 		<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
 	</fieldset>