diff --git a/adm/admin.head.php b/adm/admin.head.php index b9ead96db..c175f62f3 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -24,8 +24,7 @@ function print_menu2($key, $no) if ($is_admin != 'super' && (!array_key_exists($menu[$key][$i][0],$auth) || !strstr($auth[$menu[$key][$i][0]], 'r'))) continue; - if ($menu[$key][$i][4] == 1 && $gnb_grp_style == false) $gnb_grp_div = 'gnb_grp_div'; - else if ($menu[$key][$i][4] != 1 && $gnb_grp_style == true) $gnb_grp_div = 'gnb_grp_div'; + if (($menu[$key][$i][4] == 1 && $gnb_grp_style == false) || ($menu[$key][$i][4] != 1 && $gnb_grp_style == true)) $gnb_grp_div = 'gnb_grp_div'; else $gnb_grp_div = ''; if ($menu[$key][$i][4] == 1) $gnb_grp_style = 'gnb_grp_style'; diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php index 217dfe9c3..2462f8870 100644 --- a/adm/admin.menu100.php +++ b/adm/admin.menu100.php @@ -3,6 +3,7 @@ $menu['menu100'] = array ( array('100000', '환경설정', G5_ADMIN_URL.'/config_form.php', 'config'), array('', '기본환경설정', G5_ADMIN_URL.'/config_form.php', 'cf_basic'), array('', '관리권한설정', G5_ADMIN_URL.'/auth_list.php', 'cf_auth'), + array('', '메뉴설정', G5_ADMIN_URL.'/menu_list.php', 'cf_menu', 1), array('100300', '메일 테스트', G5_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'), array('100310', '팝업레이어관리', G5_ADMIN_URL.'/newwinlist.php', 'scf_poplayer'), //array('100400', '버전정보', G5_ADMIN_URL.'/version.php', 'cf_version'), diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index 5636b1cae..b17a19b91 100644 --- a/adm/board_copy_update.php +++ b/adm/board_copy_update.php @@ -88,7 +88,6 @@ $sql = " insert into {$g5['board_table']} bo_upload_size = '{$board[bo_upload_size]}', bo_reply_order = '{$board[bo_reply_order]}', bo_use_search = '{$board[bo_use_search]}', - bo_show_menu = '{$board[bo_show_menu]}', bo_order = '{$board[bo_order]}', bo_notice = '{$board['bo_notice']}', bo_upload_count = '{$board[bo_upload_count]}', diff --git a/adm/board_form.php b/adm/board_form.php index 6e9d2a54c..ecbea30f1 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -21,10 +21,6 @@ if (!isset($board['bo_device'])) { sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_device` ENUM( 'both', 'pc', 'mobile' ) NOT NULL DEFAULT 'both' AFTER `bo_subject` ", false); } -if (!isset($board['bo_show_menu'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_search`, ADD `bo_order` INT NOT NULL DEFAULT '0' AFTER `bo_show_menu` ", false); -} - if (!isset($board['bo_mobile_skin'])) { sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bo_skin` ", false); } @@ -120,7 +116,6 @@ if ($w == '') { $board['bo_use_secret'] = 0; $board['bo_include_head'] = '_head.php'; $board['bo_include_tail'] = '_tail.php'; - $board['bo_show_menu'] = true; } else if ($w == 'u') { @@ -769,20 +764,6 @@ $frm_submit .= ''; - - - - - > - 사용 - - - - - - - - diff --git a/adm/board_form_update.php b/adm/board_form_update.php index 99ff23265..e7c374d0e 100644 --- a/adm/board_form_update.php +++ b/adm/board_form_update.php @@ -107,7 +107,6 @@ $sql_common = " gr_id = '{$_POST['gr_id']}', bo_reply_order = '{$_POST['bo_reply_order']}', bo_use_search = '{$_POST['bo_use_search']}', bo_order = '{$_POST['bo_order']}', - bo_show_menu = '{$_POST['bo_show_menu']}', bo_write_min = '{$_POST['bo_write_min']}', bo_write_max = '{$_POST['bo_write_max']}', bo_comment_min = '{$_POST['bo_comment_min']}', @@ -290,7 +289,6 @@ if (is_checked('chk_grp_mobile_content_tail')) $grp_fields .= " , bo_mob if (is_checked('chk_grp_insert_content')) $grp_fields .= " , bo_insert_content = '{$bo_insert_content}' "; if (is_checked('chk_grp_use_search')) $grp_fields .= " , bo_use_search = '{$bo_use_search}' "; if (is_checked('chk_grp_order')) $grp_fields .= " , bo_order = '{$bo_order}' "; -if (is_checked('chk_grp_show_menu')) $grp_fields .= " , bo_show_menu = '{$bo_show_menu}' "; for ($i=1; $i<=10; $i++) { if (is_checked('chk_grp_'.$i)) { $grp_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' "; @@ -374,7 +372,6 @@ if (is_checked('chk_all_mobile_content_tail')) $all_fields .= " , bo_mob if (is_checked('chk_all_insert_content')) $all_fields .= " , bo_insert_content = '{$bo_insert_content}' "; if (is_checked('chk_all_use_search')) $all_fields .= " , bo_use_search = '{$bo_use_search}' "; if (is_checked('chk_all_order')) $all_fields .= " , bo_order = '{$bo_order}' "; -if (is_checked('chk_all_show_menu')) $all_fields .= " , bo_show_menu = '{$bo_show_menu}' "; for ($i=1; $i<=10; $i++) { if (is_checked('chk_all_'.$i)) { $all_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' "; diff --git a/adm/board_list.php b/adm/board_list.php index 96de20f05..7a9639926 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -51,7 +51,7 @@ $listall = '전체목록
@@ -107,7 +107,6 @@ $colspan = 16; 다운P포인트 SNS
사용 검색
사용 - 메뉴
보임 출력
순서 접속기기 관리 @@ -174,10 +173,6 @@ $colspan = 16; > - - - > - diff --git a/adm/board_list_update.php b/adm/board_list_update.php index 0cf509bd7..9d8850660 100644 --- a/adm/board_list_update.php +++ b/adm/board_list_update.php @@ -39,7 +39,6 @@ if ($_POST['act_button'] == "선택수정") { bo_download_point = '{$_POST['bo_download_point'][$k]}', bo_use_search = '{$_POST['bo_use_search'][$k]}', bo_use_sns = '{$_POST['bo_use_sns'][$k]}', - bo_show_menu = '{$_POST['bo_show_menu'][$k]}', bo_order = '{$_POST['bo_order'][$k]}' where bo_table = '{$_POST['board_table'][$k]}' "; sql_query($sql); diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index 57b71054f..755c26c3c 100644 --- a/adm/boardgroup_form.php +++ b/adm/boardgroup_form.php @@ -26,9 +26,6 @@ if (!isset($group['gr_device'])) { sql_query(" ALTER TABLE `{$g5['group_table']}` ADD `gr_device` ENUM('both','pc','mobile') NOT NULL DEFAULT 'both' AFTER `gr_subject` ", false); } -if (!isset($group['gr_show_menu'])) { - sql_query(" ALTER TABLE `{$g5['group_table']}` ADD `gr_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `gr_use_access`, ADD `gr_order` INT NOT NULL DEFAULT '0' AFTER `gr_show_menu` ", false); -} $g5['title'] = $html_title; include_once('./admin.head.php'); @@ -52,11 +49,11 @@ include_once('./admin.head.php'); - class=" alnum_ frm_input" maxlength="10"> - class=" alnum_ frm_input" maxlength="10"> + 게시판그룹 바로가기'; ?> @@ -112,14 +109,6 @@ include_once('./admin.head.php'); ?> - - - - - > - 사용 - - 여분필드 diff --git a/adm/boardgroup_form_update.php b/adm/boardgroup_form_update.php index 5f55247c5..75af99927 100644 --- a/adm/boardgroup_form_update.php +++ b/adm/boardgroup_form_update.php @@ -17,7 +17,6 @@ if (!$gr_subject) alert('그룹 제목을 입력하세요.'); $sql_common = " gr_subject = '{$_POST['gr_subject']}', gr_device = '{$_POST['gr_device']}', gr_admin = '{$_POST['gr_admin']}', - gr_show_menu = '{$_POST['gr_show_menu']}', gr_1_subj = '{$_POST['gr_1_subj']}', gr_2_subj = '{$_POST['gr_2_subj']}', gr_3_subj = '{$_POST['gr_3_subj']}', @@ -38,7 +37,7 @@ $sql_common = " gr_subject = '{$_POST['gr_subject']}', gr_8 = '{$_POST['gr_8']}', gr_9 = '{$_POST['gr_9']}', gr_10 = '{$_POST['gr_10']}' "; -if (isset($_POST['gr_use_access'])) +if (isset($_POST['gr_use_access'])) $sql_common .= ", gr_use_access = '{$_POST['gr_use_access']}' "; else $sql_common .= ", gr_use_access = '' "; diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php index ff14489dd..c3280883d 100644 --- a/adm/boardgroup_list.php +++ b/adm/boardgroup_list.php @@ -55,7 +55,7 @@ $listall = '처음'; $g5['title'] = '게시판그룹설정'; include_once('./admin.head.php'); -$colspan = 11; +$colspan = 10; ?>
@@ -105,7 +105,6 @@ $colspan = 11; 게시판 접근
사용 접근
회원수 - 메뉴
보임 출력
순서 접속기기 관리 @@ -153,10 +152,6 @@ $colspan = 11; value="1" id="gr_use_access_"> - - - value="1" id="gr_show_menu_"> - diff --git a/adm/boardgroup_list_update.php b/adm/boardgroup_list_update.php index 32c1e5aea..e7f9816eb 100644 --- a/adm/boardgroup_list_update.php +++ b/adm/boardgroup_list_update.php @@ -17,14 +17,13 @@ for ($i=0; $i<$count; $i++) { $k = $_POST['chk'][$i]; $gr_id = $_POST['group_id'][$k]; - + if($_POST['act_button'] == '선택수정') { $sql = " update {$g5['group_table']} set gr_subject = '{$_POST['gr_subject'][$k]}', gr_device = '{$_POST['gr_device'][$k]}', gr_admin = '{$_POST['gr_admin'][$k]}', gr_use_access = '{$_POST['gr_use_access'][$k]}', - gr_show_menu = '{$_POST['gr_show_menu'][$k]}', gr_order = '{$_POST['gr_order'][$k]}' where gr_id = '{$gr_id}' "; if ($is_admin != 'super') diff --git a/adm/config_form.php b/adm/config_form.php index 3c40bf393..b53870be1 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -134,6 +134,15 @@ if(!isset($config['cf_sms_use'])) { ADD `cf_icode_server_port` varchar(255) NOT NULL DEFAULT '' AFTER `cf_icode_server_ip` ", true); } +if(!isset($config['cf_faq_skin'])) { + sql_query(" ALTER TABLE `{$g5['config_table']}` + ADD `cf_faq_skin` varchar(255) NOT NULL DEFAULT '' AFTER `cf_connect_skin`, + ADD `cf_mobile_faq_skin` varchar(255) NOT NULL DEFAULT '' AFTER `cf_mobile_connect_skin` ", true); +} + +if(!$config['cf_faq_skin']) $config['cf_faq_skin'] = "basic"; +if(!$config['cf_mobile_faq_skin']) $config['cf_mobile_faq_skin'] = "basic"; + $g5['title'] = '환경설정'; include_once ('./admin.head.php'); @@ -360,6 +369,32 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) { + + + + + + + + + + diff --git a/adm/config_form_update.php b/adm/config_form_update.php index 0a2682508..75dbbeb58 100644 --- a/adm/config_form_update.php +++ b/adm/config_form_update.php @@ -39,6 +39,7 @@ $sql = " update {$g5['config_table']} cf_new_rows = '{$_POST['cf_new_rows']}', cf_search_skin = '{$_POST['cf_search_skin']}', cf_connect_skin = '{$_POST['cf_connect_skin']}', + cf_faq_skin = '{$_POST['cf_faq_skin']}', cf_read_point = '{$_POST['cf_read_point']}', cf_write_point = '{$_POST['cf_write_point']}', cf_comment_point = '{$_POST['cf_comment_point']}', @@ -107,6 +108,7 @@ $sql = " update {$g5['config_table']} cf_mobile_new_skin = '{$_POST['cf_mobile_new_skin']}', cf_mobile_search_skin = '{$_POST['cf_mobile_search_skin']}', cf_mobile_connect_skin = '{$_POST['cf_mobile_connect_skin']}', + cf_mobile_faq_skin = '{$_POST['cf_mobile_faq_skin']}', cf_mobile_member_skin = '{$_POST['cf_mobile_member_skin']}', cf_captcha_mp3 = '{$_POST['cf_captcha_mp3']}', cf_editor = '{$_POST['cf_editor']}', diff --git a/css/admin.css b/adm/css/admin.css similarity index 94% rename from css/admin.css rename to adm/css/admin.css index 7eded8bbf..735676c92 100644 --- a/css/admin.css +++ b/adm/css/admin.css @@ -8,7 +8,8 @@ html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0} h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none} -label, input, select, img {vertical-align:middle} + +label, input, button, select, img {vertical-align:middle} textarea, select {font-family:dotum;font-size:1em} @@ -28,7 +29,7 @@ h2.h2_frm {padding-top:15px} h3 {margin:0 20px} /* 레이아웃 */ -#hd {z-index:10;min-width:1000px;background:url('../adm/img/hd_bg.jpg') #383b3f repeat-x} +#hd {z-index:10;min-width:1000px;background:url('../img/hd_bg.jpg') #383b3f repeat-x} #hd h1, #hd h2 {position:absolute;border:0;font-size:0;line-height:0;overflow:hidden} #hd_wrap {z-index:11;position:relative;margin:0 auto} #logo {position:relative;height:70px} @@ -50,21 +51,20 @@ h3 {margin:0 20px} #gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} #gnb_1dul {position:relative;margin:0 20px;padding:0;zoom:1} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1dli {z-index:13;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0;zoom:1} -.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1dli a {display:block;width:120px;height:34px;color:#fff;font-weight:bold;text-align:center;text-decoration:none;line-height:2.8em} -.gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none} -.gnb_1dli_air a {background:#fff;color:#000} -.gnb_1dli_on a {background:#282828;color:#fff} -.gnb_2dul {display:none;position:absolute;top:34px;width:181px;border:1px solid #999;border-top:0;background:#fff} -.gnb_2dli {float:left} -.gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;height:auto;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:1em} -.gnb_2dli a:focus, .gnb_2dli a:hover {background:#484848 !important;color:#fff} +.gnb_1dli {z-index:13;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0} +.gnb_1da {display:block;width:120px;height:34px;color:#fff;font-weight:bold;text-align:center;text-decoration:none;line-height:2.8em} +.gnb_1da:focus, .gnb_1da:hover {text-decoration:none} +.gnb_1dli_air .gnb_1da {background:#fff;color:#000} +.gnb_1dli_on .gnb_1da {background:#282828;color:#fff} +.gnb_2dul {display:none;position:absolute;top:34px;width:180px;border:1px solid #999;border-top:0;background:#fff} +.gnb_2da {display:block;padding:8px 10px;background:#fff;color:#000;text-decoration:none} +.gnb_grp_style {background:#f7f7f7 !important} +.gnb_2da:focus, .gnb_2da:hover {background:#484848 !important;color:#fff !important;text-decoration:none} +.gnb_1dli_air .gnb_2da {background:#fff;color:#000} +.gnb_1dli_on .gnb_2da {background:#fff;color:#000} .gnb_1dli_over .gnb_2dul {display:block;left:-1px} .gnb_1dli_over2 .gnb_2dul {display:block;right:-1px} -.gnb_grp_style {background:#f7f7f7 !important} -.gnb_grp_style:focus, .gnb_js .gnb_grp_style:hover {background:#484848 !important} .gnb_grp_div {border-top:1px solid #eee} @@ -167,10 +167,12 @@ a.btn_cancel {line-height:2.5em;vertical-align:middle} .btn_add01 {text-align:right} -.btn_add01 a {display:inline-block;padding:10px;border:1px solid #ccc;background:#f0f0f0;text-decoration:none;cursor:pointer} +.btn_add01 a, .btn_add01 button {padding:10px;border:1px solid #ccc;background:#f0f0f0;text-decoration:none;cursor:pointer} +.btn_add01 a {display:inline-block;vertical-align:middle} +.btn_add01 button {margin:0} /* 필수입력 */ -.required {background:url('../img/wrest.gif') #f6f9fa top right no-repeat !important} +.required {background:url('../../img/wrest.gif') #f6f9fa top right no-repeat !important} /* 외부서비스 사이트코드 */ .sitecode {display:inline-block;font:bold 15px 'Verdana';vertical-align:middle} @@ -523,7 +525,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} #scf_sms:after {display:block;visibility:hidden;clear:both;content:""} .scf_sms_box {float:left;margin:0 8px 0 9px;width:163px;text-align:center} .scf_sms_box h4 {margin:0 0 5px} -.scf_sms_img {margin:10px 0;width:163px;height:191px;background:url('../adm/shop_admin/img/sms_back.gif') no-repeat 0 0;text-align:center} +.scf_sms_img {margin:10px 0;width:163px;height:191px;background:url('../shop_admin/img/sms_back.gif') no-repeat 0 0;text-align:center} .scf_sms_img textarea {margin:54px 0 0;width:115px;height:85px;border:0;background:transparent;font-size:0.95em;overflow:hidden} .scf_sms_img span {display:block} .scf_sms_cnt {display:block} @@ -604,6 +606,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} #sodr_total th {width:125px} /* 분류관리 목록 */ + #sct .sct_name div {position:relative} #sct .sct_name .frm_input {width:98%} #sct .sct_name1 {padding-left:25px} @@ -733,7 +736,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} #sms_frm table {margin:0 0 30px} #sms_frm textarea {height:70px} -#sms_sm {position:relative;float:left;width:229px;height:418px;background:url('../adm/shop_admin/img/mobilebg.jpg') no-repeat} +#sms_sm {position:relative;float:left;width:229px;height:418px;background:url('../shop_admin/img/mobilebg.jpg') no-repeat} #sms_sm_text {position:absolute;top:75px;left:27px;width:180px;color:#fff;font-size:2em;word-break:break-all} #sms_sm p {position:absolute;bottom:-70px;left:0;font-size:0.95em;letter-spacing:-0.1em} @@ -800,4 +803,4 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} #post_code #result ul {margin:0;padding:0;border-bottom:1px solid #dde4e9;background:#f0f5fc;list-style:none} #post_code #result li {padding:10px;border:1px solid #dde4e9;border-bottom:0} #post_code #result li div {margin:4px 0 0;color:#738D94} -#post_code #result li div:before {content:"▶ "} +#post_code #result li div:before {content:"▶ "} \ No newline at end of file diff --git a/adm/faqmasterform.php b/adm/faqmasterform.php index 0a154e58f..54a5f67ad 100644 --- a/adm/faqmasterform.php +++ b/adm/faqmasterform.php @@ -22,6 +22,13 @@ else $html_title .= ' 입력'; } +// 모바일 상하단 내용 필드추가 +if(!sql_query(" select fm_mobile_head_html from {$g5['faq_master_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE `{$g5['faq_master_table']}` + ADD `fm_mobile_head_html` text NOT NULL AFTER `fm_tail_html`, + ADD `fm_mobile_tail_html` text NOT NULL AFTER `fm_mobile_head_html` ", true); +} + include_once (G5_ADMIN_PATH.'/admin.head.php'); ?> @@ -37,6 +44,13 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); + + + + + + + @@ -107,6 +121,18 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); + + 모바일상단 내용 + + + + + + 모바일하단 내용 + + + +
@@ -123,6 +149,8 @@ function frmfaqmasterform_check(f) { + + } // document.frmfaqmasterform.fm_subject.focus(); diff --git a/adm/faqmasterformupdate.php b/adm/faqmasterformupdate.php index fa6d44a03..f6987d795 100644 --- a/adm/faqmasterformupdate.php +++ b/adm/faqmasterformupdate.php @@ -18,7 +18,10 @@ if ($fm_timg_del) @unlink(G5_DATA_PATH."/faq/{$fm_id}_t"); $sql_common = " set fm_subject = '$fm_subject', fm_head_html = '$fm_head_html', - fm_tail_html = '$fm_tail_html' "; + fm_tail_html = '$fm_tail_html', + fm_mobile_head_html = '$fm_mobile_head_html', + fm_mobile_tail_html = '$fm_mobile_tail_html', + fm_order = '$fm_order' "; if ($w == "") { diff --git a/adm/faqmasterlist.php b/adm/faqmasterlist.php index 494cc7217..b2425d4b9 100644 --- a/adm/faqmasterlist.php +++ b/adm/faqmasterlist.php @@ -59,7 +59,7 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) $from_record = ($page - 1) * $rows; // 시작 열을 구함 -$sql = "select * $sql_common order by fm_id desc limit $from_record, {$config['cf_page_rows']} "; +$sql = "select * $sql_common order by fm_order, fm_id limit $from_record, {$config['cf_page_rows']} "; $result = sql_query($sql); ?> @@ -88,6 +88,7 @@ $result = sql_query($sql); ID 제목 FAQ수 + 순서 관리 @@ -102,6 +103,7 @@ $result = sql_query($sql); + 보기 수정 diff --git a/adm/menu_form.php b/adm/menu_form.php new file mode 100644 index 000000000..8fb289881 --- /dev/null +++ b/adm/menu_form.php @@ -0,0 +1,148 @@ + + +
+

+ +
+ +
+ + +
+ + + +
+ +
+ +
+ +
+ + + + \ No newline at end of file diff --git a/adm/menu_form_search.php b/adm/menu_form_search.php new file mode 100644 index 000000000..c6fc023b6 --- /dev/null +++ b/adm/menu_form_search.php @@ -0,0 +1,75 @@ +'.PHP_EOL; + + switch($type) { + case 'group': + $link = G5_BBS_URL.'/group.php?gr_id='.$row['id']; + break; + case 'board': + $link = G5_BBS_URL.'/board.php?bo_table='.$row['id']; + break; + case 'content': + $link = G5_BBS_URL.'/content.php?co_id='.$row['id']; + break; + default: + $link = ''; + break; + } + + echo '
  • '.PHP_EOL; + echo ''.PHP_EOL; + echo ''.PHP_EOL; + echo ''.$row['subject'].''; + echo ''.PHP_EOL; + echo '
    • '.PHP_EOL; + } +} else { ?> + + + + + + + + + + + + + +
    +
    + 링크는 http://를 포함해서 입력해 주세요. +
    +
    + \ No newline at end of file diff --git a/adm/menu_list.php b/adm/menu_list.php new file mode 100644 index 000000000..3fc98cb10 --- /dev/null +++ b/adm/menu_list.php @@ -0,0 +1,201 @@ +dbconfig.php 파일에 $g5[\'menu_table\'] = G5_TABLE_PREFIX.\'menu\'; 를 추가해 주세요.'); +} + +if(!sql_query(" DESCRIBE {$g5['menu_table']} ", false)) { + sql_query(" CREATE TABLE IF NOT EXISTS `{$g5['menu_table']}` ( + `me_id` int(11) NOT NULL AUTO_INCREMENT, + `me_code` varchar(255) NOT NULL DEFAULT '', + `me_name` varchar(255) NOT NULL DEFAULT '', + `me_link` varchar(255) NOT NULL DEFAULT '', + `me_target` varchar(255) NOT NULL DEFAULT '0', + `me_order` int(11) NOT NULL DEFAULT '0', + `me_use` tinyint(4) NOT NULL DEFAULT '0', + `me_mobile_use` tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (`me_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ", true); +} + +$sql = " select * from {$g5['menu_table']} order by me_id "; +$result = sql_query($sql); + +$g5['title'] = "메뉴설정"; +include_once('./admin.head.php'); + +$colspan = 7; +?> + +
    +

    주의! 메뉴설정 작업 후 반드시 확인을 누르셔야 저장됩니다.

    +
    + +
    + + +
    + +
    + + + +
    + +
    + +
    + + + + diff --git a/adm/menu_list_update.php b/adm/menu_list_update.php new file mode 100644 index 000000000..2d55a7226 --- /dev/null +++ b/adm/menu_list_update.php @@ -0,0 +1,70 @@ + diff --git a/bbs/faq.php b/bbs/faq.php index 48c4a0da9..35906477d 100644 --- a/bbs/faq.php +++ b/bbs/faq.php @@ -1,96 +1,104 @@ 관리자 모드에서 게시판관리->FAQ관리를 먼저 확인해 주세요.'); } // FAQ MASTER -$sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' "; -$fm = sql_fetch($sql); +$faq_master_list = array(); +$sql = " select * from {$g5['faq_master_table']} order by fm_order,fm_id "; +$result = sql_query($sql); +while ($row=sql_fetch_array($result)) +{ + $key = $row['fm_id']; + if (!$fm_id) $fm_id = $key; + $faq_master_list[$key] = $row; +} + +if ($fm_id){ + $qstr .= '&fm_id=' . $fm_id; // 마스터faq key_id +} + +$fm = $faq_master_list[$fm_id]; if (!$fm['fm_id']) alert('등록된 내용이 없습니다.'); $g5['title'] = $fm['fm_subject']; + +if(G5_IS_MOBILE){ + $faq_skin = $config['cf_mobile_faq_skin']; +} else { + $faq_skin = $config['cf_faq_skin']; +} + +if(!$faq_skin) $faq_skin = 'basic'; +$faq_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/faq/'.$faq_skin; +$faq_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/faq/'.$faq_skin; +$skin_file = $faq_skin_path.'/list.skin.php'; + include_once('./_head.php'); -?> -FAQ 수정
    '; -?> +if(is_file($skin_file)) { + $admin_href = ''; + $himg_src = ''; + $timg_src = ''; + if($is_admin) + $admin_href = G5_ADMIN_URL.'/faqmasterform.php?w=u&fm_id='.$fm_id; - -'; + if(!G5_IS_MOBILE) { + $himg = G5_DATA_PATH.'/faq/'.$fm_id.'_h'; + if (is_file($himg)){ + $himg_src = G5_DATA_URL.'/faq/'.$fm_id.'_h'; + } -// 상단 HTML -echo '
    '.stripslashes($fm['fm_head_html']).'
    '; -?> + $timg = G5_DATA_PATH.'/faq/'.$fm_id.'_t'; + if (is_file($timg)){ + $timg_src = G5_DATA_URL.'/faq/'.$fm_id.'_t'; + } + } -
    - 0 or INSTR(fa_content, '$stx') > 0 ) "; + $category_stx = '&stx='.$stx; + } + + if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) + + $page_rows = G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages']; + + $sql = " select count(*) as cnt + from {$g5['faq_table']} + where fm_id = '$fm_id' + $sql_search "; + $total = sql_fetch($sql); + $total_count = $total['cnt']; + + $total_page = ceil($total_count / $page_rows); // 전체 페이지 계산 + $from_record = ($page - 1) * $page_rows; // 시작 열을 구함 + + $sql = " select * + from {$g5['faq_table']} + where fm_id = '$fm_id' + $sql_search + order by fa_order , fa_id + limit $from_record, $page_rows "; $result = sql_query($sql); - for ($i=1; $row=sql_fetch_array($result); $i++) - { - if ($i == 1) - { - ?> -
    -

    목차

    -
      - -
      2. - 1) echo '
    '; - ?> - - -
    -

    내용

    -
      - -
    1. -

      -
      - -
      -
      FAQ 목차
      -
      2. - 1) echo '
    '; - - if ($i == 1) echo '

    등록된 FAQ가 없습니다.
    FAQ를 새로 등록하시려면 FAQ관리 메뉴를 이용하십시오.

    '; - ?> -
    - -'.stripslashes($fm['fm_tail_html']).''; - -$timg = G5_DATA_PATH.'/faq/'.$fm_id.'_t'; -if (file_exists($timg)) - echo '
    '; -?> - - -FAQ 수정'; + while ($row=sql_fetch_array($result)){ + $faq_list[] = $row; + } + include_once($skin_file); +} else { + echo '

    '.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.

    '; +} include_once('./_tail.php'); ?> diff --git a/css/default.css b/css/default.css index d986cfdc3..c1e44baa4 100644 --- a/css/default.css +++ b/css/default.css @@ -36,6 +36,13 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #hd_wrapper {position:relative;margin:0 auto;padding:26px 0;width:970px;zoom:1} #hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""} +#hd_pop {z-index:1000;position:relative;margin:0 auto;width:1000px;height:0} +#hd_pop h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} +.hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff} +.hd_pops_con {margin:0 0 30px} +.hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right} +.hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} + #logo {float:left;padding:5px 0 0} /* 전체 검색 */ @@ -61,20 +68,20 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} /* 메인메뉴 */ #gnb {position:relative;margin:-1px 0 0;border-top:1px dotted #dde4e9;border-bottom:1px solid #dde4e9;background:#ecf0f7} #gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#gnb #gnb_1dul {margin:0 auto !important;padding:0;width:970px;zoom:1} -#gnb #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1dli {z-index:10;position:relative;float:left;zoom:1} -.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1da {display:block;float:left;padding:0 10px;width:80px;height:35px;background:url('../img/gnb_bg00.gif') center right no-repeat;font-weight:bold;line-height:2.95em;text-decoration:none} +#gnb_1dul {margin:0 auto !important;padding:0;width:970px;zoom:1} +#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} +.gnb_1dli {z-index:10;position:relative;float:left} +.gnb_1da {display:inline-block;padding:0 40px 0 10px;height:35px;background:url('../img/gnb_bg00.gif') center right no-repeat;font-weight:bold;line-height:2.95em;text-decoration:none} .gnb_1da:focus, .gnb_1da:hover {background:url('../img/gnb_bg00.gif') #333 center right no-repeat;text-decoration:none} -.gnb_1dli_air a {background-color:#333;color:#fff} -.gnb_1dli_on a {background-color:#333;color:#fff} -.gnb_2dul {display:none;position:absolute;top:35px} -.gnb_2da {display:block;width:80px;} -.gnb_2da {display:inline-block;padding:0 10px;width:161px;height:35px;text-align:left;text-decoration:none;line-height:2.95em} -.gnb_2da:focus, .gnb_2da:hover {text-decoration:none} -.gnb_1dli_over .gnb_2dul {display:block;left:0;width:180px;background:#fff} -.gnb_1dli_over2 .gnb_2dul {display:block;right:1px;width:180px;background:#fff} +.gnb_1dli_air .gnb_1da {background-color:#333;color:#fff} +.gnb_1dli_on .gnb_1da {background-color:#333;color:#fff} +.gnb_2dul {display:none;position:absolute;top:35px;width:180px} +.gnb_2da {display:block;padding:13px 10px;text-align:left;text-decoration:none} +.gnb_1dli_air .gnb_2da {background-color:#333;color:#fff} +.gnb_1dli_on .gnb_2da {background-color:#333;color:#fff} +.gnb_2da:focus, .gnb_2da:hover {background:#666;text-decoration:none} +.gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff} +.gnb_1dli_over2 .gnb_2dul {display:block;right:1px;background:#fff} .gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em} diff --git a/g4_import.php b/g4_import.php index a8d9b32c3..24554f248 100644 --- a/g4_import.php +++ b/g4_import.php @@ -100,25 +100,7 @@ if($is_admin != 'super') diff --git a/g4_import_run.php b/g4_import_run.php index 02f3ab6b7..8392e0d6b 100644 --- a/g4_import_run.php +++ b/g4_import_run.php @@ -141,25 +141,7 @@ document.onkeydown = noRefresh ; diff --git a/head.php b/head.php index 9f6b2e3fb..909f94e2f 100644 --- a/head.php +++ b/head.php @@ -117,26 +117,44 @@ if (G5_IS_MOBILE) {

    메인메뉴

    '.PHP_EOL; + ?> - -
  • 생성된 메뉴가 없습니다.
    • +
  • 생성된 메뉴가 없습니다.
    • diff --git a/head.sub.php b/head.sub.php index af3dd3516..71b8a1c61 100644 --- a/head.sub.php +++ b/head.sub.php @@ -48,7 +48,7 @@ if($config['cf_add_meta']) <?php echo $g5_head_title; ?> '.PHP_EOL; + echo ''.PHP_EOL; } else { $shop_css = ''; if (defined('_SHOP_')) $shop_css = '_shop'; diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index 47e7e6f97..8a79450fa 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -84,7 +84,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` ( `bo_upload_size` int(11) NOT NULL DEFAULT '0', `bo_reply_order` tinyint(4) NOT NULL DEFAULT '0', `bo_use_search` tinyint(4) NOT NULL DEFAULT '0', - `bo_show_menu` tinyint(4) NOT NULL DEFAULT '0', `bo_order` int(11) NOT NULL DEFAULT '0', `bo_count_write` int(11) NOT NULL DEFAULT '0', `bo_count_comment` int(11) NOT NULL DEFAULT '0', @@ -352,7 +351,6 @@ CREATE TABLE IF NOT EXISTS `g5_group` ( `gr_device` ENUM('both','pc','mobile') NOT NULL DEFAULT 'both', `gr_admin` varchar(255) NOT NULL default '', `gr_use_access` tinyint(4) NOT NULL default '0', - `gr_show_menu` tinyint(4) NOT NULL default '0', `gr_order` int(11) NOT NULL default '0', `gr_1_subj` varchar(255) NOT NULL default '', `gr_2_subj` varchar(255) NOT NULL default '', @@ -836,6 +834,8 @@ CREATE TABLE IF NOT EXISTS `g5_faq_master` ( `fm_subject` varchar(255) NOT NULL DEFAULT '', `fm_head_html` text NOT NULL, `fm_tail_html` text NOT NULL, + `fm_mobile_head_html` text NOT NULL, + `fm_mobile_tail_html` text NOT NULL, `fm_order` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`fm_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -865,3 +865,20 @@ CREATE TABLE IF NOT EXISTS `g5_new_win` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- + +-- +-- Table structure for table `g5_menu` +-- + +DROP TABLE IF EXISTS `g5_menu`; +CREATE TABLE IF NOT EXISTS `g5_menu` ( + `me_id` int(11) NOT NULL AUTO_INCREMENT, + `me_code` varchar(255) NOT NULL DEFAULT '', + `me_name` varchar(255) NOT NULL DEFAULT '', + `me_link` varchar(255) NOT NULL DEFAULT '', + `me_target` varchar(255) NOT NULL DEFAULT '', + `me_order` int(11) NOT NULL DEFAULT '0', + `me_use` tinyint(4) NOT NULL DEFAULT '0', + `me_mobile_use` tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (`me_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/install_db.php b/install/install_db.php index 29e2c8128..2fbaadd62 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -144,6 +144,7 @@ if($g5_install || !$result) { cf_mobile_search_skin = 'basic', cf_mobile_connect_skin = 'basic', cf_mobile_member_skin = 'basic', + cf_editor = 'ckeditor4', cf_captcha_mp3 = 'basic', cf_register_level = '2', cf_register_point = '1000', @@ -510,6 +511,7 @@ fwrite($f, "\$g5['content_table'] = G5_TABLE_PREFIX.'content'; // 내용(컨텐 fwrite($f, "\$g5['faq_table'] = G5_TABLE_PREFIX.'faq'; // 자주하시는 질문 테이블\n"); fwrite($f, "\$g5['faq_master_table'] = G5_TABLE_PREFIX.'faq_master'; // 자주하시는 질문 마스터 테이블\n"); fwrite($f, "\$g5['new_win_table'] = G5_TABLE_PREFIX.'new_win'; // 새창 테이블\n"); +fwrite($f, "\$g5['menu_table'] = G5_TABLE_PREFIX.'menu'; // 메뉴관리 테이블\n"); if($g5_shop_install) { fwrite($f, "\n"); diff --git a/js/common.js b/js/common.js index 5c53df501..5848854a0 100644 --- a/js/common.js +++ b/js/common.js @@ -70,6 +70,11 @@ function number_format(data) var comma = ','; var i; + var sign = data.match(/^[\+\-]/); + if(sign) { + data = data.replace(/^[\+\-]/, ""); + } + len = data.length; mod = (len % cutlen); k = cutlen - mod; @@ -88,6 +93,9 @@ function number_format(data) } } + if(sign != null) + number = sign+number; + return number; } diff --git a/mobile/head.php b/mobile/head.php index 359997ee1..a8e076125 100644 --- a/mobile/head.php +++ b/mobile/head.php @@ -29,6 +29,84 @@ include_once(G5_LIB_PATH.'/popular.lib.php'); <?php echo $config['cf_title']; ?> + + + + +