From a72b34adf61785ed03a8a3b179999b4a31a5793d Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 10 Nov 2017 18:45:26 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A6=AC=EB=89=B4=EC=96=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 5 +- adm/css/admin.css | 2 + adm/thumbnail_file_delete.php | 4 + img/no_img.png | Bin 0 -> 991 bytes .../remodal/remodal-default-theme.css | 0 .../skin/social => js}/remodal/remodal.css | 0 {mobile/skin/social => js}/remodal/remodal.js | 0 .../social/social_register_member.skin.php | 19 +- .../social/social_u_register_form.skin.php | 54 +- mobile/skin/social/style.css | 43 +- skin/social/remodal/remodal-default-theme.css | 242 ------ skin/social/remodal/remodal.css | 80 -- skin/social/remodal/remodal.js | 776 ------------------ skin/social/social_register_member.skin.php | 10 +- skin/social/social_u_register_form.skin.php | 62 +- skin/social/style.css | 35 +- .../skin/latest/pic_basic/latest.skin.php | 5 +- 17 files changed, 145 insertions(+), 1192 deletions(-) create mode 100644 img/no_img.png rename {mobile/skin/social => js}/remodal/remodal-default-theme.css (100%) rename {mobile/skin/social => js}/remodal/remodal.css (100%) rename {mobile/skin/social => js}/remodal/remodal.js (100%) delete mode 100644 skin/social/remodal/remodal-default-theme.css delete mode 100644 skin/social/remodal/remodal.css delete mode 100644 skin/social/remodal/remodal.js 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']) {

카카오 웹 Redirect Path

-

@@ -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 0000000000000000000000000000000000000000..96751aeb886da7969255a0a4bbe3d1a02b0629f5 GIT binary patch literal 991 zcmeAS@N?(olHy`uVBq!ia0vp^$AEYe2NRH-_)O_FkYX$ja(7}_cTVOdki(Mh=*OhOzddB?Y$}$U)v-up;s17~zh4;xCn@;^wRmU;A=<+0P}<9$vj_*ZX-v+4?rqzG{zGWw-yua8>5a<(H1Ds5aUx43s)}xTfAY7+^v;w)3l%LUBl=9=6Y`Fss}gf`IhYcT57aheckI< zp1O~vkJZep`1noHr9Tn=Dg?o z{ce4zQkeYkim(5wb=#l*{l3p^&w?2F>7S#gmHYj@ax^ou{NIPwKR7*kFUua=3_>LGNL|Hdyeh(HhO$o2@bM+D)_%Ibr*NU{ zSCcCrH_W@U;b~2LP<*CbUEp-HTBF+3PgwULh-_zOMa{y{0R_| fQ96G8_`$uZ?fVqzN){<#reyGR^>bP0l+XkK?NY&% literal 0 HcmV?d00001 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 ? '등록할 이메일이 중복되었습니다. + +
-

혹시 기존 회원이신가요?

+

혹시 기존 회원이신가요?