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-17 12:57:51 +09:00
parent c0a2647019 887ed693b0
commit 23f1d81bda
4 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
css/default.css
View File

@ -37,13 +37,13 @@ td {padding:10px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9}
/* 필드셋 */
fieldset {margin-bottom:20px;padding:13px;border:1px solid #dedace;background:#fefefe}
legend {margin-left:0;padding:7px 10px;border:1px solid #dedace;background:#333;color:#fff}
fieldset .fieldset_input,
.fieldset_input,
fieldset textarea {padding:3px;border:1px solid #ddd;background:#fff;vertical-align:middle}
fieldset .fieldset_input:focus,
.fieldset_input:focus,
fieldset textarea:focus {padding:4px;border:0;background:#494949;color:#fff}
fieldset select {padding:2px 2px 3px;border:1px solid #ddd;background:#f9f9f5;vertical-align:middle}
fieldset p {margin:0}
fieldset .span_highlight {color:#ff3061}
fieldset .span_highlight {color:#ff4679}
fieldset button,
.fieldset_submit {padding:0 15px;height:24px;border:0;background:#494949;color:#fff;line-height:1.9em;vertical-align:middle;cursor:pointer}
fieldset button:focus,
@ -99,9 +99,9 @@ a {color:#000;text-decoration:none}
#ol_before legend {position:absolute;padding:0;width:0;height:0;border:0;background:transparent;overflow:hidden}
#ol_before input:focus {background:#333;color:#fff}
#ol_id {display:block;margin-bottom:3px;padding:0 5px;width:185px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em}
.ol_idlabel {position:absolute;top:21px;left:20px;color:#696969;font-size:0.9em}
.ol_idlabel {position:absolute;top:21px;left:15px;color:#696969;font-size:0.9em}
#ol_pw {display:block;margin-bottom:3px;padding:0 5px;width:185px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em}
.ol_pwlabel {position:absolute;top:48px;left:20px;color:#696969;font-size:0.9em}
.ol_pwlabel {position:absolute;top:48px;left:15px;color:#696969;font-size:0.9em}
#auto_login {}
#auto_login_label {color:#696969;letter-spacing:-0.1em}
#ol_submit {width:60px;height:24px;border:1px solid #b7b7b7;background:#fff;font-weight:bold;letter-spacing:-0.1em;line-height:1.7em;vertical-align:top}
@ -142,20 +142,22 @@ a {color:#000;text-decoration:none}
#poll ul {padding:5px 10px;background:#fff}
#poll li {margin:7px 0}
#poll footer {padding:10px 10px 15px;background:#fff;text-align:center}
#poll footer input {padding:0 15px;height:24px;border:0;background:#494936;color:#fff;letter-spacing:-0.1em;vertical-align:top}
#poll footer a {display:inline-block;padding:0 5px;height:22px;border:1px solid #b7b7b7;background:#fff;vertical-align:top;letter-spacing:-0.1em;line-height:2.1em}
#poll .btn_submit {height:24px;line-height:1.9em}
#poll .btn_cancel {height:22px;line-height:1.95em}
/* 설문조사 결과 (새창) */
#poll_result section {margin:0 auto 20px;padding:10px;width:90%}
#poll_result h2 {margin-top:10px}
#poll_result_list h2 {padding:10px 0 0;text-align:center}
#poll_result h2 {margin:0;padding:20px 0}
#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 dt {text-align:center}
#poll_result_list dt {margin-right:5%;color:#ff4679;text-align:right}
#poll_result_list li {margin-top:10px}
#poll_result_list p {margin:0;padding:5px 0}
#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:#ddd}
.poll_result_graph span {position:absolute;top:0;left:0;height:100%;background:#ff3061}
.poll_result_graph span {position:absolute;top:0;left:0;height:100%;background:#ff4679}
#poll_result_cmt {border:1px solid #ddd;background:#f7f7f7}
#poll_result_cmt h2 {text-align:center}
#poll_result_cmt article {margin:0 38px 15px;border-bottom:1px solid #e7e7e7}
@ -164,7 +166,9 @@ a {color:#000;text-decoration:none}
#poll_result_cmt fieldset {margin:0 38px;width:auto;border:0;text-align:center}
#poll_result_cmt legend {margin:0;padding:0;width:0;height:0;border:0;overflow:hidden}
#poll_result_cmt fieldset p {margin:0 0 15px;padding:3px 0 10px;border-bottom:1px solid #dedede;text-align:left}
#poll_result_another a {display:block;padding:5px 0}
#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}
/* 레이아웃 중간 */
#wrapper {z-index:2;clear:both;position:relative;padding:20px 240px 30px 20px;min-height:520px;height:auto !important;height:520px;background:url("../img/wrapper_bg.jpg") top right repeat-y}
@ -205,12 +209,12 @@ a {color:#000;text-decoration:none}
/* ##################################################################### 스킨 및 컨텐츠 */
/* 공통 */
.cnt_cmt {display:inline-block;margin-left:10px;color:#ff3061}
.readonly {background:#ff3061}
.highlight {font-weight:bold;color:#ff3061}
.cnt_cmt {display:inline-block;margin-left:10px;color:#ff4679}
.readonly {background:#ff4679}
.highlight {font-weight:bold;color:#ff4679}
/* 버튼 */
.btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ff5e1c;background:#ff3061;color:#fff;text-decoration:none;line-height:2.2em}
.btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ff5e1c;background:#ff4679;color:#fff;text-decoration:none;line-height:2.2em}
.btn01:hover,
.btn01:focus {}
.btn02 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.2em}
@ -220,7 +224,7 @@ a {color:#000;text-decoration:none}
.btn02:hover,
.btn02:focus {}
.btn_confirm {text-align:center} /* 서식단계 진행 */
.btn_submit {padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;letter-spacing:-0.1em;vertical-align:top}
.btn_submit {padding:0 15px;height:30px;border:0;background:#ff4679;color:#fff;letter-spacing:-0.1em;vertical-align:top}
.btn_cancel {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.5em}
/* 폼 테이블 */
@ -229,12 +233,12 @@ a {color:#000;text-decoration:none}
.frm_tbl th {padding-left:10px;width:160px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;text-align:left}
.frm_tbl td {padding:7px 10px}
.frm_tbl textarea,
.frm_tbl .frm_input,
.frm_input,
.frm_tbl select {border:1px solid #d7d7d7;background:#f6f9fa;vertical-align:middle}
.frm_tbl textarea,
.frm_tbl .frm_input {padding:2px;background:#f5f5f2}
.frm_input {padding:2px;background:#f5f5f2}
.frm_tbl textarea:focus,
.frm_tbl .frm_input:focus {padding:3px;border:0;background:#494949;color:#fff}
.frm_input:focus {padding:3px;border:0;background:#494949;color:#fff}
.frm_tbl textarea {width:90%}
.frm_tbl select {padding:2px}
.frm_file {display:block;margin-bottom:5px}
@ -317,7 +321,7 @@ a {color:#000;text-decoration:none}
#bo_list td {line-height:1em}
#bo_list img {vertical-align:top}
.bo_cate_link {display:inline-block;margin:0 10px 0 0;font-weight:bold;text-decoration:none}
.bo_current {color:#ff3061}
.bo_current {color:#ff4679}
.td_subject img {margin-left:5px}
/* 게시판 쓰기 */
@ -343,19 +347,21 @@ a {color:#000;text-decoration:none}
#bo_v_atc:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_atc p {padding:0 0 10px;min-height:300px;height:auto !important;height:300px}
#bo_v_file {background:#494949}
#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;margin-top:5px;padding:5px 10px;color:#fff}
.bo_v_file_cnt {display:inline-block;margin-left:10px;color:#ddd}
#bo_v_link {background:#494949}
#bo_v_file li {border-bottom:1px solid #ddd;background:#f7f7f7}
#bo_v_file a {display:inline-block;padding:8px 10px 7px}
#bo_v_file strong {text-decoration:underline}
.bo_v_file_cnt {display:inline-block;margin:0 10px;color:#ff4679}
#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;margin-top:5px;padding:5px 10px;color:#fff}
.bo_v_link_cnt {display:inline-block;margin-left:10px;color:#ddd}
#bo_v_link li {border-bottom:1px solid #ddd;background:#f7f7f7}
#bo_v_link a {display:inline-block;padding:8px 10px 7px}
#bo_v_link strong {text-decoration:underline}
.bo_v_link_cnt {display:inline-block;margin:0 10px;color:#ff4679}
#bo_v_act {margin:20px 0;text-align:center}
#bo_v_act a {margin-right:5px;vertical-align:top}
#bo_v_act strong {color:#ff3061}
#bo_v_act strong {color:#ff4679}
#bo_v_bot {zoom:1}
#bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_bot h2 {margin:0;padding:0;height:0;overflow:hidden}

7
skin/board/neo/view.skin.php
View File

@ -38,8 +38,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<li>
<a href="<? echo $view['file'][$i]['href']; ?>" onclick="javascript:file_download('<? echo $view['file'][$i]['href'].'&amp;confirm=yes'; ?>', '<?=$view['file'][$i]['source']?>'); return false;">
<span><?=$view['file'][$i]['source']?> (<?=$view['file'][$i]['size']?>)</span>
<span class="bo_v_file_cnt"><?=$view['file'][$i]['download']?></span>
<strong><?=$view['file'][$i]['source']?></strong>
<span> (<?=$view['file'][$i]['size']?>)</span>
<span class="bo_v_file_cnt"><?=$view['file'][$i]['download']?>회 다운로드</span>
<span>DATE : <?=$view['file'][$i]['datetime']?></span>
</a>
</li>
@ -65,7 +66,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<li>
<a href="<?=$view['link_href'][$i]?>" target="_blank">
<span><?=$link?></span>
<strong><?=$link?></strong>
<span class="bo_v_link_cnt"><?=$view['link_hit'][$i]?>회 연결</span>
</a>
</li>

4
skin/poll/neo/poll.skin.php
View File

@ -28,8 +28,8 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
<? } ?>
</ul>
<footer>
<input type="submit" value="투표하기">
<a href="<?="{$g4['bbs_url']}/poll_result.php?po_id={$po_id}&amp;skin_dir={$skin_dir}";?>" target="win_poll">결과보기</a>
<input type="submit" class="btn_submit" value="투표하기">
<a href="<?="{$g4['bbs_url']}/poll_result.php?po_id={$po_id}&amp;skin_dir={$skin_dir}";?>" class="btn_cancel" target="win_poll">결과보기</a>
</footer>
</section>
</form>

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

@ -16,8 +16,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<li>
<p>
<?=$list[$i]['content']?>
<strong><?=$list[$i]['cnt']?>표</strong>
<span><?=number_format($list[$i]['rate'], 1)?>%</span>
<strong><?=$list[$i]['cnt']?> 표</strong>
<span><?=number_format($list[$i]['rate'], 1)?> 퍼센트</span>
</p>
<div class="poll_result_graph">
<span style="width:<?=number_format($list[$i]['rate'], 1)?>%"></span>
@ -79,10 +79,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</section>
<? } ?>
<section id="poll_result_another">
<section id="poll_result_oth">
<h2>다른 투표 결과 보기</h2>
<ul>
<? for ($i=0; $i<count($list3); $i++) { ?><li><a href="./poll_result.php?po_id=<?=$list3[$i]['po_id']?>&amp;skin_dir=<?=$skin_dir?>">[<?=$list3[$i]['date']?>] <?=$list3[$i]['subject']?></a></li><? } ?>
<? for ($i=0; $i<count($list3); $i++) { ?>
<li><a href="./poll_result.php?po_id=<?=$list3[$i]['po_id']?>&amp;skin_dir=<?=$skin_dir?>">[<?=$list3[$i]['date']?>] <?=$list3[$i]['subject']?></a></li>
<? } ?>
</ul>
</section>