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

bbs/move.php

@@ -85,13 +85,20 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
 
     <div class="btn_win btn_confirm">
         <input type="submit" id="btn_submit" class="btn_submit" value="<?=$act?>">
-        <a href="javascript:window.close();" class="btn_cancel">창닫기</a>
     </div>
     </form>
 
 </div>
 
 <script>
+$(function() {
+    $(".btn_win").append("<a class=\"btn_cancel\">창닫기</a>");
+
+    $(".btn_win a").click(function() {
+        window.close();
+    });
+});
+
 function fboardmoveall_submit(f)
 {
     var check = false;

skin/board/neo/view.skin.php

@@ -121,7 +121,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
         <? if ($scrap_href || $good_href || $nogood_href) { ?>
         <div id="bo_v_act">
-            <? if ($scrap_href) { ?><a href="<? echo $scrap_href; ?>" onclick="win_scrap(this.href); return false;" target="_blank" class="btn02">스크랩</a><? } ?>
+            <? if ($scrap_href) { ?><a href="<? echo $scrap_href; ?>" onclick="win_scrap(this.href); return false;" class="btn02">스크랩</a><? } ?>
             <? if ($good_href) {?><a href="<?=$good_href?>" class="btn02" target="hiddenframe">추천 <strong><?=number_format($view['wr_good'])?></strong></a><? } ?>
             <? if ($nogood_href) {?><a href="<?=$nogood_href?>" class="btn02" target="hiddenframe">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a><? } ?>
         </div>