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

Conflicts:
	skin/poll/neo/poll.skin.php

bbs/gcaptcha/gcaptcha.lib.php

@@ -6,7 +6,7 @@ class gcaptcha
     // 이미지크기 폭
     var $width = 70;
     // 이미지크기 높이
-    var $height = 20;
+    var $height = 22;
     // 폰트 사이즈
     var $size = 13;
     // 폰트 기울기
@@ -149,9 +149,8 @@ function captcha_html($class="captcha")
 
     $html  = '<fieldset id="captcha" class="'.$class.'">';
     $html .= '<legend class="sound_only">스팸방지</legend>';
-    $html .= '<img src="'.captcha_file('.png').'" title="스팸방지 숫자">';
-    $html .= '<a href="'.captcha_file('.wav').'" id="captcha_wav">음성듣기</a>';
-    $html .= '<label for="captcha_key">스팸방지 숫자 입력</label>';
+    $html .= '<img src="'.captcha_file('.png').'" alt="스팸방지 숫자">';
+    $html .= '<a href="'.captcha_file('.wav').'" id="captcha_wav"><img src="'.$g4['bbs_path'].'/gcaptcha/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
     $html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box fieldset_input" size="6" maxlength="6" required title="스팸방지 숫자 입력">';
     $html .= '<p class="sound_only">스팸방지 숫자를 순서대로 입력하세요.</p>';
     $html .= '</fieldset>';

css/default.css

@@ -20,11 +20,6 @@ hr {display:none}
 #to_content a:focus,
 #to_content a:active {padding:10px 0;width:100%;height:auto;background:#333;color:#fff;text-align:center;overflow:auto}
 
