From 7faa6fa8f28e2da7766b77891d2014d5be16484e Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 9 Apr 2013 11:21:27 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20#424=20?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=A9=94=EB=89=B4=20=EC=88=9C?= =?UTF-8?q?=EC=84=9C=20=EB=B0=8F=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.head.php | 9 ++++++++- adm/admin.menu100.php | 13 ++++++------- adm/admin.menu200.php | 12 ++++++------ adm/admin.menu300.php | 4 ++-- css/admin.css | 3 +++ 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/adm/admin.head.php b/adm/admin.head.php index e8ab7b1a5..39a11acb2 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -24,7 +24,14 @@ 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; - $str .= '
  • '.$menu[$key][$i][1].'
    • '; + 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'; + else $gnb_grp_div = ''; + + if ($menu[$key][$i][4] == 1) $gnb_grp_style = 'gnb_grp_style'; + else $gnb_grp_style = ''; + + $str .= '
  • '.$menu[$key][$i][1].'
    • '; $auth_menu[$menu[$key][$i][0]] = $menu[$key][$i][1]; } diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php index 34b39bbe1..985edef26 100644 --- a/adm/admin.menu100.php +++ b/adm/admin.menu100.php @@ -1,16 +1,15 @@ \ No newline at end of file diff --git a/adm/admin.menu200.php b/adm/admin.menu200.php index acf09fd80..f3802a123 100644 --- a/adm/admin.menu200.php +++ b/adm/admin.menu200.php @@ -1,10 +1,10 @@ \ No newline at end of file diff --git a/adm/admin.menu300.php b/adm/admin.menu300.php index 97779c0d4..01018af35 100644 --- a/adm/admin.menu300.php +++ b/adm/admin.menu300.php @@ -3,7 +3,7 @@ $menu['menu300'] = array ( array('300000', '게시판관리', ''.G4_ADMIN_URL.'/board_list.php', 'board'), array('300100', '게시판관리', ''.G4_ADMIN_URL.'/board_list.php', 'bbs_board'), array('300200', '게시판그룹관리', ''.G4_ADMIN_URL.'/boardgroup_list.php', 'bbs_group'), - array('300300', '인기검색어관리', ''.G4_ADMIN_URL.'/popular_list.php', 'bbs_poplist'), - array('300400', '인기검색어순위', ''.G4_ADMIN_URL.'/popular_rank.php', 'bbs_poprank'), + array('300300', '인기검색어관리', ''.G4_ADMIN_URL.'/popular_list.php', 'bbs_poplist', 1), + array('300400', '인기검색어순위', ''.G4_ADMIN_URL.'/popular_rank.php', 'bbs_poprank', 1), ); ?> \ No newline at end of file diff --git a/css/admin.css b/css/admin.css index 2892cba1f..84be7704f 100644 --- a/css/admin.css +++ b/css/admin.css @@ -90,6 +90,9 @@ h2 {font-size:1.2em} .gnb_1depth_over .gnb_sub_ul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff} .gnb_1depth_over2 .gnb_sub_ul {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff} +.gnb_js .gnb_grp_style {background:#f7f7f7 !important} +.gnb_js .gnb_grp_div {border-top:1px solid #eee} + /* 중간 레이아웃 */ #wrapper {z-index:5;margin:30px auto;width:1000px;min-height:630px;height:auto !important;height:630px;zoom:1} #wrapper:after {display:block;visibility:hidden;clear:both;content:""} From fc7dca905f429480b88d40d887455c09b18e0e63 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 9 Apr 2013 11:55:49 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=86=A0=ED=81=B0=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_copy.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/adm/board_copy.php b/adm/board_copy.php index 1f8124fd5..cc24a7e5d 100644 --- a/adm/board_copy.php +++ b/adm/board_copy.php @@ -4,8 +4,6 @@ include_once("./_common.php"); auth_check($auth[$sub_menu], 'w'); -$token = get_token(); - $g4['title'] = '게시판 복사'; $administrator = 1; include_once(G4_PATH.'/head.sub.php'); From c26d5814a52bc041cd224319c6912e9c5ebb6585 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 9 Apr 2013 11:56:21 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=ED=86=A0=ED=81=B0=20=EC=B2=B4=ED=81=AC?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EB=B3=B5=EC=82=AC=EC=8B=9C=20=EA=B3=B5=EC=A7=80?= =?UTF-8?q?=EC=82=AC=ED=95=AD=EC=9D=80=20=EB=B3=B5=EC=82=AC=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_copy_update.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index 1715617fc..5628417d3 100644 --- a/adm/board_copy_update.php +++ b/adm/board_copy_update.php @@ -15,8 +15,6 @@ $row = sql_fetch(" select count(*) as cnt from {$g4['board_table']} where bo_tab if ($row['cnt']) alert($target_table.'은(는) 이미 존재하는 게시판 테이블명 입니다.\\n복사할 테이블명으로 사용할 수 없습니다.'); -check_token(); - // 게시판 테이블 생성 $sql = get_table_define($g4['write_prefix'] . $bo_table); $sql = str_replace($g4['write_prefix'] . $bo_table, $g4['write_prefix'] . $target_table, $sql); @@ -24,6 +22,11 @@ sql_query($sql); $file_copy = array(); +// 구조만 복사시에는 공지사항 번호는 복사하지 않는다. +if ($copy_case == 'schema_only') { + $board['bo_notice'] = ''; +} + // 게시판 정보 $sql = " insert into {$g4['board_table']} set bo_table = '$target_table',