Commit @8a3d4989bdb09ad8f884f2a296a75808e4774e4c

doortts 2017-03-29

lost-password: Polish html code

@8a3d4989bdb09ad8f884f2a296a75808e4774e4c

2c53439

8a3d498

app/views/site/lostPassword.scala.html

--- app/views/site/lostPassword.scala.html

+++ app/views/site/lostPassword.scala.html


 
     <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>
 

2c53439

8a3d498

app/views/user/resetPassword.scala.html

--- app/views/user/resetPassword.scala.html

+++ app/views/user/resetPassword.scala.html


 @**
-* 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._

     <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>
 

Add a comment

Open 0
Closed 0

List

...	...	@@ -35,18 +35,11 @@
35	35
36	36	<form method="post" action="@routes.PasswordResetApp.requestResetPasswordEmail()">
37	37	<dl>
38		- <dt>
39		- <label for="loginId">@Messages("user.loginId")</label>
40		- </dt>
41	38	<dd>
42		- <input type="text" id="loginId" name="loginId" required="required" placeholder="@Messages("user.yourLoginId")" class="text" @if(!UserApp.currentUser().isAnonymous){value="@UserApp.currentUser().loginId"}>
	39	+ <input type="text" id="loginId" name="loginId" required="required" placeholder="@Messages("user.loginId")" class="text" @if(!UserApp.currentUser().isAnonymous){value="@UserApp.currentUser().loginId"}>
43	40	</dd>
44		-
45		- <dt>
46		- <label for="emailAddress">@Messages("user.email")</label>
47		- </dt>
48	41	<dd>
49		- <input type="text" id="emailAddress" name="emailAddress" required="" placeholder="@Messages("user.yourEmail")" class="text" @if(!UserApp.currentUser().isAnonymous){value="@UserApp.currentUser().email"}>
	42	+ <input type="text" id="emailAddress" name="emailAddress" required="" placeholder="@Messages("user.email")" class="text" @if(!UserApp.currentUser().isAnonymous){value="@UserApp.currentUser().email"}>
50	43	</dd>
51	44	</dl>
52	45

...	...	@@ -1,22 +1,8 @@
1	1	@**
2		-* Yobi, Project Hosting SW
	2	+* Yona, 21st Century Project Hosting SW
3	3	*
4		-* Copyright 2013 NAVER Corp.
5		-* http://yobi.io
6		-*
7		-* @author Suwon Chae
8		-*
9		-* Licensed under the Apache License, Version 2.0 (the "License");
10		-* you may not use this file except in compliance with the License.
11		-* You may obtain a copy of the License at
12		-*
13		-* http://www.apache.org/licenses/LICENSE-2.0
14		-*
15		-* Unless required by applicable law or agreed to in writing, software
16		-* distributed under the License is distributed on an "AS IS" BASIS,
17		-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18		-* See the License for the specific language governing permissions and
19		-* limitations under the License.
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
20	6	**@
21	7	@(message: String, newUserForm: play.data.Form[User], hashString: String)
22	8	@import utils.TemplateHelper._
...	...	@@ -34,18 +20,11 @@
34	20	<form action="@routes.PasswordResetApp.resetPassword()" method="post" name="passwordReset">
35	21	<input type="hidden" name="hashString" value="@hashString">
36	22	<dl>
37		- <dt>
38		- <label for="password">@Messages("user.password")</label>
39		- </dt>
40	23	<dd>
41		- <input id="password" type="password" name="password" class="text password" placeholder="" autocomplete="off">
	24	+ <input id="password" type="password" name="password" class="text password" placeholder="@Messages("user.password")" autocomplete="off">
42	25	</dd>
43		-
44		- <dt>
45		- <label for="retypedPassword">@Messages("validation.retypePassword")</label>
46		- </dt>
47	26	<dd>
48		- <input id="retypedPassword" type="password" name="retypedPassword" class="text password" placeholder="" autocomplete="off">
	27	+ <input id="retypedPassword" type="password" name="retypedPassword" class="text password" placeholder="@Messages("validation.retypePassword")" autocomplete="off">
49	28	</dd>
50	29	</dl>
51	30

Delete comment