lost-password: Polish html code

yona-projects · Mar 29, 2017 · 8a3d498 · 8a3d498
1 parent 2c53439
commit 8a3d498
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 35 deletions.
diff --git a/app/views/site/lostPassword.scala.html b/app/views/site/lostPassword.scala.html
@@ -35,18 +35,11 @@ <h4>@Messages("site.mail.fail")</h4>
 
     <form method="post" action="@routes.PasswordResetApp.requestResetPasswordEmail()">
       <dl>
-        <dt>
-          <label for="loginId">@Messages("user.loginId")</label>
-        </dt>
         <dd>
-          <input type="text" id="loginId" name="loginId" required="required" placeholder="@Messages("user.yourLoginId")" class="text" @if(!UserApp.currentUser().isAnonymous){value="@UserApp.currentUser().loginId"}>
+          <input type="text" id="loginId" name="loginId" required="required" placeholder="@Messages("user.loginId")" class="text" @if(!UserApp.currentUser().isAnonymous){value="@UserApp.currentUser().loginId"}>
         </dd>
-
-        <dt>
-          <label for="emailAddress">@Messages("user.email")</label>
-        </dt>
         <dd>
-          <input type="text" id="emailAddress" name="emailAddress" required="" placeholder="@Messages("user.yourEmail")" class="text" @if(!UserApp.currentUser().isAnonymous){value="@UserApp.currentUser().email"}>
+          <input type="text" id="emailAddress" name="emailAddress" required="" placeholder="@Messages("user.email")" class="text" @if(!UserApp.currentUser().isAnonymous){value="@UserApp.currentUser().email"}>
         </dd>
       </dl>
 

diff --git a/app/views/user/resetPassword.scala.html b/app/views/user/resetPassword.scala.html
@@ -1,22 +1,8 @@
 @**
-* Yobi, Project Hosting SW
+* Yona, 21st Century Project Hosting SW
 *
-* Copyright 2013 NAVER Corp.
-* http://yobi.io
-*
-* @author Suwon Chae
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+* Copyright Yona & Yobi Authors & NAVER Corp.
+* https://yona.io
 **@
 @(message: String, newUserForm: play.data.Form[User], hashString: String)
 @import utils.TemplateHelper._
@@ -34,18 +20,11 @@ <h1 class="title">
     <form action="@routes.PasswordResetApp.resetPassword()" method="post" name="passwordReset">
       <input type="hidden" name="hashString" value="@hashString">
       <dl>
-        <dt>
-          <label for="password">@Messages("user.password")</label>
-        </dt>
         <dd>
-          <input id="password" type="password" name="password" class="text password" placeholder="" autocomplete="off">
+          <input id="password" type="password" name="password" class="text password" placeholder="@Messages("user.password")" autocomplete="off">
         </dd>
-
-        <dt>
-          <label for="retypedPassword">@Messages("validation.retypePassword")</label>
-        </dt>
         <dd>
-          <input id="retypedPassword" type="password" name="retypedPassword" class="text password" placeholder="" autocomplete="off">
+          <input id="retypedPassword" type="password" name="retypedPassword" class="text password" placeholder="@Messages("validation.retypePassword")" autocomplete="off">
         </dd>
       </dl>