From 86087cb2e807c1f4dcf372a99ae01f3e9923113d Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 1 Feb 2013 15:17:20 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B7=B0?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 6 +++--- skin/board/neo/list.skin.php | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/css/default.css b/css/default.css index 42f7278ab..5b0423444 100644 --- a/css/default.css +++ b/css/default.css @@ -481,9 +481,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f /* 사이드뷰 */ .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/skin/board/neo/list.skin.php b/skin/board/neo/list.skin.php index 712372a8b..2548cbc10 100644 --- a/skin/board/neo/list.skin.php +++ b/skin/board/neo/list.skin.php @@ -64,7 +64,6 @@ if ($is_nogood) $colspan++; - @@ -118,7 +117,7 @@ if ($is_nogood) $colspan++; if (isset($list[$i]['icon_secret'])) echo $list[$i]['icon_secret']; ?> - + From cb6f3a80f061450b29182334a892ab951d7ce1f8 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 1 Feb 2013 15:18:20 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B7=B0?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=B4=EC=99=842?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/adm.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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} From 3ea1a83423f4daf9866483c7a2492fe542c94f86 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 1 Feb 2013 15:20:26 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EB=8C=93=EA=B8=80=EC=93=B0=EA=B8=B0=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=EB=B2=84=ED=8A=BC=20=EC=9C=84=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 5b0423444..c69fa0978 100644 --- a/css/default.css +++ b/css/default.css @@ -476,7 +476,7 @@ 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} From 46b6073526cd30e0fabb49476201ba8e25a95181 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 1 Feb 2013 15:24:14 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B7=B0=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=B4=EC=99=843?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index c69fa0978..ab47c71f3 100644 --- a/css/default.css +++ b/css/default.css @@ -482,7 +482,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f .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} -.sv .sv_wrap a {display:inline-block;padding:3px;width:94px;border-bottom:1px solid #555;color:#fff} +.sv .sv_wrap a {display:inline-block;padding:3px;width:94px;border-bottom:1px solid #555;color:#fff !important} .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} From 25404f4ee949cda442d4c256ef2edd88fdee779f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 1 Feb 2013 15:30:03 +0900 Subject: [PATCH 5/9] =?UTF-8?q?page=3D=20=EB=91=90=EA=B0=9C=EC=94=A9=20?= =?UTF-8?q?=EB=82=98=EC=98=A4=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/view.php | 4 ++-- lib/common.lib.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) 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/lib/common.lib.php b/lib/common.lib.php index 16ae5d1dd..f1d492138 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; @@ -801,7 +803,7 @@ function get_category_option($bo_table='', $ca_name='') $category = trim($arr[$i]); if (!$category) continue; - $str .= "
글목록
번호
+ @@ -117,7 +118,7 @@ if ($is_nogood) $colspan++; if (isset($list[$i]['icon_secret'])) echo $list[$i]['icon_secret']; ?> - + @@ -229,3 +230,18 @@ function select_copy(sw) { + + + \ No newline at end of file From 7b1e23f792141fe652b2b0f94975d011d6f7b2c0 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 1 Feb 2013 16:40:00 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EB=93=9C=EB=B7=B0=20ie6,7=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=98=A4=EB=8F=99=EC=9E=91=ED=95=98=EB=8A=94=20=EA=B2=83=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- skin/board/neo/list.skin.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/css/default.css b/css/default.css index 119b4feea..51f46c586 100644 --- a/css/default.css +++ b/css/default.css @@ -135,7 +135,7 @@ table a {color:#000;text-decoration:none} .td_bignum {width:80px;text-align:center} .td_mb_id {width:100px;text-align:center} .td_nick {width:100px;text-align:center} -.td_name {position:relative;width:100px;text-align:left} +.td_name {width:100px;text-align:left} .td_date {width:60px;text-align:center} .td_datetime {width:110px;text-align:center} .td_mng {width:80px;text-align:center} diff --git a/skin/board/neo/list.skin.php b/skin/board/neo/list.skin.php index 555305155..48e13f3d0 100644 --- a/skin/board/neo/list.skin.php +++ b/skin/board/neo/list.skin.php @@ -15,10 +15,10 @@ if ($is_nogood) $colspan++;
-
    -
  • 전체
    • +
@@ -240,8 +240,9 @@ $(function() { $td_name.each(function() { $(this).css("z-index", count); + $(this).css("position", "relative"); count--; }); }); - + \ No newline at end of file From 3813b7b165bc251cd19de6d258c77eebf5760370 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 1 Feb 2013 17:10:20 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EB=B6=84?= =?UTF-8?q?=EB=A5=98=20select=20option=20=EC=9D=84=20ul=20li=20=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/list.php | 8 ++++---- bbs/write.php | 1 + lib/common.lib.php | 10 +++++----- skin/board/neo/list.skin.php | 6 +++--- skin/board/neo/write.skin.php | 13 ++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bbs/list.php b/bbs/list.php index c8d3add00..cd09299b9 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -8,10 +8,10 @@ if ($board['bo_use_category']) { $is_category = true; $category_location = './board.php?bo_table='.$bo_table.'&sca='; - $categorys = explode('|', $board['bo_category_list']); // 구분자가 , 로 되어 있음 - for ($i=0; $i'; + $categories = explode('|', $board['bo_category_list']); // 구분자가 , 로 되어 있음 + for ($i=0; $i'; } } 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/lib/common.lib.php b/lib/common.lib.php index 01b161511..4ecde76e5 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -797,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
- + 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 = "공지"; + }'; } ?>
글목록
번호