').addClass(namespacify('overlay') + ' ' + namespacify('is', STATES.CLOSED)).hide();
+ $appendTo.append(remodal.$overlay);
+ }
+
+ remodal.$bg = $('.' + namespacify('bg')).addClass(namespacify('is', STATES.CLOSED));
+
+ remodal.$modal = $modal
+ .addClass(
+ NAMESPACE + ' ' +
+ namespacify('is-initialized') + ' ' +
+ remodal.settings.modifier + ' ' +
+ namespacify('is', STATES.CLOSED))
+ .attr('tabindex', '-1');
+
+ remodal.$wrapper = $('
')
+ .addClass(
+ namespacify('wrapper') + ' ' +
+ remodal.settings.modifier + ' ' +
+ namespacify('is', STATES.CLOSED))
+ .hide()
+ .append(remodal.$modal);
+ $appendTo.append(remodal.$wrapper);
+
+ // Add the event listener for the close button
+ remodal.$wrapper.on('click.' + NAMESPACE, '[data-' + PLUGIN_NAME + '-action="close"]', function(e) {
+ e.preventDefault();
+
+ remodal.close();
+ });
+
+ // Add the event listener for the cancel button
+ remodal.$wrapper.on('click.' + NAMESPACE, '[data-' + PLUGIN_NAME + '-action="cancel"]', function(e) {
+ e.preventDefault();
+
+ remodal.$modal.trigger(STATE_CHANGE_REASONS.CANCELLATION);
+
+ if (remodal.settings.closeOnCancel) {
+ remodal.close(STATE_CHANGE_REASONS.CANCELLATION);
+ }
+ });
+
+ // Add the event listener for the confirm button
+ remodal.$wrapper.on('click.' + NAMESPACE, '[data-' + PLUGIN_NAME + '-action="confirm"]', function(e) {
+ e.preventDefault();
+
+ remodal.$modal.trigger(STATE_CHANGE_REASONS.CONFIRMATION);
+
+ if (remodal.settings.closeOnConfirm) {
+ remodal.close(STATE_CHANGE_REASONS.CONFIRMATION);
+ }
+ });
+
+ // Add the event listener for the overlay
+ remodal.$wrapper.on('click.' + NAMESPACE, function(e) {
+ var $target = $(e.target);
+
+ if (!$target.hasClass(namespacify('wrapper'))) {
+ return;
+ }
+
+ if (remodal.settings.closeOnOutsideClick) {
+ remodal.close();
+ }
+ });
+ }
+
+ /**
+ * Opens a modal window
+ * @public
+ */
+ Remodal.prototype.open = function() {
+ var remodal = this;
+ var id;
+
+ // Check if the animation was completed
+ if (remodal.state === STATES.OPENING || remodal.state === STATES.CLOSING) {
+ return;
+ }
+
+ id = remodal.$modal.attr('data-' + PLUGIN_NAME + '-id');
+
+ if (id && remodal.settings.hashTracking) {
+ scrollTop = $(window).scrollTop();
+ location.hash = id;
+ }
+
+ if (current && current !== remodal) {
+ halt(current);
+ }
+
+ current = remodal;
+ lockScreen();
+ remodal.$bg.addClass(remodal.settings.modifier);
+ remodal.$overlay.addClass(remodal.settings.modifier).show();
+ remodal.$wrapper.show().scrollTop(0);
+ remodal.$modal.focus();
+
+ syncWithAnimation(
+ function() {
+ setState(remodal, STATES.OPENING);
+ },
+
+ function() {
+ setState(remodal, STATES.OPENED);
+ },
+
+ remodal);
+ };
+
+ /**
+ * Closes a modal window
+ * @public
+ * @param {String} reason
+ */
+ Remodal.prototype.close = function(reason) {
+ var remodal = this;
+
+ // Check if the animation was completed
+ if (remodal.state === STATES.OPENING || remodal.state === STATES.CLOSING || remodal.state === STATES.CLOSED) {
+ return;
+ }
+
+ if (
+ remodal.settings.hashTracking &&
+ remodal.$modal.attr('data-' + PLUGIN_NAME + '-id') === location.hash.substr(1)
+ ) {
+ location.hash = '';
+ $(window).scrollTop(scrollTop);
+ }
+
+ syncWithAnimation(
+ function() {
+ setState(remodal, STATES.CLOSING, false, reason);
+ },
+
+ function() {
+ remodal.$bg.removeClass(remodal.settings.modifier);
+ remodal.$overlay.removeClass(remodal.settings.modifier).hide();
+ remodal.$wrapper.hide();
+ unlockScreen();
+
+ setState(remodal, STATES.CLOSED, false, reason);
+ },
+
+ remodal);
+ };
+
+ /**
+ * Returns a current state of a modal
+ * @public
+ * @returns {STATES}
+ */
+ Remodal.prototype.getState = function() {
+ return this.state;
+ };
+
+ /**
+ * Destroys a modal
+ * @public
+ */
+ Remodal.prototype.destroy = function() {
+ var lookup = $[PLUGIN_NAME].lookup;
+ var instanceCount;
+
+ halt(this);
+ this.$wrapper.remove();
+
+ delete lookup[this.index];
+ instanceCount = $.grep(lookup, function(instance) {
+ return !!instance;
+ }).length;
+
+ if (instanceCount === 0) {
+ this.$overlay.remove();
+ this.$bg.removeClass(
+ namespacify('is', STATES.CLOSING) + ' ' +
+ namespacify('is', STATES.OPENING) + ' ' +
+ namespacify('is', STATES.CLOSED) + ' ' +
+ namespacify('is', STATES.OPENED));
+ }
+ };
+
+ /**
+ * Special plugin object for instances
+ * @public
+ * @type {Object}
+ */
+ $[PLUGIN_NAME] = {
+ lookup: []
+ };
+
+ /**
+ * Plugin constructor
+ * @constructor
+ * @param {Object} options
+ * @returns {JQuery}
+ */
+ $.fn[PLUGIN_NAME] = function(opts) {
+ var instance;
+ var $elem;
+
+ this.each(function(index, elem) {
+ $elem = $(elem);
+
+ if ($elem.data(PLUGIN_NAME) == null) {
+ instance = new Remodal($elem, opts);
+ $elem.data(PLUGIN_NAME, instance.index);
+
+ if (
+ instance.settings.hashTracking &&
+ $elem.attr('data-' + PLUGIN_NAME + '-id') === location.hash.substr(1)
+ ) {
+ instance.open();
+ }
+ } else {
+ instance = $[PLUGIN_NAME].lookup[$elem.data(PLUGIN_NAME)];
+ }
+ });
+
+ return instance;
+ };
+
+ $(document).ready(function() {
+
+ // data-remodal-target opens a modal window with the special Id
+ $(document).on('click', '[data-' + PLUGIN_NAME + '-target]', function(e) {
+ e.preventDefault();
+
+ var elem = e.currentTarget;
+ var id = elem.getAttribute('data-' + PLUGIN_NAME + '-target');
+ var $target = $('[data-' + PLUGIN_NAME + '-id="' + id + '"]');
+
+ $[PLUGIN_NAME].lookup[$target.data(PLUGIN_NAME)].open();
+ });
+
+ // Auto initialization of modal windows
+ // They should have the 'remodal' class attribute
+ // Also you can write the `data-remodal-options` attribute to pass params into the modal
+ $(document).find('.' + NAMESPACE).each(function(i, container) {
+ var $container = $(container);
+ var options = $container.data(PLUGIN_NAME + '-options');
+
+ if (!options) {
+ options = {};
+ } else if (typeof options === 'string' || options instanceof String) {
+ options = parseOptions(options);
+ }
+
+ $container[PLUGIN_NAME](options);
+ });
+
+ // Handles the keydown event
+ $(document).on('keydown.' + NAMESPACE, function(e) {
+ if (current && current.settings.closeOnEscape && current.state === STATES.OPENED && e.keyCode === 27) {
+ current.close();
+ }
+ });
+
+ // Handles the hashchange event
+ $(window).on('hashchange.' + NAMESPACE, handleHashChangeEvent);
+ });
+});
diff --git a/theme/basic/skin/social/social_login_icon.skin.php b/mobile/skin/social/social_login.skin.php
similarity index 100%
rename from theme/basic/skin/social/social_login_icon.skin.php
rename to mobile/skin/social/social_login.skin.php
diff --git a/mobile/skin/social/social_member_form.skin.php b/mobile/skin/social/social_member_form.skin.php
deleted file mode 100644
index 8703b06e6..000000000
--- a/mobile/skin/social/social_member_form.skin.php
+++ /dev/null
@@ -1,164 +0,0 @@
-', 10);
-?>
-
-
- 소셜로그인
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mobile/skin/social/social_login_icon.skin.php b/mobile/skin/social/social_outlogin.skin.1.php
similarity index 99%
rename from mobile/skin/social/social_login_icon.skin.php
rename to mobile/skin/social/social_outlogin.skin.1.php
index 6fe68667d..e79fab162 100644
--- a/mobile/skin/social/social_login_icon.skin.php
+++ b/mobile/skin/social/social_outlogin.skin.1.php
@@ -10,8 +10,9 @@ $social_pop_once = false;
$self_url = G5_BBS_URL."/login.php";
//새창을 사용한다면
-if( G5_SOCIAL_USE_POPUP )
+if( G5_SOCIAL_USE_POPUP ) {
$self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
+}
add_stylesheet('
', 10);
?>
diff --git a/theme/basic/skin/social/register_social.skin.php b/mobile/skin/social/social_register.skin.php
similarity index 100%
rename from theme/basic/skin/social/register_social.skin.php
rename to mobile/skin/social/social_register.skin.php
diff --git a/mobile/skin/social/social_register_member.skin.php b/mobile/skin/social/social_register_member.skin.php
new file mode 100644
index 000000000..8c9d2ecaf
--- /dev/null
+++ b/mobile/skin/social/social_register_member.skin.php
@@ -0,0 +1,194 @@
+', 11);
+add_stylesheet('
', 12);
+add_stylesheet('
', 13);
+add_javascript('', 10);
+
+$email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.다른 이메일을 입력해 주세요.' : '';
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
혹시 기존 회원이신가요?
+
+ 기존 계정에 연결하기
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/theme/basic/skin/social/social_member_form.skin.php b/mobile/skin/social/social_u_register_form.skin.php
similarity index 100%
rename from theme/basic/skin/social/social_member_form.skin.php
rename to mobile/skin/social/social_u_register_form.skin.php
diff --git a/mobile/skin/social/style.css b/mobile/skin/social/style.css
index 627e827fe..a2b110e80 100644
--- a/mobile/skin/social/style.css
+++ b/mobile/skin/social/style.css
@@ -1,60 +1,13 @@
@charset "utf-8";
-/* LOGIN WRAP */
-#mb_login {margin:0 auto;padding:100px 0;max-width:500px}
-#mb_login h1 {margin:0 0 20px;font-size:1.3em}
-#mb_login h2 {margin:0}
-#mb_login p {padding:10px 0;line-height:1.5em}
-#mb_login #login_fs {position:relative;margin:0;padding:20px 20px 20px 95px;border:1px solid #cfded8;border-bottom:0;background:#fff}
-#mb_login #login_fs legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
-#mb_login #login_fs label {letter-spacing:-0.1em}
-#mb_login #login_fs .login_id {position:absolute;top:26px;left:95px}
-#mb_login #login_fs .login_pw {position:absolute;top:52px;left:95px}
-#mb_login #login_fs .frm_input {display:block;margin:0 0 5px 80px;width:162px}
-#mb_login #login_fs .btn_submit {position:absolute;top:20px;right:95px;width:60px;height:53px}
-#mb_login #login_info {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f5f6fa}
-#mb_login #login_info div {text-align:right}
-
-#mb_login_notmb {position:relative;margin:0 0 20px;padding:20px;border:1px solid #cfded8;background:#fff}
-#mb_login_notmb #guest_privacy {margin:0 0 10px;padding:10px;height:150px;border:1px solid #e9e9e9;overflow:auto}
-#mb_login_notmb .btn_confirm {padding:10px 0 0}
-
-#mb_login_od {position:relative;margin:0;padding:20px 20px 20px 95px;border:1px solid #cfded8;border-bottom:0;background:#fff}
-#mb_login_od legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#mb_login_od label {letter-spacing:-0.1em}
-#mb_login_od .od_id {position:absolute;top:26px;left:95px}
-#mb_login_od .od_pwd {position:absolute;top:52px;left:95px}
-#mb_login_od .frm_input {display:block;margin:0 0 5px 80px}
-#mb_login_od .btn_submit {position:absolute;top:20px;left:335px;width:52px;height:49px}
-#mb_login_odinfo {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f5f6fa}
-#mb_login_odinfo div {text-align:right}
-
.social_info_guide{background:#f3f3f3;border:1px solid #ddd;margin:0 10px 10px;padding:10px 15px;line-height:1.5em}
.bg-warning{margin:0 10px 10px;padding:10px 15px;line-height:1.5em}
.bg-warning1{background:#f7dfe4;border:1px solid #eac3cb}
.bg-warning2{background:#deeabf;border:1px solid #bde498}
.bg-warning3{background:#fff8dc;border:1px solid #f1e4b2}
-/* LOGIN WRAP 640px*/
-@media screen and (max-width: 40.000em){
- #mb_login {margin:0 auto;padding:20px 0;}
- #mb_login h1 {margin:0 0 15px;padding:0 10px;}
-
- #mb_login #login_fs {padding:10px;}
- #mb_login #login_fs .login_id,
- #mb_login #login_fs .login_pw {display:block;position:inherit;top:0px;left:0}
- #mb_login #login_fs .frm_input {margin:0 0 5px 0;width:60%}
- #mb_login #login_fs .btn_submit {top:24px;right:10px;width:35%;height:67px}
-
- #mb_login_notmb {margin:30px 0;padding:15px 10px;border:1px solid #cfded8;background:#f7f7f7}
- #mb_login_notmb .btn_confirm {margin:20px 0 0;text-align:right}
-
- #mb_login_od {margin:20px 5px;}
- #mb_login_od .frm_input {margin-bottom:5px;padding:0;width:80%;height:1.8em;line-height:1.8em}
- #mb_login_od .btn_submit {position:absolute;top:0;right:0;padding:0 !important;width:18%;height:4em !important;text-align:center}
-}
-
/* SNS LOGIN */
+.login-sns{padding-bottom:10px;border:1px solid #cfded8;border-bottom:none}
.sns-wrap {margin:10px 0 0;text-align:center}
.sns-icon {display:inline-block;vertical-align:middle;text-decoration:none}
.sns-icon:hover {text-decoration:none}
@@ -97,4 +50,50 @@
/* SNS by SIZE */
.sns-wrap-32 .sns-icon {border-width:1px;border-style:solid;overflow:hidden;margin:0 1px}
.sns-wrap-32 .sns-icon .txt {display:inline-block;margin:0 10px 0 0;font-size:0.95em;letter-spacing:-0.1em}
-.sns-wrap-32 .sns-icon .ico {width:24px;height:24px}
\ No newline at end of file
+.sns-wrap-32 .sns-icon .ico {width:24px;height:24px}
+
+/* LOGIN LOADING */
+.social-login-loading{width:100%;height:auto;text-align:center}
+.social-login-loading p{display:inline-block;margin-top:10px;padding:40px 0 0;line-height:30px}
+
+/*기존 계정에 연결하기*/
+
+/* Styles for Accordion */
+.mbskin .toggle:last-child{border-bottom:1px solid #ddd}
+.mbskin .toggle .toggle-title{position:relative;display:block;border-top:1px solid #ddd;margin-bottom:6px}
+.mbskin .toggle .toggle-title h3{font-size:20px;margin:0;line-height:1;cursor:pointer;font-weight:200}
+.mbskin .toggle .toggle-inner{padding:7px 25px 10px 25px;display:none;margin:-7px 0 6px}
+.mbskin .toggle .toggle-inner div{max-width:100%}
+.mbskin .toggle .toggle-title .title-name{display:block;padding:25px 25px 14px}
+.mbskin .right_i{position:absolute;margin:20px;right:0}
+.mbskin .toggle .toggle-title .right_i i{background:url("http://arielbeninca.com/Storage/plus_minus.png") 0 -24px no-repeat;width:24px;height:24px;display:inline-block;vertical-align:middle}
+.mbskin .toggle .toggle-title.active .right_i i{background:url("http://arielbeninca.com/Storage/plus_minus.png") 0 0 no-repeat}
+
+#fregisterform .btn_confirm{text-align:left}
+#fregisterform .btn_confirm .btn_submit{height:45px;;padding:0 30px;font-weight:bold;font-size:1.083em}
+#fregisterform .btn_confirm .btn_cancel{line-height:45px;height:45px;padding:0 30px;font-weight:bold;font-size:1.083em}
+
+#sns-link-pnl.remodal{border-radius:5px}
+#sns-link-pnl .connect-close {position:absolute;top:10px;right:10px;margin:0;padding:0;width:30px;height:30px;border:1px solid #dcdcdc;border-radius:30px;background:transparent;color:#383838;cursor:pointer}
+#sns-link-pnl .connect-close:hover {border-color:#ff5191;background:#f7f7f7;color:#ff5191}
+#sns-link-pnl .connect-close .fa {margin:0 0 0 1px}
+#sns-link-pnl .connect-close .txt {position:absolute;line-height:0;font-size:0;overflow:hidden}
+
+#sns-link-pnl #login_fs{margin:0 auto;width:100%;text-align:left}
+#sns-link-pnl #login_fs label{display:block;display: block;font-size: 0.93em;color: #7a7a7a;margin: 5px 0;}
+#sns-link-pnl #login_fs .lg_id,#sns-link-pnl #login_fs .lg_pw{width:100%;margin-bottom:5px;}
+#sns-link-pnl #login_id,#sns-link-pnl #login_pw{margin-left: 45px;border: none;font-size: 1.167em;height: 36px;line-height: 36px;border: transparent;outline: none;width:212px;background:none}
+#sns-link-pnl #login_fs .login_submit{background: url('./img/btn_p.jpg') 50% 50% no-repeat;width: 260px;height: 44px;border: none;color: #fff;font-size:1.167em;margin:10px auto 0;font-weight:bold;cursor:pointer;display:block;}
+#sns-link-pnl .connect-fg {height:320px;text-align:left}
+#sns-link-pnl .login_fs {margin:0 auto;width:260px}
+#sns-link-pnl .connect-fg .connect-desc {margin:0 0 10px;padding:15px;border:1px solid #ededed;background:#f7f7f7}
+#sns-link-pnl .lg_id{background:#fff;border:1px solid #e6e6e6;width:258px;height:36px;background:url('./img/login_id.jpg') 10px 50% no-repeat #fff !important;display:inline-block}
+#sns-link-pnl .lg_pw{background:#fff;border:1px solid #e6e6e6;width:258px;height:36px;background:url('./img/login_pw.jpg') 10px 50% no-repeat #fff !important;display:inline-block}
+#sns-link-pnl .connect-fg .connect-title {margin-top:25px;margin-bottom:10px;font-size:1.667em;font-weight:normal;text-align:center}
+
+.mbskin .member_connect{margin-top:1em}
+
+html.remodal-is-locked {overflow-y:scroll !important}
+@media only screen and (min-width: 641px) {
+ #sns-link-pnl.remodal{max-width:400px}
+}
\ No newline at end of file
diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php
index 230474d78..5f3b5d740 100644
--- a/plugin/social/includes/functions.php
+++ b/plugin/social/includes/functions.php
@@ -17,11 +17,11 @@ function get_social_skin_path(){
$theme_path = G5_PATH.'/'.G5_THEME_DIR.'/'.$cf_theme;
if(G5_IS_MOBILE) {
- $skin_path = $theme_path.'/'.G5_MOBILE_DIR.'/'.G5_SKIN_DIR.'/'.$dir.'/';
+ $skin_path = $theme_path.'/'.G5_MOBILE_DIR.'/'.G5_SKIN_DIR.'/'.$dir;
if(!is_dir($skin_path))
- $skin_path = $theme_path.'/'.G5_SKIN_DIR.'/'.$dir.'/';
+ $skin_path = $theme_path.'/'.G5_SKIN_DIR.'/'.$dir;
} else {
- $skin_path = $theme_path.'/'.G5_SKIN_DIR.'/'.$dir.'/';
+ $skin_path = $theme_path.'/'.G5_SKIN_DIR.'/'.$dir;
}
}
@@ -772,7 +772,7 @@ function social_login_link_account($mb_id, $is_buffer=false, $is_type=''){
if( G5_SOCIAL_USE_POPUP )
$self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
- include(get_social_skin_path().'/social_member_form.skin.php');
+ include(get_social_skin_path().'/social_u_register_form.skin.php');
}
$html = ob_get_clean();
diff --git a/plugin/social/register_member.php b/plugin/social/register_member.php
index db5725c22..c1ea1dbee 100644
--- a/plugin/social/register_member.php
+++ b/plugin/social/register_member.php
@@ -46,7 +46,7 @@ $req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) &
$required = ($w=='') ? 'required' : '';
$readonly = ($w=='u') ? 'readonly' : '';
-include_once(G5_SOCIAL_SKIN_PATH.'/social_register_member.skin.php');
+include_once(get_social_skin_path().'/social_register_member.skin.php');
include_once(G5_BBS_PATH.'/_tail.php');
?>
diff --git a/skin/outlogin/basic/outlogin.skin.1.php b/skin/outlogin/basic/outlogin.skin.1.php
index d2661cdd4..b71950346 100644
--- a/skin/outlogin/basic/outlogin.skin.1.php
+++ b/skin/outlogin/basic/outlogin.skin.1.php
@@ -27,6 +27,11 @@ add_stylesheet('
'
정보찾기
+
+
diff --git a/theme/basic/mobile/skin/social/social_login_icon.skin.php b/skin/social/social_outlogin.skin.1.php
similarity index 99%
rename from theme/basic/mobile/skin/social/social_login_icon.skin.php
rename to skin/social/social_outlogin.skin.1.php
index 6fe68667d..e79fab162 100644
--- a/theme/basic/mobile/skin/social/social_login_icon.skin.php
+++ b/skin/social/social_outlogin.skin.1.php
@@ -10,8 +10,9 @@ $social_pop_once = false;
$self_url = G5_BBS_URL."/login.php";
//새창을 사용한다면
-if( G5_SOCIAL_USE_POPUP )
+if( G5_SOCIAL_USE_POPUP ) {
$self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
+}
add_stylesheet('
', 10);
?>
diff --git a/skin/social/social_register_member.skin.php b/skin/social/social_register_member.skin.php
index 800cc8db4..8c9d2ecaf 100644
--- a/skin/social/social_register_member.skin.php
+++ b/skin/social/social_register_member.skin.php
@@ -82,26 +82,26 @@ $email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.