From 01162eec4ebe3fde0aafc3a92f3bebdd83dde79b Mon Sep 17 00:00:00 2001
From: MinSoo Kim <misol.kr@gmail.com>
Date: Fri, 1 Jan 2016 22:53:24 +0900
Subject: [PATCH] =?UTF-8?q?XEDITION=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83?=
 =?UTF-8?q?=EC=9D=98=20HTML=20=EB=AC=B8=EB=B2=95=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=93=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. input 의 required 는 true 일 수 없다.
2. 이메일을 로그인 계정으로 사용하는 경우 라벨 문구가 헷갈릴 수 있으므로 수정.
---
 layouts/xedition/layout.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html
index 2081af09b..d9c2092b4 100644
--- a/layouts/xedition/layout.html
+++ b/layouts/xedition/layout.html
@@ -4,6 +4,9 @@
 <load target="./lang" />
 
 <!--// 레이아웃을 위한 설정 값들 -->
+<!--// 회원 모듈 -->
+	{@ $oMemberModel = getModel('member');
+	$member_config = $oMemberModel->getMemberConfig();}
 <!--// index 모듈 체크 -->
 	{@ $_is_indexmodule = ($site_module_info->module_srl === $current_module_info->module_srl)}
 	{@ $_body_class = array()}
@@ -454,13 +457,13 @@
 					<legend class="blind">{$lang->cmd_login}</legend>
 					<div class="control-group">
 						<div class="group">
-							<input type="text" name="user_id" id="uemail" required="true" />
+							<input type="<!--@if($member_config->identifier != 'email_address')-->text<!--@else-->email<!--@end-->" name="user_id" id="uemail" required="required" />
 							<span class="highlight"></span>
 							<span class="bar"></span>
-							<label class="info_label" for="uemail">{$lang->user_id}</label>
+							<label class="info_label" for="uemail"><!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label>
 						</div>
 						<div class="group">
-							<input type="password" name="password" id="upw" required="true" />
+							<input type="password" name="password" id="upw" required="required" />
 							<span class="highlight"></span>
 							<span class="bar"></span>
 							<label class="info_label" for="upw">{$lang->password}</label>