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-01-31 11:36:32 +09:00
parent 64bbdc7e3f 78488e7a00
commit 6ed309810f
7 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
css/default.css
View File

@ -113,8 +113,8 @@ table a {color:#000;text-decoration:none}
/* 폼 테이블 */
.frm_tbl {}
.frm_tbl caption {padding-top:10px;font-size:1.2em;font-weight:bold}
.frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #f7f7f2;border-bottom:1px solid #f7f7f2;text-align:left}
.frm_tbl td {padding:7px 10px;border-color:#f7f7f2}
.frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #eee;border-bottom:1px solid #eee;text-align:left}
.frm_tbl td {padding:7px 10px;border-color:#eee}
.frm_tbl textarea,
.frm_input {padding:2px 2px 3px;border:1px solid #d7d7d7;background:#fff;vertical-align:middle}
.frm_tbl textarea:focus,
@ -176,7 +176,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
/* 회원가입 완료 */
#reg_result {margin-bottom:20px;padding:70px 50px 40px}
#reg_result_logo {margin-bottom:30px;text-align:center}
#reg_result_logo {margin-bottom:40px;text-align:center}
#reg_result_email {padding:10px 50px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#fff;line-height:2em}
#reg_result_email span {display:inline-block;width:150px}
#reg_result_email strong {color:#109ff1;font-size:1.2em}
@ -233,6 +233,12 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#memo_write textarea {height:100px}
/* 스크랩 */
#scrap_do .cbg {margin:0 auto 20px;padding:20px;width:87%}
#scrap_do table {margin:0 0 10px;width:100%}
#scrap_do textarea {height:100px}
/* 회원 패스워드 확인 */
#mb_confirm {margin:100px auto;width:500px}
#mb_confirm h1 {margin:0 0 20px;font-size:1.3em}
@ -258,6 +264,39 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#poll ul {margin:0 0 10px;padding:5px 14px;background:#f7f7f2;list-style:none}
#poll li {padding:3px 0}
#poll footer {padding:0 14px 14px;text-align:right}
/* 설문조사 결과 (새창) */
#poll_result section {padding:15px;width:87%}
#poll_result h2 {margin:0;padding:20px 0}
#poll_result a {color:#000;text-decoration:none}
#poll_result_list {margin:0 auto 20px}
#poll_result_list h2 {text-align:center}
#poll_result_list dl,
#poll_result_list dt,
#poll_result_list dd {margin:0;padding:0}
#poll_result_list dl {padding-bottom:30px}
#poll_result_list dt {margin-right:5%;color:#109ff1;text-align:right}
#poll_result_list ol {padding-left:30px}
#poll_result_list li {margin-top:10px}
#poll_result_list p {position:relative;margin:0;padding:5px 0}
#poll_result_list p strong {position:absolute;top:5px;right:5%;padding-right:80px;width:100px;text-align:right}
#poll_result_list p span {position:absolute;top:5px;right:5%;width:80px;text-align:right}
.poll_result_graph {position:relative;margin-right:5%;height:5px;background:#f7f7f2}
.poll_result_graph span {position:absolute;top:0;left:0;height:100%;background:#109ff1}
#poll_result_cmt {margin:0 auto 20px}
#poll_result_cmt h2 {text-align:center}
#poll_result_cmt h3 {margin:0 auto 10px;padding-top:15px;width:93%}
#poll_result_cmt article {margin:0 18px 15px;border-bottom:1px solid #eee}
#poll_result_cmt h1 {display:inline-block;margin:0 10px 0 0;padding:0;border:0;font-size:1em}
#poll_result_cmt p {padding:3px 0}
#poll_result_cmt fieldset {margin-bottom:0;text-align:left}
#poll_result_cmt fieldset p {margin:0 0 15px;padding:3px 0 0px;text-align:left}
#poll_result_cmt footer {text-align:right}
#poll_result_wcmt {margin-bottom:10px;width:93%}
.poll_cmt_del a {display:inline-block;padding-bottom:10px}
#poll_result_oth {margin:0 auto 20px}
#poll_result_oth h2 {padding:0 0 10px}
#poll_result_oth ul {margin:0;padding:0;list-style:none}
#poll_result_oth a {display:block;padding:10px 0;border-bottom:1px solid #eee}
/* 폼메일 */
#formmail textarea {height:100px}
@ -396,7 +435,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
/* 게시판 댓글 */
#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 article {margin-bottom:5px;padding:0 0 10px;border-bottom:1px solid #eee}
#bo_vc header {position:relative;zoom:1}
#bo_vc header:after {display:block;visibility:hidden;clear:both;content:""}
#bo_vc header .icon_reply {position:absolute;top:15px;left:-20px}

2
head.php
View File

@ -15,7 +15,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<header id="hd">
<div id="hd_wrapper">
<div id="to_content"><a href="#container">본문 바로가기</a></div>
<div id="logo"><a href="<?=G4_URL?>"><img src="<?=G4_IMG_URL?>/logo.jpg" alt="처음으로"></a></div>
<div id="logo"><a href="<?=G4_URL?>"><img src="<?=G4_IMG_URL?>/logo.jpg" alt="처음으로" width="224" height="39"></a></div>
<h1><?=$config['cf_title']?></h1>

2
index.php
View File

@ -5,7 +5,7 @@ include_once('./_common.php');
include_once('./_head.php');
?>
<div id="idx_catch"><img src="<?=G4_URL?>/img/idx_catch.jpg" alt="Sharing All Possibilities"></div>
<div id="idx_catch"><img src="<?=G4_URL?>/img/idx_catch.jpg" alt="Sharing All Possibilities" width="471" height="61"></div>
<!-- 메인화면 최신글 시작 -->
<?

BIN
skin/member/neo/img/reg_result_logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

2
skin/member/neo/register_result.skin.php
View File

@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<div id="reg_result" class="cbg">
<div id="reg_result_logo"><img src="<?=$member_skin_url?>img/reg_result_logo.jpg" alt=""></div>
<div id="reg_result_logo"><a href="<?=$g4['url']?>/"><img src="<?=$member_skin_url?>/img/reg_result_logo.jpg" alt="메인으로"></a></div>
<p>
<strong><?=$mb['mb_name']?></strong>님의 회원가입을 진심으로 축하합니다.<br>

41
skin/member/neo/scrap_popin.skin.php
View File

@ -5,27 +5,30 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<div id="scrap_do" class="new_win">
<h1>스크랩하기</h1>
<form name="f_scrap_popin" method="post" action="./scrap_popin_update.php">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">
<div class="cbg">
<table class="frm_tbl">
<caption>스크랩 확인 및 댓글 달기</caption>
<tbody>
<tr>
<th scope="row">제목</th>
<td><?=get_text(cut_str($write['wr_subject'], 255))?></td>
</tr>
<tr>
<th scope="row"><label for="wr_content">댓글</label></th>
<td><textarea id="wr_content" name="wr_content"></textarea></td>
</tr>
</tbody>
</table>
<form name="f_scrap_popin" method="post" action="./scrap_popin_update.php">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">
<p>
스크랩을 하시면서 감사 혹은 격려의 댓글을 남기실 수 있습니다.
</p>
<table class="frm_tbl">
<caption>제목 확인 및 댓글 쓰기</caption>
<tbody>
<tr>
<th scope="row">제목</th>
<td><?=get_text(cut_str($write['wr_subject'], 255))?></td>
</tr>
<tr>
<th scope="row"><label for="wr_content">댓글</label></th>
<td><textarea id="wr_content" name="wr_content"></textarea></td>
</tr>
</tbody>
</table>
<p>
스크랩을 하시면서 감사 혹은 격려의 댓글을 남기실 수 있습니다.
</p>
</div>
<div class="btn_win">
<input type="submit" class="btn_submit" value="스크랩">

17
skin/poll/neo/poll_result.skin.php
View File

@ -5,7 +5,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<div id="poll_result" class="new_win">
<h1><?=$g4['title']?></h1>
<section id="poll_result_list">
<section id="poll_result_list" class="cbg">
<h2><?=$po_subject?> 결과</h2>
<dl>
@ -30,13 +30,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</section>
<? if ($is_etc) { ?>
<section id="poll_result_cmt">
<section id="poll_result_cmt" class="cbg">
<h2>이 설문에 대한 기타의견</h2>
<? for ($i=0; $i<count($list2); $i++) { ?>
<article>
<header>
<h1><?=$list2[$i]['name']?>님의 의견</h1>
<h1><?=$list2[$i]['name']?>님<span class="sound_only">의 의견</span></h1>
<span class="poll_datetime"><?=$list2[$i]['datetime']?></span>
</header>
<p>
@ -54,19 +54,18 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<input type=hidden name="w" value="">
<input type=hidden name="skin_dir" value="<?=$skin_dir?>">
<? if ($is_member) { ?><input type="hidden" name="pc_name" value="<?=cut_str($member['mb_nick'],255)?>"><? } ?>
<p><?=$po_etc?></p>
<h3><?=$po_etc?></h3>
<table id="poll_result_wcmt" class="frm_tbl">
<caption>의견남기기</caption>
<tbody>
<? if ($is_guest) { ?>
<tr>
<th scope="row"><label for="pc_name">이름<strong class="sound_only">필수</strong></label></th>
<td><input type="text" id="pc_name" name="pc_name" class="fieldset_input required" size="10" required></td>
<td><input type="text" id="pc_name" name="pc_name" class="fs_input required" size="10" required></td>
</tr>
<? } ?>
<tr>
<th scope="row"><label for="pc_idea">의견<strong class="sound_only">필수</strong></label></th>
<td><input type="text" id="pc_idea" name="pc_idea" class="fieldset_input required" size="47" required maxlength="100"></td>
<td><input type="text" id="pc_idea" name="pc_idea" class="fs_input required" size="47" required maxlength="100"></td>
</tr>
<? if ($is_guest) { ?>
<tr>
@ -95,7 +94,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</ul>
</section>
<div class="btn_win"><a href="javascript:;" onclick="window.close();">창닫기</a></div>
<div class="btn_win">
<a href="javascript:;" onclick="window.close();">창닫기</a>
</div>
</div>
<script>