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

css/admin.css

@@ -288,22 +288,22 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 .new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none}
 .new_win_desc {margin:0 auto;width:93%}
 
-/* 사이드뷰 */
-.sv_wrap {display:inline-block;position:relative;font-weight:normal}
-.sv_wrap .sv {z-index:5;display:none;margin:5px 0 0;border:1px solid #283646;background:#334356}
-.sv_nojs .sv {display:block}
-.sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important}
-.sv_wrap a:focus,
-.sv_wrap a:hover,
-.sv_wrap a:active {text-decoration:none !important}
-.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd}
-
 /* 관리자 패스워드 확인 */
 #admin_confirm {padding:0 0 10px;background:#222;text-align:center}
 #admin_confirm p {margin:0 0 10px;color:#9ab9c5;background:#383a3f}
 #admin_confirm label {color:#fff}
 #admin_confirm .frm_input {border-color:#000}
 
+/* 사이드뷰 */
+.sv_wrap {display:inline-block;position:relative;font-weight:normal}
+.sv_wrap .sv {z-index:5;display:none;margin:5px 0 0;border:1px solid #283646;background:#334356}
+.sv_js_off .sv {display:block}
+.sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important}
+.sv_wrap a:focus,
+.sv_wrap a:hover,
+.sv_wrap a:active {text-decoration:none !important}
+.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd}
+
 /* pagination */
 .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
 .pg {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}
@@ -317,7 +317,4 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 .pg_prev {border-right:1px solid #ddd}
 .pg_end,
 .pg_next {border-left:1px solid #ddd}
-.pg_current {background:#444;color:#fff;font-weight:bold}
+.pg_current {background:#444;color:#fff;font-weight:bold}
-
-/* 스킨자료실 바로가기 */
-.goto_sirskin {color:#ff5300}

css/default.css

@@ -641,7 +641,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
 /* 사이드뷰 */
 .sv_wrap {display:inline-block;position:relative;font-weight:normal}
 .sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111}
-.sv_nojs .sv {display:block}
+.sv_js_off .sv {display:block}
 .sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important}
 .sv_wrap a:focus,
 .sv_wrap a:hover,

lib/common.lib.php

@@ -998,7 +998,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
     $email    = get_text($email);
     $homepage = get_text($homepage);
 
-    $str = "<span class=\"sv_wrap\">\n";
+    $str = "<span class=\"sv_wrap sv_js_off\">\n";
     $str .= $tmp_name."\n";
 
     if(!G4_IS_MOBILE) {
@@ -1024,7 +1024,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
             $str2 .= "<a href=\"".G4_ADMIN_URL."/point_list.php?sfl=mb_id&amp;stx=".$mb_id."\" target=\"_blank\">포인트내역</a>\n";
         }
         $str2 .= "</span>\n";
-        $str .= $str2."\n<noscript class=\"sv_nojs\">".$str2."</noscript>";
+        $str .= $str2;//."\n<noscript class=\"sv_nojs\">".$str2."</noscript>";
     }
 
     $str .= "</span>";

skin/board/basic/write.skin.php

@@ -21,27 +21,27 @@ $option_hidden = '';
 if ($is_notice || $is_html || $is_secret || $is_mail) {
     $option = '';
     if ($is_notice) {
-        $option .= PHP_EOL.'<input type="checkbox" id="notice" name="notice" value="1" '.$notice_checked.'>'.PHP_EOL.'<label for="notice">공지</label>';
+        $option .= "\n".'<input type="checkbox" id="notice" name="notice" value="1" '.$notice_checked.'>'."\n".'<label for="notice">공지</label>';
     }
 
     if ($is_html) {
         if ($is_dhtml_editor) {
             $option_hidden .= '<input type="hidden" value="html1" name="html">';
         } else {
-            $option .= PHP_EOL.'<input type="checkbox" id="html" name="html" onclick="html_auto_br(this);" value="'.$html_value.'" '.$html_checked.'>'.PHP_EOL.'<label for="html">html</label>';
+            $option .= "\n".'<input type="checkbox" id="html" name="html" onclick="html_auto_br(this);" value="'.$html_value.'" '.$html_checked.'>'."\n".'<label for="html">html</label>';
         }
     }
 
     if ($is_secret) {
         if ($is_admin || $is_secret==1) {
-            $option .= PHP_EOL.'<input type="checkbox" id="secret" name="secret" value="secret" '.$secret_checked.'>'.PHP_EOL.'<label for="secret">비밀글</label>';
+            $option .= "\n".'<input type="checkbox" id="secret" name="secret" value="secret" '.$secret_checked.'>'."\n".'<label for="secret">비밀글</label>';
         } else {
             $option_hidden .= '<input type="hidden" name="secret" value="secret">';
         }
     }
 
     if ($is_mail) {
-        $option .= PHP_EOL.'<input type="checkbox" id="mail" name="mail" value="mail" '.$recv_email_checked.'>'.PHP_EOL.'<label for="mail">답변메일받기</label>';
+        $option .= "\n".'<input type="checkbox" id="mail" name="mail" value="mail" '.$recv_email_checked.'>'."\n".'<label for="mail">답변메일받기</label>';
     }
 }
 

skin/board/gallery/write.skin.php

@@ -21,27 +21,27 @@ $option_hidden = '';
 if ($is_notice || $is_html || $is_secret || $is_mail) {
     $option = '';
     if ($is_notice) {
-        $option .= PHP_EOL.'<input type="checkbox" id="notice" name="notice" value="1" '.$notice_checked.'>'.PHP_EOL.'<label for="notice">공지</label>';
+        $option .= "\n".'<input type="checkbox" id="notice" name="notice" value="1" '.$notice_checked.'>'."\n".'<label for="notice">공지</label>';
     }
 
     if ($is_html) {
         if ($is_dhtml_editor) {
             $option_hidden .= '<input type="hidden" value="html1" name="html">';
         } else {
-            $option .= PHP_EOL.'<input type="checkbox" id="html" name="html" onclick="html_auto_br(this);" value="'.$html_value.'" '.$html_checked.'>'.PHP_EOL.'<label for="html">html</label>';
+            $option .= "\n".'<input type="checkbox" id="html" name="html" onclick="html_auto_br(this);" value="'.$html_value.'" '.$html_checked.'>'."\n".'<label for="html">html</label>';
         }
     }
 
     if ($is_secret) {
         if ($is_admin || $is_secret==1) {
-            $option .= PHP_EOL.'<input type="checkbox" id="secret" name="secret" value="secret" '.$secret_checked.'>'.PHP_EOL.'<label for="secret">비밀글</label>';
+            $option .= "\n".'<input type="checkbox" id="secret" name="secret" value="secret" '.$secret_checked.'>'."\n".'<label for="secret">비밀글</label>';
         } else {
             $option_hidden .= '<input type="hidden" name="secret" value="secret">';
         }
     }
 
     if ($is_mail) {
-        $option .= PHP_EOL.'<input type="checkbox" id="mail" name="mail" value="mail" '.$recv_email_checked.'>'.PHP_EOL.'<label for="mail">답변메일받기</label>';
+        $option .= "\n".'<input type="checkbox" id="mail" name="mail" value="mail" '.$recv_email_checked.'>'."\n".'<label for="mail">답변메일받기</label>';
     }
 }
 

tail.sub.php

@@ -21,6 +21,8 @@ $(function() {
 <![endif]-->
 
 <script>
+$('.sv_wrap').removeClass('sv_js_off'); //js 사용 가능한지를 사이드뷰에 알려주는 역할
+
 $(function(){
     var hide_menu = false;
     var mouse_event = false;