infield label removal: remove last occurences of infield labels

2 files changed, 8 insertions, 4 deletions

diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index d0fed38ee27..fdfa32344ec 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -16,8 +16,10 @@ OCP\Util::addStyle('lostpassword', 'lostpassword');
 				</p></div>
 			<?php endif; ?>
 			<div class="update"><?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?></div>
-			<p class="infield">
-				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
+			<p>
+				<input type="text" name="user" id="user"
+					placeholder="<?php print_unescaped($l->t( 'Username' )); ?>"
+					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=""/>
 				<?php if ($_['isEncrypted']): ?>
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index 881455f5a9d..11dce9f112b 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -4,9 +4,11 @@
 			<h1><?php p($l->t('Your password was reset')); ?></h1>
 			<p><a href="<?php print_unescaped(OC_Helper::linkTo('', 'index.php')) ?>/"><?php p($l->t('To login page')); ?></a></p>
 		<?php else: ?>
-			<p class="infield">
+			<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"
+					placeholder="<?php p($l->t('New password')); ?>"
+					value="" required />
 			</p>
 			<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
 		<?php endif; ?>