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

This commit is contained in:
chicpro
2014-04-10 17:22:34 +09:00
5 changed files with 11 additions and 5 deletions

View File

@ -266,6 +266,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#ctt_con {padding:10px 0}
.ctt_img {text-align:center}
/* 검색결과 색상 */
.sch_word {color:#ff3061}
/* 자바스크립트 alert 대안 */
#validation_check {margin:100px auto;width:500px}
#validation_check h1 {margin-bottom:20px;font-size:1.3em}

View File

@ -232,6 +232,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#ctt_con {padding:10px 0}
.ctt_img {text-align:center}
/* 검색결과 색상 */
.sch_word {color:#ff3061}
/* 사이드뷰 */
.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}

View File

@ -75,9 +75,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
<h2><?php echo $stx ?> 전체검색 결과</h2>
<dl>
<dt>게시판</dt>
<dd><strong style="color:<?php echo $config['cf_search_color'] ?>"><?php echo $board_count ?>개</strong></dd>
<dd><strong class="sch_word"><?php echo $board_count ?>개</strong></dd>
<dt>게시물</dt>
<dd><strong style="color:<?php echo $config['cf_search_color'] ?>"><?php echo number_format($total_count) ?>개</strong></dd>
<dd><strong class="sch_word"><?php echo number_format($total_count) ?>개</strong></dd>
</dl>
<p><?php echo number_format($page) ?>/<?php echo number_format($total_page) ?> 페이지 열람 중</p>
</section>

View File

@ -239,7 +239,7 @@ function captcha_html($class="captcha")
//$html .= "\n".'<script>var g5_captcha_path = "'.G5_CAPTCHA_PATH.'";</script>';
$html .= "\n".'<script src="'.G5_CAPTCHA_URL.'/kcaptcha.js"></script>';
$html .= "\n".'<fieldset id="captcha" class="'.$class.'">';
$html .= "\n".'<legend>자동등록방지</legend>';
$html .= "\n".'<legend><label for="captcha_key">자동등록방지</label></legend>';
if (G5_IS_MOBILE) $html .= '<audio src="#" id="captcha_audio" controls></audio>';
//$html .= "\n".'<img src="#" alt="" id="captcha_img">';
$html .= "\n".'<img src="javascript:void(0);" alt="" id="captcha_img">';

View File

@ -71,9 +71,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
<h2><?php echo $stx ?> 전체검색 결과</h2>
<dl>
<dt>게시판</dt>
<dd><strong style="color:<?php echo $config['cf_search_color'] ?>"><?php echo $board_count ?>개</strong></dd>
<dd><strong class="sch_word"><?php echo $board_count ?>개</strong></dd>
<dt>게시물</dt>
<dd><strong style="color:<?php echo $config['cf_search_color'] ?>"><?php echo number_format($total_count) ?>개</strong></dd>
<dd><strong class="sch_word"><?php echo number_format($total_count) ?>개</strong></dd>
</dl>
<p><?php echo number_format($page) ?>/<?php echo number_format($total_page) ?> 페이지 열람 중</p>
</section>