From 1004743d1249ab1b8adc755a3514764d03fb9500 Mon Sep 17 00:00:00 2001
From: MinSoo Kim <misol.kr@gmail.com>
Date: Mon, 30 Jan 2017 22:34:45 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"=ED=9A=8C=EC=9B=90=20=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=20=ED=8E=98=EC=9D=B4=EC=A7=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 19a1a0a53c0c97598f6aceac109e39b777f4740a.
---
 modules/member/member.controller.php          | 10 +--
 .../simple_world/find_member_account.html     |  1 +
 .../skins/simple_world/js/signup_check.js     | 38 ---------
 .../skins/simple_world/signup_form.html       | 81 ++++++++++++-------
 4 files changed, 56 insertions(+), 74 deletions(-)
 delete mode 100644 modules/member/skins/simple_world/js/signup_check.js

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index a8e2df279..3093d70e3 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -223,20 +223,20 @@ class memberController extends member
 		{
 			case 'user_id' :
 				// Check denied ID
-				if($oMemberModel->isDeniedID($value)) return ModuleObject::setMessage('denied_user_id', 'error');
+				if($oMemberModel->isDeniedID($value)) return new Object(0,'denied_user_id');
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return ModuleObject::setMessage('msg_exists_user_id', 'error');
+				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id');
 				break;
 			case 'nick_name' :
 				// Check denied ID
 				if($oMemberModel->isDeniedNickName($value))
 				{
-					return ModuleObject::setMessage('denied_nick_name', 'error');
+					return new Object(0,'denied_nick_name');
 				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return ModuleObject::setMessage('msg_exists_nick_name', 'error');
+				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name');
 
 				break;
 			case 'email_address' :
@@ -259,7 +259,7 @@ class memberController extends member
 
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return ModuleObject::setMessage('msg_exists_email_address', 'error');
+				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_email_address');
 				break;
 		}
 	}
diff --git a/modules/member/skins/simple_world/find_member_account.html b/modules/member/skins/simple_world/find_member_account.html
index a335a12ba..39f08f8ac 100644
--- a/modules/member/skins/simple_world/find_member_account.html
+++ b/modules/member/skins/simple_world/find_member_account.html
@@ -73,6 +73,7 @@
 		<input type="hidden" name="act" value="procMemberResendAuthMail" />
 		<input type="hidden" name="success_return_url" value="{getUrl(act, $act)}" />
 		<input type="hidden" name="xe_validator_id" value="modules/member/skin/simple_world/find_member_account/3" />
+		<!--// 분명 이렇게 xe_validator_id 를 썼는데.. 왜 바뀌어서 나타나는가... -->
 		<div class="control-group">
 			<label for="email_address3">
 				{lang('common.email_address')}
diff --git a/modules/member/skins/simple_world/js/signup_check.js b/modules/member/skins/simple_world/js/signup_check.js
deleted file mode 100644
index 382337547..000000000
--- a/modules/member/skins/simple_world/js/signup_check.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @brief 회원 가입시나 정보 수정시 각 항목의 중복 검사하고 화면에 바로 나타냄
- * @author misol <misol.kr@gmail.com>
- * @author NAVER (developer@xpressengine.com)
- **/
-// body 에서 불러오면 가능
-$('#rx_insert_member :input').filter('[name=user_id],[name=nick_name],[name=email_address]').blur(rxMemberCheckValue);
-
-// 실제 서버에 특정 필드의 value check를 요청하고 이상이 있으면 메세지를 뿌려주는 함수
-function rxMemberCheckValue(event) {
-	var field  = event.target;
-	var _name  = field.name;
-	var _value = field.value;
-	if(!_name || !_value) return;
-
-	var params = {name:_name, value:_value};
-	var response_tags = ['error','message','message_type'];
-
-	exec_xml('member','procMemberCheckValue', params, dispMemberValueCheck, response_tags, field);
-}
-
-// 서버에서 응답이 올 경우 이상이 있으면 메세지를 출력
-function dispMemberValueCheck(response, response_tags, field) {
-	var _id   = 'rx_sw_dummy-'+field.name;
-	var dummy = $('#'+_id);
-
-	if(response['message']=='success') {
-		dummy.html('').hide();
-		return;
-	}
-
-	if (!dummy.length) {
-		dummy = $('<p class="rx_member-notice error" />').attr('id', _id)
-		$(field).after(dummy);
-	}
-
-	dummy.html(response['message']).show();
-}
diff --git a/modules/member/skins/simple_world/signup_form.html b/modules/member/skins/simple_world/signup_form.html
index b8a2f8b55..0b5e32e37 100644
--- a/modules/member/skins/simple_world/signup_form.html
+++ b/modules/member/skins/simple_world/signup_form.html
@@ -1,14 +1,13 @@
-<load target="./js/signup_check.js" type="body" />
+<load target="../../tpl/js/signup_check.js" />
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui")-->
 <!--%load_js_plugin("ui.datepicker")-->
 <include target="./common_header.html" />
-<section class="sw-body">
-	<h1>{$lang->cmd_signup}</h1>
+    <h1 style="border-bottom:1px solid #ccc">{$lang->cmd_signup}</h1>
 	<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/member/skins'" class="rx_member-notice {$XE_VALIDATOR_MESSAGE_TYPE}">
 		<p>{$XE_VALIDATOR_MESSAGE}</p>
 	</div>
