summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-06-13 15:54:09 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-06-13 15:56:21 +0200
commitcedca03ef524376135e9fa232879bd1df0da0c9d (patch)
tree8a04ea813a2e9e20db33cc556088f9b2641c0f3b /core
parentd0b71dffca8754f9a2633586b35772b862bbe1d2 (diff)
downloadnextcloud-server-cedca03ef524376135e9fa232879bd1df0da0c9d.tar.gz
nextcloud-server-cedca03ef524376135e9fa232879bd1df0da0c9d.zip
Remove infield label, add password icon, fix layout
Diffstat (limited to 'core')
-rw-r--r--core/js/lostpassword.js3
-rw-r--r--core/lostpassword/css/resetpassword.css7
-rw-r--r--core/lostpassword/templates/resetpassword.php4
3 files changed, 12 insertions, 2 deletions
diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index 19e2cf5a4b6..b0bd0e01b75 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 00000000000..012af672d97
--- /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 0184ace8d1c..118fe787116 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>