From bc33e8f4783e82a5d1bd27c8463ad403ec6004ef Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 9 Feb 2016 00:40:24 +0900
Subject: [PATCH] Add login form to default system message page

---
 .../message/skins/xedition/css/message.css    | 109 +++++++++++-------
 .../skins/xedition/system_message.html        |  40 +++++--
 2 files changed, 96 insertions(+), 53 deletions(-)

diff --git a/modules/message/skins/xedition/css/message.css b/modules/message/skins/xedition/css/message.css
index 4bc96dc0c..98af60058 100644
--- a/modules/message/skins/xedition/css/message.css
+++ b/modules/message/skins/xedition/css/message.css
@@ -1,49 +1,70 @@
 @charset "utf-8";
 
-@font-face{font-family:NG;src:url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')}
-body, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif;font-size:13px}
-@media all and (max-width:980px){
-body, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}
+#access{
+	width: 360px;
+	margin: 40px auto;
+	background-color: #f9f9f9;
+	border: 1px solid #d8d8d8;
+	border-radius: 0;
+	box-shadow: none;
+	box-sizing: initial;
+	font-family: NanumBarunGothic, 'Malgun Gothic', Dotum, 'Apple SD Gothic Neo', AppleGothic, Arial, sans-serif;
+	-webkit-font-smoothing: antialiased;
+	box-shadow: 0 2px 3px #eee;
+}
+@media screen and (max-width: 480px) {
+	#access { width: 300px; }
 }
-#access{width:400px;margin:30px auto;background-color:#ffffff;border:1px solid #999;border-radius:6px;box-shadow:0 3px 7px #ccc;box-sizing:border-box}
-#access>.login-header{padding:9px 15px;border-bottom:1px solid #eee}
-#access>.login-header>h1{margin:0;font-size:16px;line-height:1.4;font-weight:600;color:#666}
-#access>.login-header>h1>i{opacity:.5;filter:alpha(opacity=50);margin:2px 0 0 0}
-#access>.login-body{max-height:400px;padding:15px}
-#access>.login-body>*:first-child{margin-top:0}
-#access>.login-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff; color:#ccc}
-#access .control-group{position:relative;padding:0 14px 0 0;margin:0;clear:both}
-#access .control-group:before{content:"";display:block;clear:both}
-#access form{margin:0}
-#access fieldset{margin:0}
-#access label{cursor:pointer;display:inline-block}
-#access input[type="text"],
-#access input[type="email"],
-#access input[type="password"]{width:100%}
-#access input[type="checkbox"]{margin:0}
-#access .btn{border-radius:2px;overflow:visible;font-size:14px;line-height:18px;height:auto;padding:3px 9px;text-decoration:none}
-#access .submit{position:absolute;top:0;right:0}
-#access p{margin:10px 0}
-#access #warning{margin-right:-14px}
-#access a{color: #0088cc;text-decoration: none;}
 
-/* Message customize */
-#access{width:380px;background-color:#f9f9f9;border:1px solid #d8d8d8;border-radius:0;box-shadow:none;box-sizing:initial;font-family:'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;-webkit-font-smoothing:antialiased;box-shadow: 0 2px 3px #eee}
-#access>.login-header{padding:30px 30px 24px;border-bottom:0}
-#access>.login-header p{margin:0 0 50px;font-size:40px;font-weight:normal;color:#444;line-height:50px;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,AppleGothic,Helvetica,sans-serif}
-#access>.login-header h1{margin:10px 0;font-size:16px;line-height:20px;color:#f44336;font-weight:normal}
-#access>.login-body{padding:20px 30px 0}
-#access>.login-body a{display:block;height:54px;background-color:#444;font-size:16px;line-height:54px;text-align:center;color:#eee}
-#access>.login-body a:hover,
-#access>.login-body a:focus,
-#access>.login-body a:active{background-color:#333}
-#access>.login-footer{padding:13px 0 42px;margin:30px 30px 0;text-align:center;border-top:0;border-radius:0;box-shadow:none;background:none;color:#888}
-#access>.login-footer>a{text-decoration:none;font-size:13px;color:#aaa}
-#access>.login-footer>a:hover,
-#access>.login-footer>a:active,
-#access>.login-footer>a:focus{text-decoration:underline}
-#access>.login-footer>.bar{display:inline-block;margin:0 8px;color:#aaa}
+#access .login-header { margin: 30px; padding: 0; }
+#access .login-header h1 { margin: 0; padding: 0; font-size: 16px; line-height: 20px; color:#f44336; font-weight:normal; }
 