-/* 자동등록방지 */
-.captcha {display:inline-block;vertical-align:middle}
-.captcha label {display:inline-block;margin:0;padding:0;width:0;height:0;overflow:hidden}
-#captcha_iframe {display:inline-block;margin:0;padding:0;width:80px;height:25px;border:0;vertical-align:middle;overflow:hidden}
-
 /* 기본테이블 */
 table {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0}
 tfoot th {border-top:1px solid #c9c9c9;border-bottom:1px solid #c9c9c9}
@@ -36,6 +31,10 @@ th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록
 td {padding:10px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;font-size:0.75em}
 .empty_table {padding:85px 0;text-align:center}
 
+/* 캡챠 자동등록(입력)방지 기본 */
+#captcha img {border:1px solid #ddd;border-right:0}
+#captcha_wav img {border:1px solid #ddd;border-left:0;background:#494949}
+
 /* 필드셋 */
 fieldset {margin-bottom:20px;padding:13px;border:1px solid #dedace;background:#fefefe}
 legend {margin-left:0;padding:7px 10px;border:1px solid #dedace;background:#333;color:#fff}
@@ -73,24 +72,24 @@ a {color:#000;text-decoration:none}
 #header h1 {margin:0;height:0;overflow:hidden}
 
 /* 로고 */
-#logo {padding-top:35px;border-bottom:3px solid #666;background:url('../img/logo_bg.jpg') #333 top center repeat-x;text-align:center}
+#logo {margin-top:31px;border-bottom:3px solid #666;background:url('../img/logo_bg.jpg') #333 top center repeat-x;text-align:center}
 #logo a {display:inline-block;padding:20px 30px 20px}
 
 /* 상단메뉴 */
-#tnb {position:absolute;top:0;left:0;width:100%;border-bottom:1px solid #000;background:url('../img/tnb_bg.jpg') #fff bottom left repeat-x;zoom:1}
+#tnb {position:absolute;top:-31px;left:0;width:100%;border-bottom:1px solid #bbb;background:url('../img/tnb_bg.jpg') #fff bottom left repeat-x;zoom:1}
 #tnb:after {display:block;visibility:hidden;clear:both;content:""}
 #tnb li {float:left}
-#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #ccc;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
+#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #dadada;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
 
 /* 전체검색 */
-#hdsch {z-index:3;position:absolute;top:0;right:0;margin:0;padding:0;width:220px;border:0;border-left:1px solid #bbb;background:url('../img/search_bg.jpg') #fff bottom left repeat-x}
+#hdsch {z-index:3;position:absolute;top:-31px;right:0;margin:0;padding:0;width:219px;border:0;border-left:1px solid #bbb;background:url('../img/search_bg.jpg') #fff bottom left repeat-x}
 #hdsch legend {position:absolute;padding:0;width:0;height:0;border:0;overflow:hidden}
 #hdsch_stx {margin:5px 0 5px 5px;padding:0 5px;height:20px;width:170px;border:0;background:transparent;font-size:1em;line-height:1.4em}
 #hdsch_stx:focus {background:#464649;color:#fff}
 #hdsch_submit {position:relative}
 
 /* 사이드 네비게이션: 아웃로그인, 설문조사 등 */
-#snb {z-index:3;position:absolute;top:115px;right:0;font-family:"verdana","dotum"}
+#snb {z-index:3;position:absolute;top:111px;right:0;font-family:"verdana","dotum"}
 #snb ul {margin:0;padding:0;list-style:none}
 
 /* 아웃로그인 */
@@ -176,7 +175,7 @@ a {color:#000;text-decoration:none}
 #wrapper h1 {font-size:1em}
 
 /* 레이아웃 하단 */
-#footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #bbb;color:#595959;font-size:0.75em}
+#footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #666;color:#595959;font-size:0.75em}
 #footer h1 {margin:0;height:0;overflow:hidden}
 #footer section {margin-left:20px}
 #footer h2 {margin:0;width:100px;color:#000;font-size:1em}
@@ -365,23 +364,21 @@ a {color:#000;text-decoration:none}
 .bo_vc_info dt {float:left}
 .bo_vc_info dd {float:left;margin:0 15px 0 10px}
 #bo_vc p {padding:0;font-size:0.75em}
-#bo_vc fieldset {margin:0;padding:5px 0 0;border:0;border-top:1px solid #ddd;background:transparent;font-size:0.75em}
-#bo_vc .captcha {padding:0;border:0;font-size:1em !important}
-#bo_vc .captcha a {display:inline-block;margin-right:5px;text-decoration:underline}
-#bo_vc .fieldset_input {margin-right:5px;vertical-align:top}
+#bo_vc fieldset {margin:0 0 10px;padding:0;border:0;background:transparent;font-size:0.75em}
+#bo_vc #bo_vc_winfo {float:left}
+#bo_vc #captcha {float:left;margin-left:10px;padding:0 5px 0 0;border:0}
+#bo_vc #captcha a {display:inline-block;margin-right:5px;text-decoration:underline;vertical-align:middle}
+#bo_vc .fieldset_input {margin-right:5px}
 #bo_vc footer {zoom:1}
 #bo_vc footer:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_vc_act {float:right;margin:0;font-size:0.75em;list-style:none;zoom:1}
 .bo_vc_act:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_vc_act li {float:left;margin-left:5px}
-#bo_vc_w {position:relative;margin-top:10px;zoom:1}
-#bo_vc_w:after {display:block;visibility:hidden;clear:both;content:""}
-#bo_vc_w fieldset {margin:0;padding:0 0 0 10px;border:0;background:transparent;font-size:0.75em}
+#bo_vc_w {position:relative;margin-top:10px}
 #bo_vc_w #char_cnt {position:absolute;top:5px;right:10px}
-/* 댓글 CAPTCHA */
-#bo_vc_w #captcha_comment {font-size:1em !important}
-#bo_vc_warea {position:relative;margin:10px 100px 10px 0}
-#bo_vc_warea textarea {width:100%;height:50px}
+#bo_vc_warea {clear:both;position:relative;margin:0 100px 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:10px;width:75px;height:57px;border:1px solid #666;background:#494949;color:#fff;letter-spacing:-0.1em}
 
 /* 우편번호 검색 */

head.php

@@ -18,8 +18,6 @@ include_once($g4['path'].'/lib/popular.lib.php');
     <h1><?=$config['cf_title']?></h1>
 
     <ul id="tnb">
-        <li><a href="<?=$g4['bbs_path']?>/current_connect.php">현재접속자</a></li>
-        <li><a href="<?=$g4['bbs_path']?>/new.php">최근게시물</a></li>
         <? if ($is_member) { ?>
         <? if ($is_admin) { ?><li><a href="<?=$g4['path']?>/adm">관리자</a></li><? } ?>
         <li><a href="<?=$g4['bbs_path']?>/member_confirm.php?url=register_form.php">정보수정</a></li>
@@ -28,6 +26,8 @@ include_once($g4['path'].'/lib/popular.lib.php');
         <li><a href="<?=$g4['bbs_path']?>/register.php">회원가입</a></li>
         <li><a href="<?=$g4['bbs_path']?>/login.php">로그인</a></li>
         <? } ?>
+        <li><a href="<?=$g4['bbs_path']?>/current_connect.php">현재접속자</a></li>
+        <li><a href="<?=$g4['bbs_path']?>/new.php">최근게시물</a></li>
     </ul>
 
     <fieldset id="hdsch">

skin/board/neo/view_comment.skin.php

@@ -26,10 +26,12 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
     ?>
     <article id="c_<?=$comment_id?>">
         <header>
-            <h1><?=$list[$i]['name']?>님의 댓글</h1>
+            <h1><?=$list[$i]['name']?><span class="sound_only">님의 댓글</span></h1>
             <dl class="bo_vc_info">
+                <? if ($is_ip_view) { ?>
                 <dt>아이피</dt>
-                <dd><? if ($is_ip_view) { echo $list[$i]['ip'];} ?></dd>
+                <dd><?=$list[$i]['ip'];?></dd>
+                <? } ?>
                 <dt>작성일</dt>
                 <dd><time datetime="<?=date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime']))?>"><?=$list[$i]['datetime']?></time></dd>
             </dl>
@@ -42,7 +44,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
         <span id="reply_<?=$comment_id?>"></span><!-- 답변 -->
 
         <input type="hidden" id="secret_comment_<?=$comment_id?>" value="<?=strstr($list[$i]['wr_option'],"secret")?>">
-        <textarea id="save_comment_<?=$comment_id?>"><?=get_text($list[$i]['content1'], 0)?></textarea>
+        <textarea id="save_comment_<?=$comment_id?>" style="display:none"><?=get_text($list[$i]['content1'], 0)?></textarea>
 
         <? if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) { ?>
         <footer>
@@ -71,22 +73,23 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
 
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <fieldset>
+        <fieldset id="bo_vc_winfo">
+            <legend class="sound_only">작성자</legend>
             <? if ($is_guest) { ?>
             <label for="wr_name">이름</label> <input type="text" id="wr_name" name="wr_name" class="fieldset_input required" maxLength="20" size="5" required>
             <label for="wr_password">패스워드</label> <input type="password" id="wr_password" name="wr_password" class="fieldset_input required" maxLength="20" size="10" required>
-            <? echo $captcha_html; ?>
             <? } ?>
             <input type="checkbox" id="wr_secret" name="wr_secret" value="secret">
             <label for="wr_secret">비밀글</label>
-            <? if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?}?>
-            <div id="bo_vc_warea">
-                <textarea id="wr_content" name="wr_content" required
-                <? if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?}?>></textarea>
-                <? if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?}?>
-                <input type="submit" class="bo_vc_submit" value="댓글입력">
-            </div>
-        </fieldset>
+       </fieldset>
+       <? echo $captcha_html; ?>
+        <? if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?}?>
+        <div id="bo_vc_warea">
+            <textarea id="wr_content" name="wr_content" required
+            <? if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?}?>></textarea>
+            <? if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?}?>
+            <input type="submit" class="bo_vc_submit" value="댓글입력">
+        </div>
     </aside>
 
     </form>

skin/poll/neo/poll.skin.php

@@ -19,7 +19,11 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
 <section id="poll">
     <header>
         <h2>설문조사</h2>
+<<<<<<< HEAD
         <? if ($is_admin == "super") { ?><a href="<?=$g4['admin_url']?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
+=======
+        <? if ($is_admin == "super") { ?><a href="<?=$g4[admin_path]?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문관리</a><? } ?>
+>>>>>>> 0ab17c519cdc47fc3b68ff37272f5d3ee0aff8b1
         <p><?=$po['po_subject']?></p>
     </header>
     <ul>