From ea5dfe32ea3d1478b86ce486b9a04969f088d36a Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 16:09:38 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85=EC=95=BD=EA=B4=80=20#307=20?= =?UTF-8?q?=EC=9D=98=20=EC=9D=98=EA=B2=AC1=EC=97=90=20=EB=94=B0=EB=A5=B8?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/register.skin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skin/member/basic/register.skin.php b/skin/member/basic/register.skin.php index f6302728e..e4378fb91 100644 --- a/skin/member/basic/register.skin.php +++ b/skin/member/basic/register.skin.php @@ -4,6 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+

회원가입약관 및 개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.

+

회원가입약관

@@ -23,7 +25,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-

회원가입약관 및 개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.

From 014109af4edc9e4ef073538760d21b8e79621194 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 16:48:27 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20SF?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 1 + css/default.css | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/css/admin.css b/css/admin.css index 05e0e6d93..08c2a61de 100644 --- a/css/admin.css +++ b/css/admin.css @@ -48,6 +48,7 @@ h2 {font-size:1.2em} /* gnb js off */ #gnb {} + #gnb ul {z-index:10} .gnb_1depth {position:relative;margin-left:-1px;background:#383a3f;zoom:1} .gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/css/default.css b/css/default.css index 667788ab3..ee6a43b12 100644 --- a/css/default.css +++ b/css/default.css @@ -56,8 +56,7 @@ a:active {color:#000;text-decoration:underline} /* gnb js off */ #gnb {background:#f0f4f8} #gnb h2 {margin:0;padding:0;width:0;height:0;overflow:hidden} -#gnb ul {z-index:10;margin:0 auto;padding:0;width:980px;zoom:1} -#gnb ul:after {display:block;visibility:hidden;clear:both;content:""} +#gnb ul {z-index:10;margin:0 auto;padding:0;width:980px} .gnb_1depth {position:relative;margin-left:-1px;zoom:1} .gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1depth a {display:inline-block;float:left;height:35px;color:#fff;line-height:2.7em !important;line-height:2.4em} @@ -66,20 +65,22 @@ a:active {color:#000;text-decoration:underline} .gnb_1depth a:focus, .gnb_1depth a:hover, .gnb_1depth a:active {text-decoration:none} -.gnb_1depth ul {float:left !important;margin:0 !important;padding:0 !important;width:auto !important;zoom:1} +.gnb_1depth ul {float:left;zoom:1} .gnb_1depth ul:after {display:inline-block;visibility:hidden;clear:both;content:""} .gnb_1depth li {float:left} .gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0} .gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#fff;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em} /* gnb js on */ .gnb_js {border-bottom:1px solid #c3c7c5;background:#fff} -.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px} -.gnb_js .gnb_1depth a {display:inline-block;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;letter-spacing:-0.1em;line-height:2.1em} +.gnb_js ul {zoom:1} +.gnb_js ul:after {display:block;visibility:hidden;clear:both;content:""} +.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px;width:80px} +.gnb_js .gnb_1depth a {display:inline-block;float:none;width:78px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em} +.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000} +.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000} .gnb_js .gnb_1depth a:focus, .gnb_js .gnb_1depth a:hover, .gnb_js .gnb_1depth a:active {text-decoration:none} -.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000} -.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000} .gnb_js .gnb_1depth ul {width:0 !important;height:0 !important;overflow:hidden} .gnb_js .gnb_1depth li {float:none} .gnb_js .gnb_1depth_over ul {position:absolute;top:35px;left:0;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0} From e1b5c5770ed828c22196c7f3e52578352823e5f8 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 17:05:13 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20?= =?UTF-8?q?=EA=B0=80=EB=B3=80=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/default.css b/css/default.css index ee6a43b12..3182ca788 100644 --- a/css/default.css +++ b/css/default.css @@ -74,14 +74,14 @@ a:active {color:#000;text-decoration:underline} .gnb_js {border-bottom:1px solid #c3c7c5;background:#fff} .gnb_js ul {zoom:1} .gnb_js ul:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px;width:80px} -.gnb_js .gnb_1depth a {display:inline-block;float:none;width:78px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em} +.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-2px} +.gnb_js .gnb_1depth a {display:inline-block;float:none;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em} .gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000} .gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000} .gnb_js .gnb_1depth a:focus, .gnb_js .gnb_1depth a:hover, .gnb_js .gnb_1depth a:active {text-decoration:none} -.gnb_js .gnb_1depth ul {width:0 !important;height:0 !important;overflow:hidden} +.gnb_js .gnb_1depth ul {width:1px !important;height:0 !important;overflow:hidden} .gnb_js .gnb_1depth li {float:none} .gnb_js .gnb_1depth_over ul {position:absolute;top:35px;left:0;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0} .gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em} From 44fba87267503db8541f145020fba23fcbc8b572 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 17:15:43 +0900 Subject: [PATCH 04/10] =?UTF-8?q?gnb=20=EC=88=98=EC=A0=95=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 4 ++-- css/default.css | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/css/admin.css b/css/admin.css index 08c2a61de..fc9f05dbb 100644 --- a/css/admin.css +++ b/css/admin.css @@ -52,14 +52,14 @@ h2 {font-size:1.2em} #gnb ul {z-index:10} .gnb_1depth {position:relative;margin-left:-1px;background:#383a3f;zoom:1} .gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1depth a {display:inline-block;float:left;width:90px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em !important;line-height:2.65em} +.gnb_1depth a {display:block;float:left;width:90px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em !important;line-height:2.65em} .gnb_1depth_air a, .gnb_1depth_on a {color:#000} .gnb_1depth a:focus, .gnb_1depth a:hover, .gnb_1depth a:active {text-decoration:none} .gnb_1depth ul {float:left;zoom:1} -.gnb_1depth ul:after {display:inline-block;visibility:hidden;clear:both;content:""} +.gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1depth li {float:left} .gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0} .gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#e0e0e0;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em} diff --git a/css/default.css b/css/default.css index 3182ca788..f77252fdd 100644 --- a/css/default.css +++ b/css/default.css @@ -56,25 +56,24 @@ a:active {color:#000;text-decoration:underline} /* gnb js off */ #gnb {background:#f0f4f8} #gnb h2 {margin:0;padding:0;width:0;height:0;overflow:hidden} -#gnb ul {z-index:10;margin:0 auto;padding:0;width:980px} +#gnb_ul {z-index:10;margin:0 auto;padding:0;width:980px} .gnb_1depth {position:relative;margin-left:-1px;zoom:1} .gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1depth a {display:inline-block;float:left;height:35px;color:#fff;line-height:2.7em !important;line-height:2.4em} +.gnb_1depth a {display:block;float:left;height:35px;color:#000;line-height:2.7em !important;line-height:2.4em} .gnb_1depth_air a, .gnb_1depth_on a {color:#000} .gnb_1depth a:focus, .gnb_1depth a:hover, .gnb_1depth a:active {text-decoration:none} .gnb_1depth ul {float:left;zoom:1} -.gnb_1depth ul:after {display:inline-block;visibility:hidden;clear:both;content:""} +.gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1depth li {float:left} -.gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0} -.gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#fff;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em} +.gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:0 5px;width:auto;height:35px;border-bottom:0;color:#000;font-weight:normal;text-align:left;line-height:2.7em !important;line-height:2.4em} /* gnb js on */ .gnb_js {border-bottom:1px solid #c3c7c5;background:#fff} .gnb_js ul {zoom:1} .gnb_js ul:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-2px} +.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px} .gnb_js .gnb_1depth a {display:inline-block;float:none;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em} .gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000} .gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000} @@ -84,7 +83,7 @@ a:active {color:#000;text-decoration:underline} .gnb_js .gnb_1depth ul {width:1px !important;height:0 !important;overflow:hidden} .gnb_js .gnb_1depth li {float:none} .gnb_js .gnb_1depth_over ul {position:absolute;top:35px;left:0;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0} -.gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em} +.gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em !important} /* 중간 레이아웃 */ #wrapper {margin:50px auto;width:980px;zoom:1} From 8223c54483b79270898c39d46b57e39d5bed4a8b Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 17:16:20 +0900 Subject: [PATCH 05/10] =?UTF-8?q?gnb=20=EC=88=98=EC=A0=95=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 1 - 1 file changed, 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index fc9f05dbb..6e3bc3caa 100644 --- a/css/admin.css +++ b/css/admin.css @@ -61,7 +61,6 @@ h2 {font-size:1.2em} .gnb_1depth ul {float:left;zoom:1} .gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1depth li {float:left} -.gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0} .gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#e0e0e0;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em} /* gnb js on */ .gnb_js {} From 72aec2598adbb1387000a16171c38e18b7cfcbb6 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 25 Feb 2013 17:20:56 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=EB=A9=94=EB=89=B4=EB=B3=B4=EC=9D=B4?= =?UTF-8?q?=EA=B8=B0=20=EB=B0=8F=20=EC=B6=9C=EB=A0=A5=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_copy_update.php | 3 ++- adm/board_form.php | 30 +++++++++++++++++++++++++----- adm/board_form_update.php | 4 ++-- adm/board_list.php | 8 +++++--- adm/board_list_update.php | 3 ++- adm/boardgroup_form.php | 23 +++++++++++++++++++++-- adm/boardgroup_form_update.php | 1 + adm/boardgroup_list.php | 16 +++++++++++----- adm/boardgroup_list_update.php | 4 +++- bbs/move.php | 2 +- bbs/search.php | 2 +- css/admin.css | 1 + head.php | 17 ++++++++++++++--- install/gnuboard4s.sql | 5 ++++- 14 files changed, 93 insertions(+), 26 deletions(-) diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index 1606556c4..ea39c49e5 100644 --- a/adm/board_copy_update.php +++ b/adm/board_copy_update.php @@ -78,7 +78,8 @@ $sql = " insert into {$g4['board_table']} bo_upload_size = '{$board[bo_upload_size]}', bo_reply_order = '{$board[bo_reply_order]}', bo_use_search = '{$board[bo_use_search]}', - bo_order_search = '{$board[bo_order_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]}', bo_use_email = '{$board[bo_use_email]}', diff --git a/adm/board_form.php b/adm/board_form.php index 503ffce68..3e4817891 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -12,6 +12,10 @@ if (!$row['cnt']) $html_title = '게시판'; +if (!isset($board['bo_show_menu'])) { + sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `bo_order_search`, ADD `bo_order` INT NOT NULL DEFAULT '0' AFTER `bo_show_menu` ", false); +} + if ($w == '') { $html_title .= ' 생성'; @@ -40,6 +44,9 @@ if ($w == '') { $board['bo_skin'] = 'basic'; $board['gr_id'] = $gr_id; $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') { @@ -110,6 +117,7 @@ $pg_anchor = "
    + @@ -538,14 +546,26 @@ $pg_anchor = "
      - + - - + + > + 사용 - - + + + + + + + + + + + + + diff --git a/adm/board_form_update.php b/adm/board_form_update.php index 6e76c85cf..7df9c8d2c 100644 --- a/adm/board_form_update.php +++ b/adm/board_form_update.php @@ -102,7 +102,7 @@ $sql_common = " gr_id = '{$_POST['gr_id']}', bo_upload_size = '{$_POST['bo_upload_size']}', bo_reply_order = '{$_POST['bo_reply_order']}', bo_use_search = '{$_POST['bo_use_search']}', - bo_order_search = '{$_POST['bo_order_search']}', + bo_order = '{$_POST['bo_order']}', bo_write_min = '{$_POST['bo_write_min']}', bo_write_max = '{$_POST['bo_write_max']}', bo_comment_min = '{$_POST['bo_comment_min']}', @@ -265,7 +265,7 @@ if (is_checked('chk_content_head')) $fields .= " , bo_content_head = '{$bo_c if (is_checked('chk_content_tail')) $fields .= " , bo_content_tail = '{$bo_content_tail}' "; if (is_checked('chk_insert_content')) $fields .= " , bo_insert_content = '{$bo_insert_content}' "; if (is_checked('chk_use_search')) $fields .= " , bo_use_search = '{$bo_use_search}' "; -if (is_checked('chk_order_search')) $fields .= " , bo_order_search = '{$bo_order_search}' "; +if (is_checked('chk_order')) $fields .= " , bo_order = '{$bo_order}' "; for ($i=1; $i<=10; $i++) { if (is_checked('chk_'.$i)) { $fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' "; diff --git a/adm/board_list.php b/adm/board_list.php index a4349be76..7f1fcf5d2 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -112,7 +112,8 @@ $colspan = 8; 댓글P포인트 다운P포인트 검색
      사용 - 검색
      순서 + 메뉴
      보임 + 출력
      순서 접속기기 관리 @@ -147,8 +148,9 @@ $colspan = 8; - value="1" title="검색사용"> - + value="1" title="선택시 검색사용"> + value="1" title="선택시 메뉴보이기"> + 영문자, 숫자, _ 만 가능 (공백없이) + + 게시판그룹 바로가기'; + ?> + @@ -98,6 +109,14 @@ include_once('./admin.head.php'); ?> + + + + + > + 사용 + + 회원여분필드 diff --git a/adm/boardgroup_form_update.php b/adm/boardgroup_form_update.php index c8b1d0a14..b5f49c400 100644 --- a/adm/boardgroup_form_update.php +++ b/adm/boardgroup_form_update.php @@ -17,6 +17,7 @@ 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']}', diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php index 8452302c0..221f8bf9a 100644 --- a/adm/boardgroup_list.php +++ b/adm/boardgroup_list.php @@ -105,9 +105,11 @@ $colspan = 8; 그룹아이디 제목 그룹관리자 - 게시판 - 접근사용 - 접근회원수 + 게시판
      갯수 + 접근
      사용 + 접근
      회원수 + 메뉴
      보임 + 출력
      순서 접속기기 관리 @@ -132,13 +134,13 @@ $colspan = 8; - + - + @@ -146,6 +148,10 @@ $colspan = 8; value="1" title="선택 시 접근회원 사용"> + value="1" title="선택 시 메뉴보이기"> + + +