From 3a240a0f667841c734d95a737829d2afbbec9f78 Mon Sep 17 00:00:00 2001
From: misol <misol.kr@gmail.com>
Date: Fri, 7 Dec 2012 14:05:06 +0000
Subject: [PATCH] Add to r11802, Input type attribution update.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12355 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/m.skins/default/css/mlogin.css            | 2 ++
 modules/member/m.skins/default/css/msignup.css           | 8 ++++++++
 modules/member/m.skins/default/find_member_account.html  | 4 ++--
 modules/member/m.skins/default/login_form.html           | 2 +-
 modules/member/m.skins/default/modify_email_address.html | 2 +-
 modules/member/m.skins/default/signup_form.html          | 2 +-
 modules/member/member.admin.view.php                     | 7 ++++++-
 modules/member/skins/default/css/member.css              | 3 +++
 modules/member/skins/default/login_form.html             | 2 +-
 modules/member/skins/default/signup_form.html            | 2 +-
 10 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/modules/member/m.skins/default/css/mlogin.css b/modules/member/m.skins/default/css/mlogin.css
index c73f3bf0c..a95d66c0c 100644
--- a/modules/member/m.skins/default/css/mlogin.css
+++ b/modules/member/m.skins/default/css/mlogin.css
@@ -25,10 +25,12 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
 .ff ul{margin:0 10px 10px 10px;padding:10px 0 0 0;list-style:none}
 .ff li{margin:0 0 5px 0;padding:0}
 .ff label+input[type=text],
+.ff label+input[type=email],
 .ff label+input[type=password],
 .ff label+textarea,
 .ff label+select{display:block;width:96%;font-size:14px;margin:0 0 5px 0}
 .ff label+input[type=text],
+.ff label+input[type=email],
 .ff label+input[type=password],
 .ff label+textarea{padding:5px}
 /* Help */
diff --git a/modules/member/m.skins/default/css/msignup.css b/modules/member/m.skins/default/css/msignup.css
index 1d349f426..3c8b13f92 100644
--- a/modules/member/m.skins/default/css/msignup.css
+++ b/modules/member/m.skins/default/css/msignup.css
@@ -34,15 +34,23 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
 .ff li p{color:#666}
 .ff li>label:first-child{display:block;font-weight:bold}
 .ff label+input[type=text],
+.ff label+input[type=email],
+.ff label+input[type=url],
 .ff label+input[type=password],
 .ff label+textarea,
 .ff label+select,
 .ff label+select+input[type=text],
+.ff label+select+input[type=email],
+.ff label+select+input[type=url],
 .ff .inputText{display:block;width:96%;font-size:14px;margin:0 0 5px 0}
 .ff label+input[type=text],
+.ff label+input[type=email],
+.ff label+input[type=url],
 .ff label+input[type=password],
 .ff label+textarea,
 .ff label+select+input[type=text],
+.ff label+select+input[type=email],
+.ff label+select+input[type=url],
 .ff .inputText,
 .ff .tel input[type=text]{padding:5px}
 .ff .krZip input[type=text]{width:77%;font-size:14px;margin:0 0 5px 0;padding:5px}
diff --git a/modules/member/m.skins/default/find_member_account.html b/modules/member/m.skins/default/find_member_account.html
index 8150c436c..6b7226973 100644
--- a/modules/member/m.skins/default/find_member_account.html
+++ b/modules/member/m.skins/default/find_member_account.html
@@ -15,7 +15,7 @@
 	<ul>
 		<li>
 			<label for="email_address1">{$lang->email_address}</label>
-			<input id="email_address1" type="text" name="email_address" />
+			<input id="email_address1" type="email" name="email_address" />
 		</li>
 	</ul>
 	<div class="bna">
@@ -40,7 +40,7 @@
 		</li>
 		<li>
 			<label for="email_address2">{$lang->email_address}</label>
-			<input type="text" name="email_address" id="email_address2" />
+			<input type="email" name="email_address" id="email_address2" />
 		</li>
 		<li>
 			<label for="question">{$lang->find_account_question}</label>
diff --git a/modules/member/m.skins/default/login_form.html b/modules/member/m.skins/default/login_form.html
index 735500a86..39dc231be 100644
--- a/modules/member/m.skins/default/login_form.html
+++ b/modules/member/m.skins/default/login_form.html
@@ -12,7 +12,7 @@
 		<input type="hidden" name="act" value="procMemberLogin" />
 		<input type="hidden" name="redirect_url" value="{getUrl('act','')}" />
 		<ul>
-			<li><label for="id"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label><input name="user_id" type="text" id="id" value="" /></li>
+			<li><label for="id"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label><input name="user_id" type="<!--@if($identifier == 'user_id')-->text<!--@else-->email<!--@end-->" id="id" value="" /></li>
 			<li><label for="pw">{$lang->password}</label><input name="password" type="password" id="pw" value="" /></li>
 		</ul>
 		<div class="message info" id="keep_msg" style="display:none;">
diff --git a/modules/member/m.skins/default/modify_email_address.html b/modules/member/m.skins/default/modify_email_address.html
index 09e963dbc..d6a6effd5 100644
--- a/modules/member/m.skins/default/modify_email_address.html
+++ b/modules/member/m.skins/default/modify_email_address.html
@@ -13,7 +13,7 @@
 	<ul>
 		<li>
 			<label for="email_address">{$lang->email_address}</label>
-			<input type="text" id="email_address" name="email_address" value="" />
+			<input type="email" id="email_address" name="email_address" value="" />
 		</li>
 	</ul>
 	<div class="bna">
diff --git a/modules/member/m.skins/default/signup_form.html b/modules/member/m.skins/default/signup_form.html
index 0f43d777c..2faebf0ea 100644
--- a/modules/member/m.skins/default/signup_form.html
+++ b/modules/member/m.skins/default/signup_form.html
@@ -26,7 +26,7 @@
 		<ul>
 			<li> 
 				<label for="{$identifierForm->name}">{$identifierForm->title} <em style="color:red">*</em></label>
-				<input type="text" name="{$identifierForm->name}" id="{$identifierForm->name}" value="{$identifierForm->value}" />
+				<input type="text"|cond="$identifierForm->name!='email_address'" type="email"|cond="$identifierForm->name=='email_address'" name="{$identifierForm->name}" id="{$identifierForm->name}" value="{$identifierForm->value}" />
 			</li>
 			<li> 
 				<label for="password">{$lang->password} <em style="color:red">*</em></label>
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index c7c9a92eb..bf4c486bf 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -469,6 +469,11 @@ class memberAdminView extends member
 						$inputTag = sprintf($inputTag, implode('', $optionTag));
 						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" />';
 					}
