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

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

Browse Source
This commit is contained in:
chicpro
2013-02-20 11:56:57 +09:00
parent 17264f5a28 f61f246e71
commit 2d2f8c6308
4 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
css/default.css
View File

@ -206,10 +206,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
#find_info #captcha input {margin-left:5px}
/* 아웃로그인 스킨 */
.ol {position:relative;padding:14px;border-bottom:1px solid #e7f1ed}
.ol h2 {width:0;height:0;overflow:hidden}
.ol {position:relative;padding:35px 14px 14px;border-bottom:1px solid #e7f1ed}
.ol h2 {position:absolute;top:0px;left:14px;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
.ol ul {margin:0;padding:0;list-style:none}
.ol a {}
#ol_before fieldset {position:relative}
#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:168px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;line-height:1.6em}
@ -228,8 +227,8 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
#ol_before a {letter-spacing:-0.1em}
#ol_svc {padding-top:8px;text-align:right}
#ol_after_hd {margin:0 0 5px;padding:0 0 5px;border-bottom:1px solid #cfded8;text-align:center}
#ol_after_hd a {color:#000}
#ol_after_hd {margin:0 0 5px;padding:5px 0;border-bottom:1px solid #cfded8;text-align:center}
#ol_after_hd a {position:absolute;top:10px;right:14px;color:#e8180c}
#ol_after_private {margin:0 0 3px;zoom:1}
#ol_after_private:after {display:block;visibility:hidden;clear:both;content:""}
#ol_after_private li {float:left}
@ -297,8 +296,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
/* 설문조사 스킨 */
#poll {}
#poll header {padding:20px 14px 0}
#poll header a {color:#000}
#poll header {position:relative;padding:30px 14px 0}
#poll h2 {position:absolute;top:0px;left:14px;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
#poll header a {position:absolute;top:10px;right:14px;color:#e8180c}
#poll header p {padding:5px 0 10px}
#poll ul {margin:0 0 10px;padding:5px 14px;list-style:none}
#poll li {padding:3px 0}
@ -438,7 +438,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
.bo_notice td a {font-weight:bold}
.td_num strong {color:#000}
.bo_cate_link {display:inline-block;margin:0 3px 0 0;padding:0 6px 0 0;border-right:1px solid #e7f1ed;color:#999 !important;font-weight:bold;text-decoration:none} /* 글제목줄 분류스타일 */
.bo_current {color:#000}
.bo_current {color:#e8180c}
.td_subject img {margin-left:3px}
.cnt_cmt {font-weight:bold}
@ -446,13 +446,13 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
#bo_sch legend {width:0;height:0;overflow:hidden}
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}
#bo_v {position:relative;margin-bottom:20px;padding-bottom:20px}
#bo_v_h1 {margin:0 0 5px;font-size:1.2em}
#bo_v_cate {position:absolute;top:-25px;right:0;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
#bo_v_cate {margin:0;padding:0 0 10px;color:#999;font-weight:bold;line-height:1em}
#bo_v_h1 {padding:0 0 10px;font-size:1.2em}
#bo_v_info {padding:10px 0 9px}
#bo_v_info {padding:0 0 10px;border-bottom:1px solid #cfded8}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_info {}
#bo_v_info strong {display:inline-block;margin:0 15px 0 5px;font-weight:normal}
@ -460,21 +460,24 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
#bo_v_file {}
#bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_file ul {margin:0;padding:0;list-style:none}
#bo_v_file a {display:inline-block;padding:8px 0 7px;color:#578689}
#bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f7f7f2}
#bo_v_file a {display:inline-block;padding:8px 0 7px;color:#000}
#bo_v_file a:focus,
#bo_v_file a:hover,
#bo_v_file a:active {text-decoration:none}
.bo_v_file_cnt {display:inline-block;margin:0 10px}
#bo_v_link {}
#bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_link ul {margin:0;padding:0;list-style:none}
#bo_v_link a {display:inline-block;padding:8px 0 7px;color:#578689}
#bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f7f7f2}
#bo_v_link a {display:inline-block;padding:8px 0 7px;color:#000}
#bo_v_link a:focus,
#bo_v_link a:hover,
#bo_v_link a:active {text-decoration:none}
.bo_v_link_cnt {display:inline-block;margin:0 10px}
#bo_v_top {margin:0 0 20px;padding:10px 0;zoom:1}
#bo_v_top {margin:0 0 10px;padding:10px 0;zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_top ul {list-style:none}
@ -507,7 +510,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
#bo_v form {padding-top:20px}
/* 게시판 댓글 */
#bo_vc {margin:0 0 10px;padding:20px 0 10px;border-bottom:1px solid #d9d9d9}
#bo_vc {margin:0 0 10px;padding:20px 20px 10px;border:1px solid #cfded8;background:#f7f7f2}
#bo_vc h2 {margin-bottom:10px}
#bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc}
#bo_vc header {position:relative;padding:15px 0 5px}

61
skin/board/basic/view.skin.php
View File

@ -5,13 +5,13 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<div id="bo_v">
<h1 id="bo_v_h1"><?=cut_str(get_text($view['wr_subject']), 70) // 글제목 출력?></h1>
<p id="bo_v_cate">
<?=$board['bo_subject']?>
<? if ($category_name) { // 분류가 지정되었다면 ?><?=($category_name ? "{$view['ca_name']} " : "");?><? } // 분류 출력 끝 ?>
</p>
<h1 id="bo_v_h1"><?=cut_str(get_text($view['wr_subject']), 70) // 글제목 출력?></h1>
<section id="bo_v_info">
<h2>게시물 정보</h2>
작성자 <strong><?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></strong>
@ -20,34 +20,6 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
댓글<strong><?=number_format($view['wr_comment'])?>건</strong>
</section>
<nav id="bo_v_top">
<h2>게시물 상단 버튼</h2>
<?
ob_start();
?>
<? if ($prev_href || $next_href) { ?>
<ul class="bo_v_nb">
<? if ($prev_href) { ?><li><a href="<?=$prev_href?>" class="btn_b01">이전글</a></li><? } ?>
<? if ($next_href) { ?><li><a href="<?=$next_href?>" class="btn_b01">다음글</a></li><? } ?>
</ul>
<? } ?>
<ul class="bo_v_com">
<? if ($update_href) { ?><li><a href="<?=$update_href?>" class="btn_b01">수정</a></li><? } ?>
<? if ($delete_href) { ?><li><a href="<?=$delete_href?>" class="btn_b01" onclick="del(this.href); return false;">삭제</a></li><? } ?>
<? if ($copy_href) { ?><li><a href="<?=$copy_href?>" class="btn_admin" onclick="board_move(this.href); return false;">복사</a></li><? } ?>
<? if ($move_href) { ?><li><a href="<?=$move_href?>" class="btn_admin" onclick="board_move(this.href); return false;">이동</a></li><? } ?>
<? if ($search_href) { ?><li><a href="<?=$search_href?>" class="btn_b01">검색</a></li><? } ?>
<li><a href="<?=$list_href?>" class="btn_b01">목록</a></li>
<? if ($reply_href) { ?><li><a href="<?=$reply_href?>" class="btn_b01">답변</a></li><? } ?>
<? if ($write_href) { ?><li><a href="<?=$write_href?>" class="btn_b02">글쓰기</a></li><? } ?>
</ul>
<?
$link_buttons = ob_get_contents();
ob_end_flush();
?>
</nav>
<?
if ($view['file']['count']) {
$cnt = 0;
@ -113,6 +85,34 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
</section>
<? } ?>
<nav id="bo_v_top">
<h2>게시물 상단 버튼</h2>
<?
ob_start();
?>
<? if ($prev_href || $next_href) { ?>
<ul class="bo_v_nb">
<? if ($prev_href) { ?><li><a href="<?=$prev_href?>" class="btn_b01">이전글</a></li><? } ?>
<? if ($next_href) { ?><li><a href="<?=$next_href?>" class="btn_b01">다음글</a></li><? } ?>
</ul>
<? } ?>
<ul class="bo_v_com">
<? if ($update_href) { ?><li><a href="<?=$update_href?>" class="btn_b01">수정</a></li><? } ?>
<? if ($delete_href) { ?><li><a href="<?=$delete_href?>" class="btn_b01" onclick="del(this.href); return false;">삭제</a></li><? } ?>
<? if ($copy_href) { ?><li><a href="<?=$copy_href?>" class="btn_admin" onclick="board_move(this.href); return false;">복사</a></li><? } ?>
<? if ($move_href) { ?><li><a href="<?=$move_href?>" class="btn_admin" onclick="board_move(this.href); return false;">이동</a></li><? } ?>
<? if ($search_href) { ?><li><a href="<?=$search_href?>" class="btn_b01">검색</a></li><? } ?>
<li><a href="<?=$list_href?>" class="btn_b01">목록</a></li>
<? if ($reply_href) { ?><li><a href="<?=$reply_href?>" class="btn_b01">답변</a></li><? } ?>
<? if ($write_href) { ?><li><a href="<?=$write_href?>" class="btn_b02">글쓰기</a></li><? } ?>
</ul>
<?
$link_buttons = ob_get_contents();
ob_end_flush();
?>
</nav>
<article id="bo_v_atc">
<header>
<h1>본문</h1>
@ -178,6 +178,7 @@ function board_move(href)
}
</script>
<script src="<?=G4_JS_URL?>/board.js"></script>
<!-- 게시글 보기 끝 -->
<script>

2
skin/outlogin/basic/outlogin.skin.1.php
View File

@ -3,7 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<section id="ol_before" class="ol">
<h2>멤버쉽</h2>
<h2>회원로그인</h2>
<!-- 로그인 전 외부로그인 시작 -->
<form name="foutlogin" method="post" action="<?=$outlogin_action_url?>" onsubmit="return fhead_submit(this);" autocomplete="off">
<fieldset>

2
skin/outlogin/basic/outlogin.skin.2.php
View File

@ -5,7 +5,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<!-- 로그인 후 외부로그인 시작 -->
<section id="ol_after" class="ol">
<header id="ol_after_hd">
<h2>나의 이용정보</h2>
<h2>내 회원정보</h2>
<strong><?=$nick?></strong>님
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>" id="ol_admin">관리자</a><? } ?>
</header>