From 9f95fe21f7ae2c1515d8338a12e57d4c4a0a9564 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Tue, 9 Apr 2013 11:06:57 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=A9=94=EC=9D=BC=EC=9D=B8=EC=A6=9D:=20#42?=
 =?UTF-8?q?2=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=9D=B8=EC=A6=9D?=
 =?UTF-8?q?=EB=A9=94=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/register_form_update_mail1.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bbs/register_form_update_mail1.php b/bbs/register_form_update_mail1.php
index 01eda0efd..50faeb715 100644
--- a/bbs/register_form_update_mail1.php
+++ b/bbs/register_form_update_mail1.php
@@ -23,11 +23,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <p style="margin:20px 0 0;padding:30px 30px 50px;min-height:200px;height:auto !important;height:200px;border-bottom:1px solid #eee">
             <b><?=$mb_name?></b> 님의 회원가입을 진심으로 축하합니다.<br>
             회원님의 성원에 보답하고자 더욱 더 열심히 하겠습니다.<br>
+            <? if ($config['cf_use_email_certify']) { ?>아래의 <strong>메일인증</strong>을 클릭하시면 회원가입이 완료됩니다.<br><? } ?>
             감사합니다.
         </p>
+
         <? if ($config['cf_use_email_certify']) { ?>
-        <p>아래의 메일인증하기를 클릭하시면 회원가입이 완료됩니다.</p>
-        <a href="<?=$certify_href?>" target="_blank" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">메일인증하기</a>
+        <a href="<?=$certify_href?>" target="_blank" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">메일인증</a>
         <? } else { ?>
         <a href="<?=G4_URL?>" target="_blank" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">사이트바로가기</a>
         <? } ?>

From 7faa6fa8f28e2da7766b77891d2014d5be16484e Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Tue, 9 Apr 2013 11:21:27 +0900
Subject: [PATCH 2/2] =?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 .= '<li class="gnb_2depth"><a href="'.$menu[$key][$i][2].'">'.$menu[$key][$i][1].'</a></li>';
+        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 .= '<li class="gnb_2depth"><a href="'.$menu[$key][$i][2].'" class="'.$gnb_grp_style.' '.$gnb_grp_div.'">'.$menu[$key][$i][1].'</a></li>';
 
         $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 @@
 <?
 $menu['menu100'] = array (
-    array('100000', '환경설정',         G4_ADMIN_URL.'/config_form.php',   'config'),
-    array('',       '기본환경설정',     G4_ADMIN_URL.'/config_form.php',   'cf_basic'),
-    array('',       '관리권한설정',     G4_ADMIN_URL.'/auth_list.php',     'cf_auth'),
-    array('100300', '메일 테스트',      G4_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'),
+    array('100000', '환경설정', G4_ADMIN_URL.'/config_form.php',   'config'),
+    array('', '기본환경설정', G4_ADMIN_URL.'/config_form.php',   'cf_basic'),
+    array('', '관리권한설정', G4_ADMIN_URL.'/auth_list.php',     'cf_auth'),
+    array('100300', '메일 테스트', G4_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'),
     //array('100400', '버전정보', G4_ADMIN_URL.'/version.php', 'cf_version'),
+    array('100800', '세션파일 일괄삭제',G4_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1),
+    array('100900', '캐쉬파일 일괄삭제',G4_ADMIN_URL.'/cache_file_delete.php',   'cf_cache', 1),
     array('100500', 'phpinfo()',        G4_ADMIN_URL.'/phpinfo.php',       'cf_phpinfo'),
     //array('100600', '업그레이드', G4_ADMIN_URL.'/upgrade.php', 'cf_upgrade'),
     //array('100700', '복구/최적화', G4_ADMIN_URL.'/repair.php', 'cf_repair'),
-    array('100800', '세션파일 일괄삭제',G4_ADMIN_URL.'/session_file_delete.php', 'cf_session'),
-    array('100900', '캐쉬파일 일괄삭제',G4_ADMIN_URL.'/cache_file_delete.php',   'cf_cache'),
-    array('100910', '캡챠파일 일괄삭제',G4_ADMIN_URL.'/gcaptcha_file_delete.php',   'cf_gcaptcha'),
     //array('', 'phpMyAdmin', ''.$g4['path'].'/'.$g4['phpmyadmin_dir'].'', 'cf_phpmyadmin')
 );
 ?>
\ 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 @@
 <?
 $menu['menu200'] = array (
-    array('200000', '회원관리',     G4_ADMIN_URL.'/member_list.php',    'member'),
-    array('200100', '회원관리',     G4_ADMIN_URL.'/member_list.php',    'mb_list'),
-    array('200200', '포인트관리',   G4_ADMIN_URL.'/point_list.php',     'mb_point'),
-    array('200300', '회원메일발송', G4_ADMIN_URL.'/mail_list.php',      'mb_mail'),
-    array('200800', '접속자집계',   G4_ADMIN_URL.'/visit_list.php',     'mb_visit'),
-    array('200900', '투표관리',     G4_ADMIN_URL.'/poll_list.php',      'mb_poll')
+    array('200000', '회원관리', G4_ADMIN_URL.'/member_list.php', 'member'),
+    array('200100', '회원관리', G4_ADMIN_URL.'/member_list.php', 'mb_list'),
+    array('200300', '회원메일발송', G4_ADMIN_URL.'/mail_list.php', 'mb_mail'),
+    array('200800', '접속자집계', G4_ADMIN_URL.'/visit_list.php', 'mb_visit', 1),
+    array('200200', '포인트관리', G4_ADMIN_URL.'/point_list.php', 'mb_point'),
+    array('200900', '투표관리', G4_ADMIN_URL.'/poll_list.php', 'mb_poll')
 );
 ?>
\ 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:""}