Merge branch 'g4s'

This commit is contained in:
chicpro
2013-07-15 18:12:10 +09:00
4 changed files with 19 additions and 35 deletions

View File

@ -45,7 +45,7 @@ alert("<?php echo strip_tags($msg); ?>");
<?php if ($url) { ?>
document.location.replace("<?php echo $url; ?>");
<?php } else { ?>
alert('history.back();');
//alert('history.back();');
history.back();
<?php } ?>
</script>

View File

@ -1,5 +1,3 @@
/* 게시판 쓰기 */
/* 게시판 목록 */
#bo_list_title {margin-bottom:20px;font-size:1.2em;letter-spacing:-0.1em}
@ -45,8 +43,8 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
#autosave_pop li:after {display:block;visibility:hidden;clear:both;content:""}
#autosave_pop a {display:block;float:left}
#autosave_pop span {display:block;float:right}
.autosave_close {cursor:pointer;}
.autosave_content {display:none;}
.autosave_close {cursor:pointer}
.autosave_content {display:none}
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}

View File

@ -1,5 +1,3 @@
/* 게시판 쓰기 */
/* 게시판 목록 */
#bo_list_title {margin-bottom:20px;font-size:1.2em;letter-spacing:-0.1em}
@ -57,6 +55,21 @@
#bo_sch {margin-bottom:10px;padding-top:5px;text-align:center}
#bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
/* 게시판 쓰기 */
#autosave_wrapper {position:relative}
#autosave_pop {display:none;z-index:10;position:absolute;top:24px;right:117px;padding:8px;width:350px;height:auto !important;height:180px;max-height:180px;border:1px solid #565656;background:#fff;overflow-y:scroll}
html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */
#autosave_pop strong {position:absolute;font-size:0;line-height:0;overflow:hidden}
#autosave_pop div {text-align:right}
#autosave_pop button {margin:0;padding:0;border:0;background:transparent}
#autosave_pop ul {margin:10px 0;padding:0;border-top:1px solid #e9e9e9;list-style:none}
#autosave_pop li {padding:8px 5px;border-bottom:1px solid #e9e9e9;zoom:1}
#autosave_pop li:after {display:block;visibility:hidden;clear:both;content:""}
#autosave_pop a {display:block;float:left}
#autosave_pop span {display:block;float:right}
.autosave_close {cursor:pointer}
.autosave_content {display:none}
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}

View File

@ -235,7 +235,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
작성하신 내용를 발송하시려면 <strong><?php echo $w==''?'회원가입':'정보수정'; ?></strong> 버튼을, 작성을 취소하고 창을 닫으시려면 <strong>취소</strong> 링크를 누르세요.
</p>
<input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" id="btn_submit" class="btn_submit" accesskey="s">
<a href="<?php echo $g4['path'] ?>/" class="btn_cancel">취소</a>
<a href="<?php echo G4_URL ?>" class="btn_cancel">취소</a>
</div>
</form>
@ -358,33 +358,6 @@ function fregisterform_submit(f)
}
}
/*
if (typeof(f.mb_hp) != "undefined" && f.mb_hp.value) {
var error = "";
$.ajax({
url: "<?php echo G4_KCPCERT_URL ?>/kcpcert.ajax.php",
type: "POST",
data: {
"w": f.w.value,
"mb_name": f.mb_name.value,
"mb_hp": f.mb_hp.value,
"old_mb_hp":f.old_mb_hp.value
},
dataType: "json",
async: false,
cache: false,
success: function(data, textStatus) {
error = data.error;
}
});
if (error) {
alert(error);
return false;
}
}
*/
<?php echo chk_captcha_js(); ?>
document.getElementById("btn_submit").disabled = "disabled";