Merge branch 'master' of github.com:gnuboard/g4s

css/default.css

@@ -416,6 +416,7 @@ a {color:#000;text-decoration:none}
 .new_win h1 {padding:20px 30px 10px;background:#494949;color:#fff;font-size:0.875em}
 .new_win h1 a {color:#fff}
 .new_win article h1 {background:transparent;color:#000}
+.new_win article h1 a {color:#000}
 .new_win h2 {font-size:1em}
 .new_win table {margin:0 auto 30px;width:90%}
 .new_win fieldset {margin:0 auto 30px;width:90%}
@@ -425,7 +426,7 @@ a {color:#000;text-decoration:none}
 .new_win_ul a {display:block;padding:10px;border-right:1px solid #eee;border-left:1px solid #eee;color:#595959;font-family:"dotum";font-size:1em;font-weight:bold}
 .new_win_ul a:hover,
 .new_win_ul a:focus {background:#faf9f5}
-.btn_win {text-align:center} /* 새창용 */
+.btn_win {margin-bottom:20px;text-align:center} /* 새창용 */
 .btn_win a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;font-size:0.75em;text-decoration:none;line-height:2.5em}
 
 /* 포인트 내역 */

skin/board/neo/list.skin.php

@@ -56,7 +56,7 @@ if ($is_nogood) $colspan++;
 </div>
 
 <!-- 게시판 목록 시작 -->
-<form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);">
+<form id="fboardlist" name="fboardlist" method="post">
 <input type="hidden" name="bo_table" value="<?=$bo_table?>">
 <input type="hidden" name="sfl" value="<?=$sfl?>">
 <input type="hidden" name="stx" value="<?=$stx?>">
@@ -128,6 +128,7 @@ for ($i=0; $i<count($list); $i++) {
 <? if (count($list) == 0) { echo '<tr><td colspan="'.$colspan.'" class="empty_table">게시물이 없습니다.</td></tr>'; } ?>
 </tbody>
 </table>
+</form>
 
 <div class="bo_fx">
     <ul class="btn_bo_adm">
@@ -135,9 +136,9 @@ for ($i=0; $i<count($list); $i++) {
         <li><a href="<?=$list_href?>" class="btn02">목록</a></li>
         <? } ?>
         <? if ($is_checkbox) { ?>
-        <li><input type="submit" name="btn_submit" class="btn02" onclick="document.pressed=this.value" value="선택삭제"></li>
+        <li><a href="javascript:select_delete();" class="btn02">선택삭제</a></li>
-        <li><input type="submit" name="btn_submit" class="btn02" onclick="document.pressed=this.value" value="선택복사"></li>
+        <li><a href="javascript:select_copy('copy');" class="btn02">선택복사</a></li>
-        <li><input type="submit" name="btn_submit" class="btn02" onclick="document.pressed=this.value" value="선택이동"></li>
+        <li><a href="javascript:select_copy('move');" class="btn02">선택이동</a></li>
         <? } ?>
     </ul>
 
@@ -145,11 +146,6 @@ for ($i=0; $i<count($list); $i++) {
         <li><? if ($write_href) { ?><a href="<?=$write_href?>" class="btn01">글쓰기</a><? } ?></li>
     </ul>
 </div>
-</form>
-
-<noscript>
-<p>자바스크립트를 사용하지 않는 경우<br>별도의 확인 절차 없이 바로 선택수정 및 선택삭제 처리하므로 주의하시기 바랍니다.</p>
-</noscript>
 
 <!-- 페이지 -->
 <div class="pg">
@@ -174,7 +170,8 @@ function all_checked(sw) {
     }
 }
 
-function fboardlist_submit(f) {
+function check_confirm(str) {
+    var f = document.fboardlist;
     var chk_count = 0;
 
     for (var i=0; i<f.length; i++) {
@@ -183,25 +180,9 @@ function fboardlist_submit(f) {
     }
 
     if (!chk_count) {
-        alert(document.pressed + "할 게시물을 하나 이상 선택하세요.");
+        alert(str + "할 게시물을 하나 이상 선택하세요.");
         return false;
     }
-
-    if(document.pressed == "선택복사") {
-        select_copy("copy");
-        return;
-    }
-
-    if(document.pressed == "선택이동") {
-        select_copy("move");
-        return;
-    }
-
-    if(document.pressed == "선택삭제") {
-        if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다"))
-            return false;
-    }
-
     return true;
 }
 
@@ -214,6 +195,9 @@ function select_copy(sw) {
     else
         str = "이동";
 
+    if (!check_confirm(str))
+        return;
+
     var sub_win = window.open("", "move", "left=50, top=50, width=500, height=550, scrollbars=1");
 
     f.sw.value = sw;

skin/poll/neo/poll_result.skin.php

@@ -85,7 +85,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         </ul>
     </section>
 
-    <div class="btn_window">
+    <div class="btn_win">
-        <a href="javascript:window.close();">창닫기</a>
+        <a href="javascript:window.close();" class="btn_cancel">창닫기</a>
     </div>
 </div>