diff --git a/bbs/list.php b/bbs/list.php index 5fd3973bb..cd09299b9 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -3,10 +3,16 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // 분류 사용 여부 $is_category = false; +$category_option = ''; if ($board['bo_use_category']) { $is_category = true; $category_location = './board.php?bo_table='.$bo_table.'&sca='; - $category_option = get_category_option($bo_table); // SELECT OPTION 태그로 넘겨받음 + + $categories = explode('|', $board['bo_category_list']); // 구분자가 , 로 되어 있음 + for ($i=0; $i'; + } } $sop = strtolower($sop); diff --git a/bbs/view.php b/bbs/view.php index e5cf92346..6cf09d121 100644 --- a/bbs/view.php +++ b/bbs/view.php @@ -47,14 +47,14 @@ if (!$board['bo_use_list_view']) { $prev_href = ''; if (isset($prev['wr_id']) && $prev['wr_id']) { $prev_wr_subject = get_text(cut_str($prev['wr_subject'], 255)); - $prev_href = './board.php?bo_table='.$bo_table.'&wr_id='.$prev['wr_id'].'&page='.$page.$qstr; + $prev_href = './board.php?bo_table='.$bo_table.'&wr_id='.$prev['wr_id'].$qstr; } // 다음글 링크 $next_href = ''; if (isset($next['wr_id']) && $next['wr_id']) { $next_wr_subject = get_text(cut_str($next['wr_subject'], 255)); - $next_href = './board.php?bo_table='.$bo_table.'&wr_id='.$next['wr_id'].'&page='.$page.$qstr; + $next_href = './board.php?bo_table='.$bo_table.'&wr_id='.$next['wr_id'].$qstr; } // 쓰기 링크 diff --git a/bbs/write.php b/bbs/write.php index a5954a0e8..3341aa8f3 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -224,6 +224,7 @@ if ($is_guest || ($is_admin && $w == 'u' && $member['mb_id'] != $write['mb_id']) } $is_category = false; +$category_option = ''; if ($board['bo_use_category']) { $ca_name = ""; if (isset($write['ca_name'])) diff --git a/css/adm.css b/css/adm.css index bbc39538d..c4ad69250 100644 --- a/css/adm.css +++ b/css/adm.css @@ -113,7 +113,6 @@ fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border .td_num {width:60px;text-align:center} .td_bignum {width:120px;text-align:center} .td_mbid, .td_mbnick, .td_mbname {width:100px;text-align:left} -.td_mbnick div, .td_mbname div {position:relative} /* 파이어폭스에서 사이드뷰 위치를 잡기 위함 */ .td_time {width:150px;text-align:center} .td_boolean {width:50px;text-align:center} /* 인덱스 */ @@ -157,9 +156,9 @@ fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border /* 사이드뷰 */ .sv {display:inline-block;position:relative;font-weight:normal} .sv .sv_wrap {display:none;margin-top:5px;border:1px solid #666;background:#484848} -.sv_nojs .sv_wrap {display:block;width:100px !important} -.sv .sv_wrap a {display:block;padding:3px;border-bottom:1px solid #555;color:#fff} -.sv_on {z-index:1000;display:block !important;position:absolute;top:10px;left:20px;width:100px !important;height:auto !important;background:#ddd;overflow:auto} +.sv_nojs .sv_wrap {display:block} +.sv .sv_wrap a {display:inline-block;padding:3px;width:94px;border-bottom:1px solid #555;color:#fff} +.sv_on {z-index:1000;display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd} .sv_member, .sv_guest {font-weight:bold} diff --git a/css/default.css b/css/default.css index 42f7278ab..51f46c586 100644 --- a/css/default.css +++ b/css/default.css @@ -476,14 +476,14 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f #bo_vc_warea {clear:both;position:relative;margin:0 90px 10px 0} #bo_vc_warea textarea {padding:3px;width:100%;height:50px;border:1px solid #ddd;background:#fff;vertical-align:middle} #bo_vc_warea textarea:focus {padding:4px;border:0;background:#494949;color:#fff} -#bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:20px;width:75px;height:57px;border:1px solid #666;background:#494949;color:#fff;letter-spacing:-0.1em} +#bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:0;width:75px;height:57px;border:1px solid #666;background:#494949;color:#fff;letter-spacing:-0.1em} /* 사이드뷰 */ .sv {display:inline-block;position:relative;font-weight:normal} -.sv .sv_wrap {display:none;margin-top:5px;border:1px solid #666;background:#484848} -.sv_nojs .sv_wrap {display:block;width:100px !important} -.sv .sv_wrap a {display:block;padding:3px;border-bottom:1px solid #555;color:#fff} -.sv_on {z-index:1000;display:block !important;position:absolute;top:10px;left:20px;width:100px !important;height:auto !important;background:#ddd;overflow:auto} +.sv .sv_wrap {z-index:1000;display:none;margin-top:5px;border:1px solid #666;background:#484848} +.sv_nojs .sv_wrap {display:block} +.sv .sv_wrap a {display:inline-block;padding:3px;width:94px;border-bottom:1px solid #555;color:#fff !important} +.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd} .sv_member, .sv_guest {font-weight:bold} diff --git a/lib/common.lib.php b/lib/common.lib.php index fb359ac74..4ecde76e5 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -18,6 +18,8 @@ function get_microtime() // 현재페이지, 총페이지수, 한페이지에 보여줄 행, URL function get_paging($write_pages, $cur_page, $total_page, $url, $add="") { + $url = preg_replace('#(&|&)?page\=[0-9]+#', '', $url); + $str = ''; if ($cur_page > 1) { $str .= '처음'.PHP_EOL; @@ -795,17 +797,17 @@ function get_category_option($bo_table='', $ca_name='') { global $g4, $board; - $arr = explode("|", $board['bo_category_list']); // 구분자가 , 로 되어 있음 + $categories = explode("|", $board['bo_category_list']); // 구분자가 , 로 되어 있음 $str = ""; - for ($i=0; $i
- +
@@ -230,3 +230,19 @@ function select_copy(sw) { + + + \ No newline at end of file diff --git a/skin/board/neo/write.skin.php b/skin/board/neo/write.skin.php index 136dd0871..f870310b8 100644 --- a/skin/board/neo/write.skin.php +++ b/skin/board/neo/write.skin.php @@ -152,13 +152,12 @@ echo $option_hidden; // 관리자라면 분류 선택에 '공지' 옵션을 추가함 if ($is_admin) { - echo " - if (typeof(document.fwrite.ca_name) != 'undefined') - { - document.fwrite.ca_name.options.length += 1; - document.fwrite.ca_name.options[document.fwrite.ca_name.options.length-1].value = '공지'; - document.fwrite.ca_name.options[document.fwrite.ca_name.options.length-1].text = '공지'; - }"; + echo ' + if (ca_name_select = document.getElementById("ca_name")) { + ca_name_select.options.length += 1; + ca_name_select.options[ca_name_select.options.length-1].value = "공지"; + ca_name_select.options[ca_name_select.options.length-1].text = "공지"; + }'; } ?>