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

merge 충돌 처리

Browse Source
This commit is contained in:
whitedot
2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
skin/outlogin/shop_basic/outlogin.skin.1.php
View File

@ -2,22 +2,22 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<link rel="stylesheet" href="<?=$outlogin_skin_url?>/style.css">
<link rel="stylesheet" href="<?php echo $outlogin_skin_url; ?>/style.css">
<section id="ol_before" class="ol">
<h2>회원로그인</h2>
<!-- 로그인 전 외부로그인 시작 -->
<form name="foutlogin" action="<?=$outlogin_action_url?>" onsubmit="return fhead_submit(this);" method="post" autocomplete="off">
<form name="foutlogin" action="<?php echo $outlogin_action_url; ?>" onsubmit="return fhead_submit(this);" method="post" autocomplete="off">
<fieldset>
<input type="hidden" name="url" value="<?=$outlogin_url?>">
<input type="hidden" name="url" value="<?php echo $outlogin_url; ?>">
<label for="ol_id" id="ol_idlabel">회원아이디<strong class="sound_only">필수</strong></label>
<input type="text" id="ol_id" name="mb_id" required class="required" maxlength="20">
<label for="ol_pw" id="ol_pwlabel">패스워드<strong class="sound_only">필수</strong></label>
<input type="password" name="mb_password" id="ol_pw" required class="required" maxlength="20">
<input type="submit" id="ol_submit" value="로그인">
<div id="ol_svc">
<a href="<?=G4_BBS_URL?>/register.php"><b>회원가입</b></a>
<a href="<?=G4_BBS_URL?>/password_lost.php" id="ol_password_lost">정보찾기</a>
<a href="<?php echo G4_BBS_URL; ?>/register.php"><b>회원가입</b></a>
<a href="<?php echo G4_BBS_URL; ?>/password_lost.php" id="ol_password_lost">정보찾기</a>
</div>
<div id="ol_auto">
<input type="checkbox" name="auto_login" value="1" id="auto_login">

20
skin/outlogin/shop_basic/outlogin.skin.2.php
View File

@ -2,26 +2,26 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<link rel="stylesheet" href="<?=$outlogin_skin_url?>/style.css">
<link rel="stylesheet" href="<?php echo $outlogin_skin_url; ?>/style.css">
<!-- 로그인 후 외부로그인 시작 -->
<section id="ol_after" class="ol">
<header id="ol_after_hd">
<h2>나의 회원정보</h2>
<strong><?=$nick?>님</strong>
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>/shop_admin" class="btn_admin">관리자 모드</a><? } ?>
<strong><?php echo $nick; ?>님</strong>
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?php echo G4_ADMIN_URL; ?>/shop_admin" class="btn_admin">관리자 모드</a><? } ?>
</header>
<ul id="ol_after_private">
<li>
<a href="<?=G4_BBS_URL?>/memo.php" target="_blank" id="ol_after_memo" class="win_memo">
<a href="<?php echo G4_BBS_URL; ?>/memo.php" target="_blank" id="ol_after_memo" class="win_memo">
<span class="sound_only">안 읽은 </span>쪽지
<strong><?=$memo_not_read?></strong>
<strong><?php echo $memo_not_read; ?></strong>
</a>
</li>
<li>
<a href="<?=G4_BBS_URL?>/point.php" target="_blank" id="ol_after_pt" class="win_point">
<a href="<?php echo G4_BBS_URL; ?>/point.php" target="_blank" id="ol_after_pt" class="win_point">
포인트
<strong><?=$point?></strong>
<strong><?php echo $point; ?></strong>
</a>
</li>
<li>
@ -29,8 +29,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</li>
</ul>
<footer id="ol_after_ft">
<a href="<?=G4_BBS_URL?>/member_confirm.php?url=register_form.php" id="ol_after_info">정보수정</a>
<a href="<?=G4_BBS_URL?>/logout.php" id="ol_after_logout">로그아웃</a>
<a href="<?php echo G4_BBS_URL; ?>/member_confirm.php?url=register_form.php" id="ol_after_info">정보수정</a>
<a href="<?php echo G4_BBS_URL; ?>/logout.php" id="ol_after_logout">로그아웃</a>
</footer>
</section>
@ -39,7 +39,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
function member_leave()
{
if (confirm("정말 회원에서 탈퇴 하시겠습니까?"))
location.href = "<?=G4_BBS_URL?>/member_confirm.php?url=member_leave.php";
location.href = "<?php echo G4_BBS_URL; ?>/member_confirm.php?url=member_leave.php";
}
</script>
<!-- 로그인 후 외부로그인 끝 -->