firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g5 merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-09-13 15:22:15 +09:00
parent 0f78b67eb7 5d332663d6
commit 8c0d61e772
55 changed files with 818 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/skin/board/basic/view_comment.skin.php
View File

@ -171,7 +171,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/ajax.filter.php",
url: g5_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": "",

2
mobile/skin/board/basic/write.skin.php
View File

@ -197,7 +197,7 @@ function fwrite_submit(f)
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/ajax.filter.php",
url: g5_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": f.wr_subject.value,

2
mobile/skin/board/gallery/view_comment.skin.php
View File

@ -174,7 +174,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/ajax.filter.php",
url: g5_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": "",

2
mobile/skin/board/gallery/write.skin.php
View File

@ -197,7 +197,7 @@ function fwrite_submit(f)
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/ajax.filter.php",
url: g5_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": f.wr_subject.value,

84
mobile/skin/member/basic/login.skin.php
View File

@ -10,18 +10,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<form name="flogin" action="<?php echo $login_action_url ?>" onsubmit="return flogin_submit(this);" method="post">
<input type="hidden" name="url" value='<?php echo $login_url ?>'>
<fieldset id="mb_login_fs">
<legend>회원로그인</legend>
<label for="login_id" class="login_id sound_only">회원아이디<strong class="sound_only"> 필수</strong></label>
<input type="text" name="mb_id" id="login_id" placeholder="회원아이디" required class="frm_input required" size="20" maxLength="20">
<label for="login_pw" class="login_pw sound_only">패스워드<strong class="sound_only"> 필수</strong></label>
<input type="password" name="mb_password" id="login_pw" placeholder="패스워드" required class="frm_input required" size="20" maxLength="20">
<fieldset>
<label for="login_id" class="sound_only">아이디<strong class="sound_only"> 필수</strong></label>
<input type="text" name="mb_id" id="login_id" placeholder="아이디(필수)" required class="frm_input required" maxLength="20">
<label for="login_pw" class="sound_only">패스워드<strong class="sound_only"> 필수</strong></label>
<input type="password" name="mb_password" id="login_pw" placeholder="패스워드(필수)" required class="frm_input required" maxLength="20">
<input type="submit" value="로그인" class="btn_submit">
<input type="checkbox" name="auto_login" id="login_auto_login">
<label for="login_auto_login">자동로그인</label>
</fieldset>
<section id="mb_login_info">
<section>
<h2>회원로그인 안내</h2>
<p>
회원아이디 및 패스워드가 기억 안나실 때는 아이디/패스워드 찾기를 이용하십시오.<br>
@ -33,79 +32,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</div>
</section>
</form>
<?php // 쇼핑몰 사용시 여기부터 ?>
<?php if ($default['de_level_sell'] == 1) { // 상품구입 권한 ?>
<!-- 주문하기, 신청하기 -->
<?php if (preg_match("/orderform.php/", $url)) { ?>
<section id="mb_login_notmb">
<h2>비회원 구매</h2>
<p>
비회원으로 주문하시는 경우 포인트는 지급하지 않습니다.
</p>
<div id="guest_privacy">
<?php echo $default['de_guest_privacy']; ?>
</div>
<label for="agree">개인정보수집에 대한 내용을 읽었으며 이에 동의합니다.</label>
<input type="checkbox" id="agree" value="1">
<div class="btn_confirm">
<a href="javascript:guest_submit(document.flogin);" class="btn02">비회원으로 구매하기</a>
</div>
<script>
function guest_submit(f)
{
if (document.getElementById('agree')) {
if (!document.getElementById('agree').checked) {
alert("개인정보수집에 대한 내용을 읽고 이에 동의하셔야 합니다.");
return;
}
}
f.url.value = "<?php echo $url; ?>";
f.action = "<?php echo $url; ?>";
f.submit();
}
</script>
</section>
<?php } else if (preg_match("/orderinquiry.php$/", $url)) { ?>
<fieldset id="mb_login_od">
<legend>비회원 주문조회</legend>
<form name="forderinquiry" method="post" action="<?php echo urldecode($url); ?>" autocomplete="off">
<label for="od_id" class="od_id sound_only">주문번호<strong class="sound_only"> 필수</strong></label>
<input type="text" name="od_id" value="<?php echo $od_id ?>" id="od_id" placeholder="주문번호" required class="frm_input required" size="20">
<label for="id_pwd" class="od_pwd sound_only">패스워드<strong class="sound_only"> 필수</strong></label>
<input type="password" name="od_pwd" size="20" id="od_pwd" placeholder="패스워드" required class="frm_input required">
<input type="submit" value="확인" class="btn_submit">
</form>
</fieldset>
<section id="mb_login_odinfo">
<h2>비회원 주문조회 안내</h2>
<p>메일로 발송해드린 주문서의 <strong>주문번호</strong> 및 주문 시 입력하신 <strong>비밀번호</strong>를 정확히 입력해주십시오.</p>
</section>
<?php } ?>
<?php } ?>
<?php // 쇼핑몰 사용시 여기까지 반드시 복사해 넣으세요 ?>
<div class="btn_confirm">
<a href="<?php echo G5_URL ?>/">메인으로 돌아가기</a>
</div>
</form>
</div>
<script>

24
mobile/skin/member/basic/style.css
View File

@ -32,25 +32,11 @@
#mb_login {margin:2em 0}
#mb_login h1 {margin:0 0 1.5em;padding:0 1em;font-size:1.3em}
#mb_login h2 {margin:0}
#mb_login_fs {position:relative;padding:0 0.5em;font-size:1em}
#mb_login_fs legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
#mb_login_fs .frm_input {display:block;margin-bottom:0.3em;padding:0;width:80%;height:1.8em;line-height:1.8em}
#mb_login_fs .btn_submit {position:absolute;top:0em;right:0.5em;padding:0 !important;width:18%;height:4em !important;text-align:center}
#mb_login_info {margin:30px 0;padding:1.5em 1em;border:1px solid #cfded8;background:#f7f7f7}
#mb_login_info div {text-align:right}
#mb_login_notmb {margin:30px 0;padding:1.5em 1em;border:1px solid #cfded8;background:#f7f7f7}
#mb_login_notmb #guest_privacy {margin:0 0 1em;padding:1em;height:150px;border:1px solid #e9e9e9;background:#fff;overflow:auto}
#mb_login_notmb .btn_confirm {text-align:right}
#mb_login_od {position:relative;margin:2em 0.5em;border-bottom:0;background:#fff}
#mb_login_od legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
#mb_login_od .od_id {position:absolute;top:26px;left:95px}
#mb_login_od .od_pwd {position:absolute;top:52px;left:95px}
#mb_login_od .frm_input {display:block;margin-bottom:0.3em;padding:0;width:80%;height:1.8em;line-height:1.8em}
#mb_login_od .btn_submit {position:absolute;top:0em;right:0;padding:0 !important;width:18%;height:4em !important;text-align:center}
#mb_login_odinfo {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f7f7f7}
#mb_login_odinfo div {text-align:right}
#mb_login fieldset {position:relative;padding:0 0.5em;font-size:1em}
#mb_login .frm_input {display:block;margin-bottom:0.3em;padding:0;width:80%;height:1.8em;line-height:1.8em}
#mb_login .btn_submit {position:absolute;top:0em;right:0.5em;padding:0 !important;width:18%;height:4em !important;text-align:center}
#mb_login section {margin:30px 0;padding:1.5em 1em;border:1px solid #cfded8;background:#f7f7f7}
#mb_login section div {text-align:right}
/* 쪽지 */
#memo_view section {padding:1em}