diff --git a/adm/board_list.php b/adm/board_list.php index f63296f83..a8f821efc 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -115,8 +115,8 @@ $colspan = 15; 수정'; - $one_copy = '복사'; + $one_update = '
  • 수정
    • '; + $one_copy = '
  • 복사
    • '; ?> @@ -156,7 +156,15 @@ $colspan = 15; - + +
    + + +
    + 수정'; + $s_upd = '
  • 수정
    • '; ?> @@ -160,7 +160,14 @@ $colspan = 8; - + +
    + + +
    + 수정'; - //$s_del = '삭제'; + $s_mod = '
  • 수정
    • '; + //$s_del = '
  • 삭제
    • '; } - $s_grp = '그룹'; + $s_grp = '
  • 그룹
    • '; $leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date('Ymd', G4_SERVER_TIME); $intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date('Ymd', G4_SERVER_TIME); @@ -199,7 +199,15 @@ $colspan = 15; -
    + +
    + + +
    + >
    diff --git a/adm/poll_list.php b/adm/poll_list.php index b198bd513..fad175aba 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -103,7 +103,7 @@ $colspan = 6; $row2 = sql_fetch($sql2); $po_etc = ($row['po_etc']) ? "사용" : "미사용"; - $s_mod = '수정'; + $s_mod = '
  • 수정
    • '; //$s_del = '삭제'; ?> @@ -116,7 +116,14 @@ $colspan = 6; - + +
    + + +
    + "> 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다. - - // 사용방법 - // latest(스킨, 게시판아이디, 출력라인, 글자수); + // 사용방법 : latest(스킨, 게시판아이디, 출력라인, 글자수); echo latest('basic', $row['bo_table'], 5, 70); ?> diff --git a/bbs/move.php b/bbs/move.php index adda3c89f..78698d019 100644 --- a/bbs/move.php +++ b/bbs/move.php @@ -43,7 +43,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) ?>
    -

    +

    diff --git a/bbs/write.php b/bbs/write.php index 009d7e79c..dfc2009a4 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -22,8 +22,16 @@ if (!($w == '' || $w == 'u' || $w == 'r')) { alert('w 값이 제대로 넘어오지 않았습니다.'); } -if (($w == 'u' || $w == 'r') && !$write['wr_id']) { - alert("글이 존재하지 않습니다.\\n삭제되었거나 이동된 경우입니다.", G4_URL); +if ($w == 'u' || $w == 'r') { + if ($write['wr_id']) { + // 가변 변수로 $wr_1 .. $wr_10 까지 만든다. + for ($i=1; $i<=10; $i++) { + $vvar = "wr_".$i; + $$vvar = $write['wr_'.$i]; + } + } else { + alert("글이 존재하지 않습니다.\\n삭제되었거나 이동된 경우입니다.", G4_URL); + } } if ($w == '') { diff --git a/css/admin.css b/css/admin.css index 18928fb19..9737f8993 100644 --- a/css/admin.css +++ b/css/admin.css @@ -73,7 +73,7 @@ h2 {font-size:1.2em} #qnb {float:right;margin:0;padding:0;list-style:none} #qnb li {margin-bottom:20px} -#qnb a {display:block;width:40px;font-size:0.9em;letter-spacing:-0.1em;text-align:center} +#qnb a {display:block;width:40px;font-size:0.9em;text-align:center;letter-spacing:-0.1em} #qnb a:focus, #qnb a:hover, #qnb a:active {text-decoration:none} #qnb img {margin-bottom:5px} @@ -233,7 +233,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9 #point_mng {margin-top:50px} /* 회원메일발송 목록 */ .td_test, .td_send {width:50px;text-align:center} -.td_mng {width:110px;text-align:center} +.td_mng {width:100px;text-align:center} .td_smallmng {width:50px;text-align:center} /* 투표관리 목록 */ .td_etc {width:80px;text-align:center} @@ -318,6 +318,15 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9 .sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important} .sv_nojs .sv {display:block} +/* 셀렉트 스타일 UL */ +.sel_wrap {position:relative;width:100px} +.sel_btn {width:100px;height:25px;border:1px solid #000;background:#333;color:#fff} +.sel_ul {display:none;position:absolute;top:10px;right:-20px;margin:0;padding:0;width:88px;border:1px solid #999;border-bottom:0;background:#fff;list-style:none} +.sel_on {display:block;z-index:2} +.sel_li {border-bottom:1px solid #999} +.sel_a {display:block;height:23px;text-align:center;line-height:2em !important;line-height:1.9em} +.sel_a:focus, .sel_a:hover {background:#f5f6fa;text-decoration:none} + /* pagination */ .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center} .pg {display:inline-block;border:1px solid #ddd;letter-spacing:-4px} diff --git a/css/default.css b/css/default.css index 7e7cf8b55..2421b9edf 100644 --- a/css/default.css +++ b/css/default.css @@ -220,6 +220,15 @@ td.empty_table {padding:85px 0;text-align:center} .sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important} .sv_nojs .sv {display:block} +/* 셀렉트 스타일 UL */ +.sel_wrap {position:relative;width:100px} +.sel_btn {width:100px;height:25px;border:1px solid #000;background:#333;color:#fff} +.sel_ul {display:none;position:absolute;top:10px;right:-20px;margin:0;padding:0;width:88px;border:1px solid #999;border-bottom:0;background:#fff;list-style:none} +.sel_on {display:block;z-index:2} +.sel_li {border-bottom:1px solid #999} +.sel_a {display:block;height:23px;text-align:center;line-height:2em !important;line-height:1.9em} +.sel_a:focus, .sel_a:hover {background:#f5f6fa;text-decoration:none} + /* pagination */ .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center} .pg {display:inline-block;border:1px solid #cfded8;letter-spacing:-4px} diff --git a/index.php b/index.php index 3c07d7064..3aa9c62f2 100644 --- a/index.php +++ b/index.php @@ -31,10 +31,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
    환경설정의 최신글 스킨경로를 기본 스킨으로 합니다. - - // 사용방법 - // latest(스킨, 게시판아이디, 출력라인, 글자수); + // 사용방법 : latest(스킨, 게시판아이디, 출력라인, 글자수); echo latest("basic", $row['bo_table'], 5, 25); ?>
    diff --git a/js/common.js b/js/common.js index f1ccb40e9..dadbf203c 100644 --- a/js/common.js +++ b/js/common.js @@ -608,16 +608,46 @@ $(function(){ sv_hide = true; }); + // 셀렉트 ul + var sel_hide = false; + $('.sel_btn').click(function() { + $('.sel_ul').removeClass('sel_on'); + $(this).siblings('.sel_ul').addClass('sel_on'); + }); + + $(".sel_wrap").hover( + function() { + sel_hide = false; + }, + function() { + sel_hide = true; + } + ); + + $('.sel_a').focusin(function() { + sel_hide = false; + }); + + $('.sel_a').focusout(function() { + sel_hide = true; + }); + $(document).click(function() { - if(sv_hide) { + if(sv_hide) { // 사이드뷰 해제 $(".sv").removeClass("sv_on"); } + if (sel_hide) { // 셀렉트 ul 해제 + $('.sel_ul').removeClass('sel_on'); + } }); $(document).focusin(function() { - if(sv_hide) { + if(sv_hide) { // 사이드뷰 해제 $(".sv").removeClass("sv_on"); } + if (sel_hide) { // 셀렉트 ul 해제 + $('.sel_ul').removeClass('sel_on'); + } }); $("textarea#wr_content[maxlength]").live("keyup change", function() { diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php index 8ae3ef6ca..c44a12cc5 100644 --- a/mobile/skin/board/basic/view_comment.skin.php +++ b/mobile/skin/board/basic/view_comment.skin.php @@ -171,7 +171,7 @@ var char_max = parseInt(); // 최대 var subject = ""; var content = ""; $.ajax({ - url: g4_bbs_url+"/filter.ajax.php", + url: g4_bbs_url+"/ajax.filter.php", type: "POST", data: { "subject": "", diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php index c24f751b6..31bc836ef 100644 --- a/mobile/skin/board/basic/write.skin.php +++ b/mobile/skin/board/basic/write.skin.php @@ -202,7 +202,7 @@ function fwrite_submit(f) var subject = ""; var content = ""; $.ajax({ - url: g4_bbs_url+"/filter.ajax.php", + url: g4_bbs_url+"/ajax.filter.php", type: "POST", data: { "subject": f.wr_subject.value, diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php index 952184938..2a4a1c708 100644 --- a/mobile/skin/board/gallery/view_comment.skin.php +++ b/mobile/skin/board/gallery/view_comment.skin.php @@ -174,7 +174,7 @@ var char_max = parseInt(); // 최대 var subject = ""; var content = ""; $.ajax({ - url: g4_bbs_url+"/filter.ajax.php", + url: g4_bbs_url+"/ajax.filter.php", type: "POST", data: { "subject": "", diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php index 76351e6f8..b3d57a10d 100644 --- a/mobile/skin/board/gallery/write.skin.php +++ b/mobile/skin/board/gallery/write.skin.php @@ -202,7 +202,7 @@ function fwrite_submit(f) var subject = ""; var content = ""; $.ajax({ - url: g4_bbs_url+"/filter.ajax.php", + url: g4_bbs_url+"/ajax.filter.php", type: "POST", data: { "subject": f.wr_subject.value, diff --git a/plugin/ckeditor/config.js b/plugin/ckeditor/config.js index a6eb7cb96..0326750a6 100644 --- a/plugin/ckeditor/config.js +++ b/plugin/ckeditor/config.js @@ -106,8 +106,8 @@ CKEDITOR.editorConfig = function( config ) { 'Arial;Comic Sans MS;Courier New;Lucida Sans Unicode;monospace;sans-serif;serif;Tahoma;Times New Roman;Verdana'; config.fontSize_defaultLabel = "10pt"; config.fontSize_sizes = "7pt/9px;8pt/11px;9pt/12px;10pt/13px;11pt/15px;14pt/19px;18pt/24px;24pt/32px;36/48px;"; - config.enterMode = CKEDITOR.ENTER_BR; - config.shiftEnterMode = CKEDITOR.ENTER_P; + config.enterMode = CKEDITOR.ENTER_DIV; + config.shiftEnterMode = CKEDITOR.ENTER_DIV; config.filebrowserUploadUrl = g4_ckeditor_url+"/upload.php?type=Images"; config.keystrokes=[ // Formatting diff --git a/plugin/gcaptcha/gcaptcha.js b/plugin/gcaptcha/gcaptcha.js index a1657af64..1067a1638 100644 --- a/plugin/gcaptcha/gcaptcha.js +++ b/plugin/gcaptcha/gcaptcha.js @@ -26,7 +26,7 @@ function chk_captcha() $(function() { $("#captcha").click(function(e) { - this.setAttribute("src", g4_url+"/plugin/captcha/run.php?t="+(new Date).getTime()); + this.setAttribute("src", g4_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime()); var keycode = (e.keyCode ? e.keyCode : e.which); // 첫 실행에서는 포커스를 주지 않음 if (typeof(keycode) != "undefined") { diff --git a/skin/board/basic/list.skin.php b/skin/board/basic/list.skin.php index 1b38c1a88..deb6243e6 100644 --- a/skin/board/basic/list.skin.php +++ b/skin/board/basic/list.skin.php @@ -115,7 +115,7 @@ if ($is_nogood) $colspan++; ?> - + diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index 6086927e5..f07ac5772 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -12,7 +12,8 @@ var char_max = parseInt(); // 최대

    댓글목록

    ); // 최대 } */ $comment = preg_replace("/\[\\]/i", "", $comment); + $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결 ?>
    style="margin-left:px;border-top-color:#e0e0e0"> -
    +

    님의 댓글

    댓글의 댓글 @@ -122,6 +124,10 @@ var char_max = parseInt(); // 최대 + + 내용 @@ -175,7 +181,7 @@ var char_max = parseInt(); // 최대 var subject = ""; var content = ""; $.ajax({ - url: g4_bbs_url+"/filter.ajax.php", + url: g4_bbs_url+"/ajax.filter.php", type: "POST", data: { "subject": "", diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 4c7305153..444460d2e 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -173,7 +173,7 @@ function fwrite_submit(f) var subject = ""; var content = ""; $.ajax({ - url: g4_bbs_url+"/filter.ajax.php", + url: g4_bbs_url+"/ajax.filter.php", type: "POST", data: { "subject": f.wr_subject.value, diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php index c03297c4a..f0f0769ac 100644 --- a/skin/board/gallery/view_comment.skin.php +++ b/skin/board/gallery/view_comment.skin.php @@ -12,18 +12,23 @@ var char_max = parseInt(); // 최대

    댓글목록

    \]/i", "", $str); + */ + $comment = preg_replace("/\[\\]/i", "", $comment); + $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결 ?> +
    style="margin-left:px;border-top-color:#e0e0e0"> -
    +

    님의 댓글

    댓글의 댓글 @@ -34,14 +39,14 @@ var char_max = parseInt(); // 최대 작성일

    - "; ?> - + 비밀글 +

    @@ -127,7 +132,7 @@ var char_max = parseInt(); // 최대 내용 글자 - - - 0) { ?>
    총 건 가나다순 정렬