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

css/default.css

@@ -136,7 +136,6 @@ table a {color:#000;text-decoration:none}
 .td_mb_id {width:100px;text-align:center}
 .td_nick {width:100px;text-align:center}
 .td_name {width:100px;text-align:left}
-.td_name div {position:relative}
 .td_date {width:60px;text-align:center}
 .td_datetime {width:110px;text-align:center}
 .td_mng {width:80px;text-align:center}
@@ -393,7 +392,8 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
 .btn_bo_user {float:right;margin:0;padding:0;list-style:none}
 .btn_bo_user li {float:left;margin-left:5px}
 #bo_list caption {padding:0;height:0;color:transparent;overflow:hidden} /* ff에서 감추기 위해 color:transparent 사용 */
-#bo_list strong {color:#109ff1}
+#bo_list .sv_member,
+#bo_list .sv_guest {font-weight:normal} /* 사이드뷰 글자 스타일 */
 .btn_bo_adm {float:left}
 .btn_bo_adm li {float:left;margin-right:5px}
 .bo_notice {}
@@ -452,11 +452,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
 #bo_vc {margin:0 20px 10px;padding:10px 20px 20px 20px;background:#f9f9f9}
 #bo_vc h2 {margin:0;padding:0;height:0;overflow:hidden}
 #bo_vc article {margin-bottom:5px;padding:0 0 10px;border-bottom:1px solid #eee}
-#bo_vc header {position:relative;zoom:1}
+#bo_vc header {position:relative;padding:8px 0}
-#bo_vc header:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_vc header .icon_reply {position:absolute;top:15px;left:-20px}
-#bo_vc header span {}
+#bo_vc h1 {width:0;height:0;overflow:hidden}
-#bo_vc h1 {display:inline-block;margin:15px 10px 5px 0}
 #bo_vc a {color:#000;text-decoration:none}
 #bo_vc p {padding:0 0 5px;line-height:1.8em}
 #bo_vc p a {text-decoration:underline}
@@ -481,9 +479,14 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
 #bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:20px;width:75px;height:57px;border:1px solid #666;background:#494949;color:#fff;letter-spacing:-0.1em}
 
 /* 사이드뷰 */
-#sideview {z-index:1000;position:absolute;top:15px;left:20px;margin:0 !important;padding:0 !important;border:1px solid #999;background:#f9f9f9}
+.sv {display:inline-block;position:relative;font-weight:normal}
-#sideview ul {margin:0 !important;padding:0 !important;list-style:none !important}
+.sv .sv_wrap {display:block;margin-top:5px;border:1px solid #eee;background:#f7f7f2}
-#sideview a {display:inline-block;padding:5px 10px 4px;width:100px;border-bottom:1px solid #ddd;color:#000;font-weight:normal;text-decoration:none}
+.sv .sv_wrap a {display:block;padding:3px;border-bottom:1px solid #eee}
+.sv_on {z-index:1000;position:absolute;top:10px;left:20px;width:100px !important;height:auto !important;background:#ddd;overflow:auto}
+.sv_off {display:block;position:absolute;margin:0 !important;width:0;height:0;border:0 !important;overflow:hidden}
+.sv_off a {margin:0;padding:0;width:0;height:0;overflow:hidden}
+.sv_member,
+.sv_guest {font-weight:bold}
 
 /* pagination */
 .pg {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}

js/common.js

@@ -569,14 +569,15 @@ $(function(){
     });
 
     // 사이드뷰
-    var sv_hide = true;
+    var sv_hide = false;
-    $('.sv').click(function() {
+    $('.sv_wrap').addClass('sv_off');
-        $('.sv_wrap').hide();
-        $(this).find('.sv_wrap').show();
 
+    $('.sv_member, .sv_guest').click(function() {
+        $('.sv_wrap').removeClass('sv_on').addClass('sv_off');
+        $(this).closest('.sv').find('.sv_wrap').removeClass('sv_off').addClass('sv_on');
     });
 
-    $('.sv_wrap').hover(
+    $('.sv, .sv_wrap').hover(
         function() {
             sv_hide = false;
         },
@@ -585,9 +586,29 @@ $(function(){
         }
     );
 
+    $('.sv_member, .sv_guest').focusin(function() {
+        sv_hide = false;
+        $('.sv_wrap').removeClass('sv_on').addClass('sv_off');
+        $(this).closest('.sv').find('.sv_wrap').removeClass('sv_off').addClass('sv_on');
+    });
+
+    $('.sv_wrap a').focusin(function() {
+        sv_hide = false;
+    });
+
+    $('.sv_wrap a').focusout(function() {
+        sv_hide = true;
+    });
+
     $(document).click(function() {
         if(sv_hide) {
-            $('.sv_wrap').hide();
+            $('.sv_wrap').removeClass('sv_on').addClass('sv_off');
+        }
+    });
+
+    $(document).focusin(function() {
+        if(sv_hide) {
+            $('.sv_wrap').removeClass('sv_on').addClass('sv_off');
         }
     });
 });

lib/common.lib.php

@@ -378,7 +378,7 @@ function get_list($write_row, $board, $skin_path, $subject_len=40)
     if ($board['bo_use_sideview'])
         $list['name'] = get_sideview($list['mb_id'], $tmp_name, $list['wr_email'], $list['wr_homepage']);
     else
-        $list['name'] = '<span class="'.($list['mb_id']?'member':'guest').'">'.$tmp_name.'</span>';
+        $list['name'] = '<span class="'.($list['mb_id']?'sv_member':'sv_guest').'">'.$tmp_name.'</span>';
 
     $reply = $list['wr_reply'];
 
@@ -958,7 +958,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
 
     $tmp_name = "";
     if ($mb_id) {
-        $tmp_name = "<span class=\"sv_member\">$name</span>";
+        $tmp_name = "<a href=\"#\" class=\"sv_member\">$name</a>";
 
         if ($config['cf_use_member_icon']) {
             $mb_dir = substr($mb_id,0,2);
@@ -971,13 +971,13 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
                 $tmp_name = '<img src="'.$icon_file_url.'" width="'.$width.'" height="'.$height.'" border="0" alt="">';
 
                 if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
-                    $tmp_name = $tmp_name . ' <span class="sv_member">'.$name.'</span>';
+                    $tmp_name = $tmp_name . ' <a href="#" class="sv_member">'.$name.'</a>';
             }
         }
 
         $title_mb_id = '['.$mb_id.']';
     } else {
-        $tmp_name = '<span class="sv_guest">'.$name.'</span>';
+        $tmp_name = '<a href="#" class="sv_guest">'.$name.'</a>';
         $title_mb_id = '[비회원]';
     }
 
@@ -985,7 +985,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
     $email    = get_text($email);
     $homepage = get_text($homepage);
 
-    $str = "<a href=\"\" class=\"sv\">\n";
+    $str = "<strong class=\"sv\">\n";
     $str .= $tmp_name."\n";
     $str .= "<span class=\"sv_wrap\">\n";
     if($mb_id)
@@ -1009,7 +1009,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
         $str .= "<a href=\"".G4_ADMIN_URL."/point_list.php?sfl=mb_id&amp;stx=".$mb_id."\" target=\"_blank\">포인트내역</a>\n";
     }
     $str .= "</span>\n";
-    $str .= "</a>";
+    $str .= "</strong>";
 
     return $str;
 }

skin/board/neo/list.skin.php

@@ -118,7 +118,7 @@ if ($is_nogood) $colspan++;
             if (isset($list[$i]['icon_secret'])) echo $list[$i]['icon_secret'];
             ?>
         </td>
-        <td class="td_name"><div><?=$list[$i]['name']?></div></td>
+        <td class="td_name"><?=$list[$i]['name']?></td>
         <td class="td_date"><?=$list[$i]['datetime2']?></td>
         <td class="td_num"><?=$list[$i]['wr_hit']?></td>
         <? if ($is_good) { ?><td class="td_num"><?=$list[$i]['wr_good']?></td><? } ?>

skin/board/neo/view_comment.skin.php

@@ -26,7 +26,8 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
     ?>
     <article id="c_<?=$comment_id?>" <?if ($cmt_depth) {?>style="margin-left:<?=$cmt_depth?>px"<?}?>>
         <header>
-            <h1><?=$list[$i]['name']?><span class="sound_only">님의 댓글</span></h1>
+            <h1><?=$list[$i]['wr_name']?><span class="sound_only">님의 댓글</span></h1>
+            <?=$list[$i]['name']?>
             <? if ($cmt_depth) {?><img src="<?=$board_skin_url?>/img/icon_reply.gif" class="icon_reply" alt="댓글의 댓글"><? } ?>
             <? if ($is_ip_view) { ?>
             아이피

skin/member/neo/ajax_mb_email_check.php

@@ -1,6 +1,6 @@
 <?
 include_once("_common.php");
-include_once($g4['path'].'/lib/register.lib.php');
+include_once(G4_LIB_PATH.'/register.lib.php');
 
 $mb_email = escape_trim($_POST['reg_mb_email']);
 $mb_id    = escape_trim($_POST['reg_mb_id']);

skin/member/neo/ajax_mb_id_check.php

@@ -1,6 +1,6 @@
 <?
 include_once("_common.php");
-include_once($g4['path'].'/lib/register.lib.php');
+include_once(G4_LIB_PATH.'/register.lib.php');
 
 $mb_id = escape_trim($_POST['reg_mb_id']);
 

skin/member/neo/ajax_mb_nick_check.php

@@ -1,6 +1,6 @@
 <?
 include_once("_common.php");
-include_once($g4['path'].'/lib/register.lib.php');
+include_once(G4_LIB_PATH.'/register.lib.php');
 
 $mb_nick = escape_trim($_POST['reg_mb_nick']);
 $mb_id   = escape_trim($_POST['reg_mb_id']);

skin/member/neo/ajax_register_form.jquery.js

@@ -2,7 +2,7 @@ var reg_mb_id_check = function() {
     var result = "";
     $.ajax({
         type: "POST",
-        url: member_skin_path+"/ajax_mb_id_check.php",
+        url: member_skin_url+"/ajax_mb_id_check.php",
         data: {
             "reg_mb_id": encodeURIComponent($("#reg_mb_id").val())
         },
@@ -20,7 +20,7 @@ var reg_mb_nick_check = function() {
     var result = "";
     $.ajax({
         type: "POST",
-        url: member_skin_path+"/ajax_mb_nick_check.php",
+        url: member_skin_url+"/ajax_mb_nick_check.php",
         data: {
             "reg_mb_nick": ($("#reg_mb_nick").val()),
             'reg_mb_id': encodeURIComponent($('#reg_mb_id').val())
@@ -39,7 +39,7 @@ var reg_mb_email_check = function() {
     var result = "";
     $.ajax({
         type: 'POST',
-        url: member_skin_path+'/ajax_mb_email_check.php',
+        url: member_skin_url+'/ajax_mb_email_check.php',
         data: {
             'reg_mb_email': $('#reg_mb_email').val(),
             'reg_mb_id': encodeURIComponent($('#reg_mb_id').val())

skin/member/neo/register_form.skin.php

@@ -3,9 +3,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
 <script>
-var member_skin_path = "<?=$member_skin_path?>";
+var member_skin_url = "<?=$member_skin_url?>";
 </script>
-<script src="<?=$member_skin_path?>/ajax_register_form.jquery.js"></script>
+<script src="<?=$member_skin_url?>/ajax_register_form.jquery.js"></script>
 
 <form id="fregisterform" name="fregisterform" method="post" action="<?=$register_action_url?>" onsubmit="return fregisterform_submit(this);" enctype="multipart/form-data" autocomplete="off">
 <input type="hidden" name="w" value="<?=$w?>">