diff --git a/adm/config_form.php b/adm/config_form.php
index 68724f9cc..62a9c2ff7 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -1020,7 +1020,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
|
-
+ |
>
@@ -1034,7 +1034,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
@@ -1068,7 +1067,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
|
|
- 앱 등록하기
+ 앱 등록하기
|
|
diff --git a/adm/css/admin.css b/adm/css/admin.css
index 5dc1a56ae..a2071f79f 100644
--- a/adm/css/admin.css
+++ b/adm/css/admin.css
@@ -622,6 +622,8 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
.pg_end {background:url(../img/page_4.png) 50% 50% no-repeat;width:32px;text-indent:-999px;overflow:hidden}
.pg_current {display:inline-block;background:#3f51b5;color:#fff;font-weight:normal}
+.social_config_explain p{padding-bottom:10px}
+
/* social member_list.php member_form.php */
.sns-icon .ico {display:inline-block;background:url('../img/social/sns_logo.png') no-repeat;vertical-align:top}
.sns-icon .txt {position:absolute;line-height:0;font-size:0;vertical-align:middle;overflow:hidden}
diff --git a/adm/thumbnail_file_delete.php b/adm/thumbnail_file_delete.php
index 3b5ea0bd5..47f40c918 100644
--- a/adm/thumbnail_file_delete.php
+++ b/adm/thumbnail_file_delete.php
@@ -19,6 +19,10 @@ include_once('./admin.head.php');
$directory = array();
$dl = array('file', 'editor');
+if( defined('G5_YOUNGCART_VER') ){
+ $dl[] = 'item';
+}
+
foreach($dl as $val) {
if($handle = opendir(G5_DATA_PATH.'/'.$val)) {
while(false !== ($entry = readdir($handle))) {
diff --git a/img/no_img.png b/img/no_img.png
new file mode 100644
index 000000000..96751aeb8
Binary files /dev/null and b/img/no_img.png differ
diff --git a/mobile/skin/social/remodal/remodal-default-theme.css b/js/remodal/remodal-default-theme.css
similarity index 100%
rename from mobile/skin/social/remodal/remodal-default-theme.css
rename to js/remodal/remodal-default-theme.css
diff --git a/mobile/skin/social/remodal/remodal.css b/js/remodal/remodal.css
similarity index 100%
rename from mobile/skin/social/remodal/remodal.css
rename to js/remodal/remodal.css
diff --git a/mobile/skin/social/remodal/remodal.js b/js/remodal/remodal.js
similarity index 100%
rename from mobile/skin/social/remodal/remodal.js
rename to js/remodal/remodal.js
diff --git a/mobile/skin/social/social_register_member.skin.php b/mobile/skin/social/social_register_member.skin.php
index 1703423bf..e0a150434 100644
--- a/mobile/skin/social/social_register_member.skin.php
+++ b/mobile/skin/social/social_register_member.skin.php
@@ -6,10 +6,10 @@ if( ! $config['cf_social_login_use']) { //소셜 로그인을 사용하지
}
// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
-add_stylesheet('', 11);
-add_stylesheet('', 12);
+add_stylesheet('', 11);
+add_stylesheet('', 12);
add_stylesheet('', 13);
-add_javascript('', 10);
+add_javascript('', 10);
$email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.다른 이메일을 입력해 주세요.' : '';
?>
@@ -76,10 +76,14 @@ $email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.
+
+
- 혹시 기존 회원이신가요?
+ 혹시 기존 회원이신가요?
|