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

This commit is contained in:
chicpro
2013-01-29 11:49:21 +09:00
6 changed files with 33 additions and 17 deletions

View File

@ -180,7 +180,7 @@ function captcha_html($class="captcha")
$html .= '<legend class="sound_only">스팸방지</legend>';
$html .= '<img src="'.$png_file_url.'" alt="스팸방지 숫자">';
$html .= '<a href="'.$wav_file_url.'" id="captcha_wav" target="_blank"><img src="'.G4_GCAPTCHA_URL.'/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 .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box fs_input" size="6" maxlength="6" required title="스팸방지 숫자 입력">';
$html .= '<p class="sound_only">스팸방지 숫자를 순서대로 입력하세요.</p>';
$html .= '</fieldset>';
return $html;

View File

@ -12,9 +12,9 @@ else
*/
$g4['title'] = '회원 패스워드 확인';
include_once('./_head.php');
include_once('./_head.sub.php');
include_once($member_skin_path.'/member_confirm.skin.php');
include_once('./_tail.php');
include_once('./_tail.sub.php');
?>

View File

@ -14,7 +14,7 @@ hr {display:none}
pre {overflow-x:scroll;font-size:1.1em}
/* 웹접근성 스킬 --- 기본 block 속성에는 적용 안됨*/
.sound_only {display:inline-block;margin:0;padding:0;width:0;height:0;border:0;overflow:hidden}
.sound_only {display:inline-block !important;margin:0 !important;padding:0 !important;width:0 !important;height:0 !important;border:0 !important;overflow:hidden !important}
/* 본문 바로가기 */
#to_content a {z-index:100000;display:block;position:absolute;top:0;left:0;height:0;overflow:hidden}
#to_content a:focus,
@ -155,6 +155,9 @@ fieldset textarea {padding:3px 3px 4px;border:1px solid #ddd;background:#fff;ver
.fs_input:focus,
fieldset textarea:focus {padding:4px 4px 5px;border:0;background:#494949;color:#fff}
.fs_submit,
fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#fff;line-height:1.9em;vertical-align:middle;cursor:pointer}
/* ///// 스킨별 스타일 ///// */
/* 아웃로그인 스킨 */
.ol {position:relative;margin-bottom:10px;padding:14px}
@ -199,9 +202,18 @@ fieldset textarea:focus {padding:4px 4px 5px;border:0;background:#494949;color:#
#mb_login .login_pw {position:absolute;top:55px;left:95px}
#mb_login .fs_input {display:block;margin:0 0 5px 80px}
#mb_login .btn_submit {position:absolute;top:20px;left:335px;height:53px}
#mb_login section {margin-bottom:30px;padding:20px}
#mb_login section {margin:0 0 30px;padding:20px}
#mb_login section div {text-align:right}
/* 회원 패스워드 확인 */
#mb_confirm {margin:100px auto;width:500px}
#mb_confirm h1 {margin:0 0 20px;font-size:1.3em}
#mb_confirm p {padding:20px;border-bottom-color:#f7f7f2}
#mb_confirm p strong {display:block}
#mb_confirm fieldset {margin:0 0 30px;padding:30px 0;text-align:center}
#mb_confirm label {letter-spacing:-0.1em}
#mb_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
/* 설문조사 스킨 */
#poll {}
#poll header {padding:14px 14px 0}
@ -310,8 +322,8 @@ fieldset textarea:focus {padding:4px 4px 5px;border:0;background:#494949;color:#
#bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_img {margin:0 20px;width:688px;overflow:hidden}
/*#bo_v_img img {max-width:100%;height:auto}*/
#bo_v_con {padding:20px;width:688px;overflow:hidden;line-height:1.8em;word-break:break-all}
#bo_v_img img {max-width:100%;height:auto}
#bo_v_con {padding:20px;width:688px;line-height:1.8em;word-break:break-all;overflow:hidden}
#bo_v_con a {color:#109ff1;text-decoration:underline}
#bo_v_act {padding:20px 0;text-align:center}
#bo_v_act a {margin-right:5px;vertical-align:top}
@ -327,7 +339,7 @@ fieldset textarea:focus {padding:4px 4px 5px;border:0;background:#494949;color:#
.bo_v_com li {float:left;margin-left:5px}
/* 게시판 댓글 */
#bo_vc {margin:0 20px 10px;padding:10px 20px 20px 20px;background:#f7f7f2}
#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 #e7e7e7}
#bo_vc header {position:relative;zoom:1}

View File

@ -6,9 +6,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<div id="bo_v" class="cbg">
<h1 id="bo_v_h1">
<? if ($is_category) { // 분류가 있다면?>
<span><?=($category_name ? "{$view['ca_name']} " : "");?></span>
<? } // 분류 출력 끝 ?>
<? if ($category_name) { // 분류가 지정되었다면 ?><span><?=($category_name ? "{$view['ca_name']} " : "");?></span><? } // 분류 출력 끝 ?>
<?=cut_hangul_last(get_text($view['wr_subject'])) // 글제목 출력?>
</h1>

View File

@ -5,8 +5,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<script src="<?=$g4['url']?>/js/capslock.js"></script>
<div id="mb_confirm">
<h1><?=$g4['title']?></h1>
<p>
<p class="cbg">
<strong>패스워드를 한번 더 입력해주세요.</strong>
회원님의 정보를 안전하게 보호하기 위해 패스워드를 한번 더 확인합니다.
</p>
@ -15,16 +16,21 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<input type=hidden name="mb_id" value="<?=$member[mb_id]?>">
<input type=hidden name="w" value="u">
<fieldset>
<fieldset class="cbg">
회원아이디
<span id="member_confirm_id"><?=$member[mb_id]?></span>
<span id="mb_confirm_id"><?=$member[mb_id]?></span>
<label for="confirm_mb_password">패스워드<strong class="sound_only">필수</strong></label>
<input type="password" id="confirm_mb_password" name="mb_password" class="fieldset_input" maxLength="20" size="15" required onkeypress="check_capslock('confirm_mb_password');" title="패스워드">
<input type="submit" id="btn_submit" class="fieldset_submit" value="확인">
<input type="password" id="confirm_mb_password" name="mb_password" class="fs_input" maxLength="20" size="15" required onkeypress="check_capslock('confirm_mb_password');" title="패스워드">
<input type="submit" id="btn_submit" class="fs_submit" value="확인">
</fieldset>
</form>
<div class="btn_confirm">
<a href="<?=$g4['url']?>/">메인으로 돌아가기</a>
</div>
</div>
<script>

View File

@ -7,7 +7,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<h2>인기검색어</h2>
<ul>
<? for ($i=0; $i<count($list); $i++) { ?>
<li><a href="<?=$g4['bbs_path']?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?=urlencode($list[$i]['pp_word'])?>"><?=$list[$i]['pp_word']?></a></li>
<li><a href="<?=$g4['url']?>/bbs/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?=urlencode($list[$i]['pp_word'])?>"><?=$list[$i]['pp_word']?></a></li>
<? } ?>
</ul>
</div>