+					else if($formInfo->name == 'email_address')
+					{
+						$formTag->type = 'email';
+						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" />';
+					}
 					else if($formInfo->name == 'homepage')
 					{
 						$formTag->type = 'url';
@@ -512,7 +517,7 @@ class memberAdminView extends member
 						$extentionReplace = array('tel_0' => $extendForm->value[0],
 							'tel_1' => $extendForm->value[1],
 							'tel_2' => $extendForm->value[2]);
-						$template = '<input type="text" name="%column_name%[]" value="%tel_0%" size="4" maxlength="4" style="width:30px" />-<input type="text" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:30px" />-<input type="text" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:30px" />';
+						$template = '<input type="tel" name="%column_name%[]" value="%tel_0%" size="4" maxlength="4" style="width:30px" />-<input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:30px" />-<input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:30px" />';
 					}
 					else if($extendForm->column_type == 'textarea')
 					{
diff --git a/modules/member/skins/default/css/member.css b/modules/member/skins/default/css/member.css
index b5ef8442f..412489aab 100644
--- a/modules/member/skins/default/css/member.css
+++ b/modules/member/skins/default/css/member.css
@@ -45,15 +45,18 @@
 .xm li label em{font-weight:normal}
 .xm label.overlap{position:absolute;color:#aaa}
 .xm input[type=text],
+.xm input[type=email],
 .xm input[type=password],
 .xm input[type=file],
 .xm textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent;*background:transparent url(../../../../../common/img/blank.gif);_background:transparent;}
 .xm input[type=text],
+.xm input[type=email],
 .xm input[type=password],
 .xm input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px}
 .xm input[type=checkbox],
 .xm input[type=radio]{margin:0;padding:0;width:13px;height:13px;vertical-align:middle}
 .xm input[type=text][disabled=disabled],
+.xm input[type=email][disabled=disabled],
 .xm input[type=password][disabled=disabled],
 .xm input[type=checkbox][disabled=disabled],
 .xm input[type=radio][disabled=disabled],
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index 2a201280b..bb11eebfb 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -10,7 +10,7 @@
 	<ul>
 		<li>
 			<p class="q"><label for="uid"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label></p>
-			<p class="a"><input type="text" name="user_id" id="uid" value="" /></p>
+			<p class="a"><input type="<!--@if($identifier == 'user_id')-->text<!--@else-->email<!--@end-->" name="user_id" id="uid" value="" /></p>
 		</li>
 		<li>
 			<p class="q"><label for="upw">{$lang->password}</label></p>
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 77e452835..365d86225 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -22,7 +22,7 @@
 			<li>
 				<p class="q">{$identifierForm->title} <em style="color:red">*</em></p>
 				<p class="a">
-					<input type="text" name="{$identifierForm->name}" value="{$identifierForm->value}" />
+					<input type="text"|cond="$identifierForm->name!='email_address'" type="email"|cond="$identifierForm->name=='email_address'" name="{$identifierForm->name}" value="{$identifierForm->value}" />
 				</p>
 			</li>
 			<li>