-	<form ruleset="@insertMember" id="rx_insert_member" action="./" method="post" enctype="multipart/form-data" class="form-horizontal">
+    <form ruleset="@insertMember" id="fo_insert_member" action="./" method="post" enctype="multipart/form-data" class="form-horizontal">
 		<input type="hidden" name="act" value="procMemberInsert" />
 		<input type="hidden" name="xe_validator_id" value="modules/member/skins" />
 		<input type="hidden" name="success_return_url" value="{getUrl('act','dispMemberInfo')}" />
@@ -24,46 +23,66 @@
 			</div>
 		</div>
 		<div class="control-group">
-			<label for="{$identifierForm->name}">{$identifierForm->title}<sup style="color:red">*</sup></label>
-			<input type="text"|cond="$identifierForm->name!='email_address'" type="email"|cond="$identifierForm->name=='email_address'" name="{$identifierForm->name}" id="{$identifierForm->name}" value="{$identifierForm->value}" required />
-			<p class="rx_member-notice" cond="$identifierForm->name == 'email_address' && $email_confirmation_required == 'Y'">
-				{$lang->msg_email_confirmation_required}
-			</p>
+			<label for="{$identifierForm->name}" class="control-label"><em style="color:red">*</em> {$identifierForm->title}</label>
+			<div class="controls">
+				<input type="text"|cond="$identifierForm->name!='email_address'" type="email"|cond="$identifierForm->name=='email_address'" name="{$identifierForm->name}" id="{$identifierForm->name}" value="{$identifierForm->value}" required />
+				<p class="help-inline" cond="$identifierForm->name == 'email_address' && $email_confirmation_required == 'Y'">
+					{$lang->msg_email_confirmation_required}
+				</p>
+			</div>
+		</div>
+		<div class="control-group">
 			<label for="password" class="control-label"><em style="color:red">*</em> {$lang->password}</label>
-			<input type="password" name="password" id="password" value="" required />
-			<p class="rx_member-notice">{$lang->about_password_strength[$member_config->password_strength]}</p>
+			<div class="controls">
+				<input type="password" name="password" id="password" value="" required />
+				<p class="help-inline">{$lang->about_password_strength[$member_config->password_strength]}</p>
+			</div>
+		</div>
+		<div class="control-group">
 			<label for="password2" class="control-label"><em style="color:red">*</em> {$lang->password3}</label>
-			<input type="password" name="password2" id="password2" value="" required />
-			<block loop="$formTags=>$formTag">
-				<label for="{$formTag->name}" class="control-label">{$formTag->title}</label>
-				<block cond="$formTag->name != 'signature'">
-					{$formTag->inputTag}
-					<p class="rx_member-notice" cond="$formTag->name == 'email_address' && $email_confirmation_required == 'Y'">
-						{$lang->msg_email_confirmation_required}
-					</p>
-				</block>
-				<block cond="$formTag->name == 'signature'">
-					 <input type="hidden" name="signature" value="" />
-					{$editor}
-				</block>
-			</block>
+			<div class="controls">
+				<input type="password" name="password2" id="password2" value="" required />
+			</div>
+		</div>
+		<div class="control-group" loop="$formTags=>$formTag">
+			<label for="{$formTag->name}" class="control-label">{$formTag->title}</label>
+			<div class="controls" cond="$formTag->name != 'signature'">
+				{$formTag->inputTag}
+				<p class="help-inline" cond="$formTag->name == 'email_address' && $email_confirmation_required == 'Y'">
+					{$lang->msg_email_confirmation_required}
+				</p>
+			</div>
+			<div class="controls" cond="$formTag->name == 'signature'">
+				 <input type="hidden" name="signature" value="" />
+				{$editor}
+				<style scoped>
+				.xpress-editor>#smart_content,
+				.xpress-editor>#smart_content>.tool{clear:none}
+				</style>
+			</div>
+		</div>
+		<div class="control-group">
 			<div class="control-label">{$lang->allow_mailing}</div>
 			<div class="controls" style="padding-top:5px">
 				<label for="mailingYes"><input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'" /> {$lang->cmd_yes}</label>
 				<label for="mailingNo"><input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" /> {$lang->cmd_no}</label>
 			</div>
+		</div>
+		<div class="control-group">
 			<div class="control-label">{$lang->allow_message}</div>
 			<div class="controls" style="padding-top:5px">
 				<label for="allow_{$key}" loop="$lang->allow_message_type=>$key,$val"><input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key || (!$member_info && $key == 'Y')" id="allow_{$key}" /> {$val}</label>
 			</div>
-			<block cond="$captcha">
-				<div class="control-label">{$lang->captcha}</div>
-				<div class="controls">{$captcha}</div>
-			</block>
-			<input type="submit" value="{$lang->cmd_registration}" />
+		</div>
+		<div class="control-group" cond="$captcha">
+			<div class="control-label">{$lang->captcha}</div>
+			<div class="controls">{$captcha}</div>
+		</div>
+		<div class="btnArea" style="border-top:1px solid #ccc;padding-top:10px">
+			<input type="submit" value="{$lang->cmd_registration}" class="btn btn-inverse pull-right" />
+			<a href="{getUrl('act','','member_srl','')}" class="btn pull-left">{$lang->cmd_cancel}</a>
 		</div>
 	</form>
-</section>
 <script>
 (function($){
 	// label for setup