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

adm/admin.lib.php

@@ -15,6 +15,7 @@ function get_skin_select($skin_gubun, $id, $name, $selected='', $event='')
     $skins = get_skin_dir($skin_gubun);
     $str = "<select id=\"$id\" name=\"$name\" $event>\n";
     for ($i=0; $i<count($skins); $i++) {
+        if ($i == 0) $str .= "<option value=\"\">선택</option>";
         $str .= option_selected($skins[$i], $selected);
     }
     $str .= "</select>";
@@ -27,6 +28,7 @@ function get_mobile_skin_select($skin_gubun, $id, $name, $selected='', $event=''
     $skins = get_skin_dir($skin_gubun, G4_MOBILE_PATH.'/'.G4_SKIN_DIR);
     $str = "<select id=\"$id\" name=\"$name\" $event>\n";
     for ($i=0; $i<count($skins); $i++) {
+        if ($i == 0) $str .= "<option value=\"\">선택</option>";
         $str .= option_selected($skins[$i], $selected);
     }
     $str .= "</select>";

adm/board_copy.php

@@ -41,14 +41,15 @@ include_once(G4_PATH.'/head.sub.php');
     </tr>
     </tbody>
     </table>
-</div>
 
-<div class="btn_confirm">
+    <div class="btn_confirm">
-    <input type="submit" class="btn_submit" value="복사">
+        <input type="submit" class="btn_submit" value="복사">
-    <input type="button" class="btn_cancel" value="창닫기" onclick="window.close();">
+        <input type="button" class="btn_cancel" value="창닫기" onclick="window.close();">
-</div>
+    </div>
 
-</form>
+    </form>
+
+</div>
 
 <script>
 function fboardcopy_check(f)

adm/board_form.php

@@ -37,7 +37,7 @@ if ($w == '') {
 
     $html_title .= ' 생성';
 
-    $bo_table_attr = 'class="required alnum_"';
+    $bo_table_attr = 'required alnum_';
     $sound_only = '<strong class="sound_only">필수</strong>';
 
     $board['bo_count_delete'] = 1;
@@ -127,7 +127,7 @@ $pg_anchor = "<ul class=\"anchor\">
     <tr>
         <th scope="row"><label for="bo_table">TABLE<?=$sound_only?></label></th>
         <td colspan="2">
-            <input type="text" name="bo_table" value="<?=$board['bo_table'] ?>" id="bo_table" required class="required frm_input" maxlength="20" <?=$bo_table_attr?>>
+            <input type="text" name="bo_table" value="<?=$board['bo_table'] ?>" id="bo_table" required class="frm_input <?=$bo_table_attr?>" maxlength="20">
             <? if ($w == '') { ?>
                 영문자, 숫자, _ 만 가능 (공백없이 20자 이내)
             <? } else { ?>

adm/boardgroup_form.php

@@ -76,7 +76,7 @@ include_once('./admin.head.php');
         <th scope="row"><label for="gr_device">접속기기</label></th>
         <td>
             <?=help("PC 와 모바일 사용을 구분합니다.")?>
-            <select id="gr_device_" name="gr_device">
+            <select id="gr_device" name="gr_device">
                 <option value="both"<?=get_selected($group['gr_device'], 'both', true);?>>PC와 모바일에서 모두 사용</option>
                 <option value="pc"<?=get_selected($group['gr_device'], 'pc');?>>PC 전용</option>
                 <option value="mobile"<?=get_selected($group['gr_device'], 'mobile');?>>모바일 전용</option>
@@ -144,11 +144,6 @@ include_once('./admin.head.php');
 </div>
 
 <script>
-if (document.fboardgroup.w.value == '')
-    document.fboardgroup.gr_id.focus();
-else
-    document.fboardgroup.gr_subject.focus();
-
 function fboardgroup_check(f)
 {
     f.action = './boardgroup_form_update.php';

bbs/ckeditor/config.js

@@ -43,6 +43,8 @@ CKEDITOR.on('dialogDefinition', function(ev) {
             this.selectPage('Upload'); 
         }; 
 
+        /*
+        alt 를 넘기지 못하는 관계로 주석 처리함. 130314 kagla
         dialogDefinition.onOk = function (e) {
             var imageSrcUrl = e.sender.originalElement.$.src;
             var imgHtml = CKEDITOR.dom.element.createFromHtml('<img src=' + imageSrcUrl + ' alt="" />');
@@ -55,6 +57,7 @@ CKEDITOR.on('dialogDefinition', function(ev) {
                 $(".cke_dialog_ui_button_ok span").click();
             }
         };
+        */
 
         /*
         var uploadTab = dialogDefinition.getContents('Upload');

css/default.css

@@ -38,6 +38,7 @@ a:active {color:#000;text-decoration:underline}
 /* 캡챠 자동등록(입력)방지 기본 */
 #captcha img {border:1px solid #cfded8;border-right:0}
 #captcha_mp3 img {border:1px solid #cfded8;border-left:0;background:#494949}
+#mp3_embed {position:absolute;top:0;left:0;width:1px;height:1px;overflow:hidden} /* 익스 8 이하에서 음성캡챠 실행 스타일 */
 
 /* 상단 레이아웃 */
 #hd {height:73px;border-top:3px solid #151515;border-bottom:1px solid #e7f1ed;background:#fff}

install/install_config.php

@@ -17,7 +17,7 @@ if ($_POST['agree'] != '동의함') {
 }
 ?>
 
-    <form id="frm_install" method="post" action="./install_db.php" onsubmit="return frm_install_submit(this)">
+    <form id="frm_install" method="post" action="./install_db.php" autocomplete="off" onsubmit="return frm_install_submit(this)">
     <table style="margin-bottom:30px">
     <caption>MySQL 정보입력</caption>
     <colgroup>

lib/common.lib.php

@@ -837,6 +837,7 @@ function get_group_select($name, $selected='', $event='')
     $result = sql_query($sql);
     $str = "<select id=\"$name\" name=\"$name\" $event>\n";
     for ($i=0; $row=sql_fetch_array($result); $i++) {
+        if ($i == 0) $str .= "<option value=\"\">선택</option>";
         $str .= option_selected($row['gr_id'], $selected, $row['gr_subject']);
     }
     $str .= "</select>";

mobile/skin/member/kcpcert/register_form.skin.php

@@ -109,6 +109,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </th>
     <td>
         <input type="text" name="mb_zip1"value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" title="우편번호 앞자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> >
+        -
         <input type="text" name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" title="우편번호 뒷자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?>>
         <a href="<? echo $zip_href; ?>" target="_blank" id="reg_zip_find" class="btn_frmline win_zip_find">주소찾기</a>
         <input type="text" name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" title="행정구역주소" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?>>

skin/member/basic/formmail.skin.php

@@ -44,7 +44,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </tr>
     <tr>
         <th scope="row"><label for="file1">첨부 1</label></th>
-        <td><input type="file"name="file1"  id="file1"  class="frm_input"></td>
+        <td><input type="file" name="file1"  id="file1"  class="frm_input"></td>
     </tr>
     <tr>
         <th scope="row"><label for="file2">첨부 2</label></th>

skin/member/basic/register_form.skin.php

@@ -104,7 +104,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </th>
     <td>
         <input type="text" name="mb_zip1" value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" title="우편번호 앞자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?>>
-          -
+        -
         <input type="text"  name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" title="우편번호 뒷자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?>>
         <a href="<? echo $zip_href; ?>" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소찾기</a>
         <input type="text"  name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1"  title="행정구역주소" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?>>

skin/member/kcpcert/register_form.skin.php

@@ -109,7 +109,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </th>
     <td>
         <input type="text" name="mb_zip1"value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" title="우편번호 앞자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> >
-          -
+        -
         <input type="text" name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" title="우편번호 뒷자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?>>
         <a href="<? echo $zip_href; ?>" target="_blank" id="reg_zip_find" class="btn_frmline win_zip_find">주소찾기</a>
         <input type="text" name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" title="행정구역주소" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?>>

tail.sub.php

@@ -84,17 +84,19 @@ $(function(){
         hide_menu = true;
     });
 
-    $(document).click(function() {
+    $('#gnb_ul>li').bind('mouseleave',function(){
+        submenu_hide();
+    });
+
+    $(document).bind('click focusin',function(){
         if(hide_menu) {
-            $(".gnb_1depth").removeClass("gnb_1depth_over gnb_1depth_over2 gnb_1depth_on");
+            submenu_hide();
         }
     });
 
-    $(document).focusin(function() {
+    function submenu_hide() {
-        if(hide_menu) {
+        $(".gnb_1depth").removeClass("gnb_1depth_over gnb_1depth_over2 gnb_1depth_on");
-            $(".gnb_1depth").removeClass("gnb_1depth_over gnb_1depth_over2 gnb_1depth_on");
+    }
-        }
-    });
 
     // 텍스트 리사이즈 카운트 쿠키있으면 실행
     var resize_act;