-@media all and (max-width:480px){
-    #access{position:static;margin:0;width:100%}
-}
\ No newline at end of file
+#access .login-body { margin: 30px; padding: 0; }
+#access .login-body p { margin: 0; padding: 0; }
+#access .login-body form { margin: 0; padding: 0; }
+#access input[type=text], #access input[type=email], #access input[type=password] {
+	font-family: Arial, NanumBarunGothic, 'Malgun Gothic', Dotum, 'Apple SD Gothic Neo', AppleGothic, sans-serif;
+	font-size: 13px;
+	line-height: 17px;
+	width: 100%;
+	box-sizing: border-box;
+	border: 1px solid #aaa;
+	background: #fff;
+	padding: 6px;
+	margin-bottom: 8px;
+}
+#access input[type=checkbox] { margin: 0 4px 0 0; position: relative; top: 2px; }
+
+#access .login-body .control-group { margin-bottom: 16px; }
+#access .login-body a.button {
+	line-height: 54px;
+}
+#access .login-body .button {
+	display: block;
+	width: 100%;
+	height: 54px;
+	border: 0;
+	background-color: #444;
+	font-size: 16px;
+	font-family: inherit;
+	text-align: center;
+	text-decoration: none;
+	color: #eee;
+}
+#access .login-body .button:hover,
+#access .login-body .button:focus,
+#access .login-body .button:active {
+	background-color: #222;
+}
+
+#access .login-footer {
+	margin: 30px;
+	text-align: center;
+	border-top: 0;
+	color: #888;
+}
+#access .login-footer>a{text-decoration:none;font-size:13px;color:#888}
+#access .login-footer>a:hover,
+#access .login-footer>a:active,
+#access .login-footer>a:focus{text-decoration:underline}
+#access .login-footer>.bar{display:inline-block;margin:0 8px;color:#aaa}
diff --git a/modules/message/skins/xedition/system_message.html b/modules/message/skins/xedition/system_message.html
index dd9fccce5..e9d8e181c 100644
--- a/modules/message/skins/xedition/system_message.html
+++ b/modules/message/skins/xedition/system_message.html
@@ -1,20 +1,42 @@
-<!--// META -->
-{Context::addHtmlHeader('<meta name="viewport" content="width=1240">')}
 <!--// CSS -->
 <load target="./css/message.css" />
 
 <!--// BODY -->
 <div id="access">
 	<div class="login-header">
-		<p>OOPS!</p>
 		<h1>{$system_message}</h1>
 	</div>
-	<div class="login-body">
-		<p><a href="{getUrl('', 'act', 'dispMemberLoginForm')}">{$lang->cmd_login}</a></p>
+	<div cond="!$is_logged">
+		<div class="login-body">
+			<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/message/skins/default/system_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form id="message_login_form" ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post">
+				<input type="hidden" name="module" value="member" />
+				<input type="hidden" name="act" value="procMemberLogin" />
+				<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+				<input type="hidden" name="xe_validator_id" value="modules/message/skins/default/system_message/1" />
+				<div class="control-group">
+					<input type="text" name="user_id" id="uid" title="{$lang->user_id}" placeholder="{$lang->user_id}" required autofocus cond="$member_config->identifier != 'email_address'" />
+					<input type="email" name="user_id" id="uid" title="{$lang->email_address}" placeholder="{$lang->email_address}" required autofocus cond="$member_config->identifier == 'email_address'" />
+					<input type="password" name="password" id="upw" title="{$lang->password}" placeholder="{$lang->password}" required />
+					<label for="keepid">
+						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()&gt;0?'addClass':'removeClass')]('open');" />						
+						{$lang->keep_signed}
+					</label>
+				</div>
+				<p><button type="submit" class="button" href="#" onclick="$('#message_login_form').submit()">{$lang->cmd_login}</button></p>
+			</form>
+		</div>
+		<div class="login-footer">
+			<a href="{getUrl('', 'act', 'dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a>
+			<span class="bar">|</span>
+			<a href="{getUrl('', 'act', 'dispMemberSignUpForm')}">{$lang->cmd_signup}</a>
+		</div>
 	</div>
-	<div class="login-footer">
-		<a href="{getUrl('', 'act', 'dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a>
-		<span class="bar">|</span>
-		<a href="{getUrl('', 'act', 'dispMemberSignUpForm')}">{$lang->cmd_signup}</a>
+	<div cond="$is_logged">
+		<div class="login-body">
+			<p><a class="button" href="{getUrl()}">{$lang->cmd_back}</a></p>
+		</p>
 	</div>
 </div>