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:
rollydream
2013-03-06 15:04:35 +09:00
parent 8603ce52af dd2e21b37b
commit 725d528d93
6 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/gcaptcha/gcaptcha.lib.php
View File

@ -181,7 +181,7 @@ function captcha_html($class='captcha')
$html .= '<legend class="sound_only">스팸방지</legend>';
$html .= '<img src="'.$jpg_file_url.'" alt="스팸방지 숫자">';
$html .= '<a href="'.$wav_file_url.'" id="captcha_wav" target="_blank"><img src="'.G4_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
$html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box fs_input" size="6" maxlength="6" required title="스팸방지 숫자 입력">';
$html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input" size="6" maxlength="6" required title="스팸방지 숫자 입력">';
$html .= '<p class="sound_only">스팸방지 숫자를 순서대로 입력하세요.</p>';
$html .= '</fieldset>';
return $html;

58
css/mobile.css
View File

@ -25,7 +25,7 @@ pre {overflow-x:scroll;font-size:1.1em}
#hd_login_msg {position:absolute;top:0;left:0;width:0;height:0;overflow:hidden}
.sound_only {display:inline-block;margin:0;padding:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden}
/* 본문 바로가기 */
#to_content a {z-index:100000;position:absolute;top:0;left:0;font-size:0;line-height:0;overflow:hidden}
#to_content a {z-index:100000;position:absolute;top:0;left:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden}
/* 이미지 등비율 리사이징 */
.img_fix {float:left;width:100%;height:auto}
@ -203,17 +203,16 @@ input.required:focus {border:0;background:#21272e !important;color:#fff;line-hei
#find_info #captcha input {margin-left:0.3em}
/* 아웃로그인 */
.ol {position:relative}
.ol {position:relative;margin:0 0 1em;padding:0 0.5em 0.5em;border-bottom:1px solid #e7f1ed}
.ol h2 {width:0;height:0;overflow:hidden}
#ol_before {padding:0 0.5em}
#ol_before input[type=text],
#ol_before input[type=password] {display:block;margin-bottom:0.3em;padding:0;width:80%;height:1.8em;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none}
#ol_before input[type=submit] {position:absolute;top:0em;right:0.5em;padding:0 !important;width:18%;height:4em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer;-webkit-appearance:none}
#ol_svc {margin:0.5em 0;text-align:right}
#ol_svc a {display:inline-block;margin:0 0 0 0.5em;color:#000;text-decoration:none;vertical-align:middle}
#ol_after_hd strong {display:inline-block;padding:0 0.5em 0.5em}
#ol_after_hd strong {display:inline-block;padding:0 0 0.5em}
#ol_after_hd .btn_admin {display:block;padding:0 !important;width:100%;text-align:center}
#ol_after_private {margin:0;padding:0;list-style:none;zoom:1}
#ol_after_private:after {display:block;visibility:hidden;clear:both;content:""}
@ -275,7 +274,56 @@ input.required:focus {border:0;background:#21272e !important;color:#fff;line-hei
#pw_wr_password {display:block;margin-top:1em;padding:0;width:80%;line-height:1.8em}
#pw_confirm .btn_submit {position:absolute;bottom:1em;right:0.5em;width:18%;height:1.9em !important;line-height:1.9em}
/* 설문조사 */
/* 설문조사 스킨 */
#poll {margin:0 0 1em;padding:0 0 1em;border-bottom:1px solid #e7f1ed}
#poll header {position:relative;padding:0 0.5em}
#poll h2 {padding:0 0 0.5em}
#poll header .btn_admin {display:block;padding:0 !important;width:100%;text-align:center}
#poll header p {padding:0}
#poll ul {margin:0 0 1em;padding:0.3em 1em;list-style:none}
#poll li {padding:3px 0}
#poll footer {padding:0 0.5em;text-align:center}
#poll footer input {width:49%;height:2.15em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer;-webkit-appearance:none}
#poll footer a {display:inline-block;width:49%;height:2em;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;text-align:center;line-height:2em}
#poll footer a:focus,
#poll footer a:hover {text-decoration:none !important}
/* 설문조사 결과 (새창) */
#poll_result section {padding:1em;border-bottom:1px solid #eee}
#poll_result h2 {margin:0;padding:0}
#poll_result .member,
#poll_result .guest,
#poll_result .sv_member,
#poll_result .sv_guest {font-weight:bold;margin-right:0.5em}
#poll_result_list {margin:0 auto}
#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:2em}
#poll_result_list dt {margin-right:5%;color:#e8180d;text-align:right}
#poll_result_list ol {margin:0;padding-left:2.5em}
#poll_result_list li {margin-top:10px}
#poll_result_list p {position:relative;margin:0;padding:0.3em 0}
#poll_result_list p strong {position:absolute;top:0.3em;right:5%;margin-right:60px;width:100px;text-align:right}
#poll_result_list p span {position:absolute;top:5px;right:5%;width:60px;color:#68999c;text-align:right}
.poll_result_graph {position:relative;margin-right:5%;height:5px;background:#eee}
.poll_result_graph span {position:absolute;top:0;left:0;height:5px;background:#565e60;font-size:0.1em}
#poll_result_cmt {margin:0 auto;padding:1.5em 2.5em !important;background:#f7f7f7}
#poll_result_cmt h2 {text-align:center}
#poll_result_cmt h3 {margin:0 auto 1em}
#poll_result_cmt article {margin:0 0 1em;border-bottom:1px solid #eee}
#poll_result_cmt h1 {margin:0;padding:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#poll_result_cmt p {padding:0.3em 0}
#poll_result_cmt footer {text-align:right}
#poll_result_wcmt {margin:0 0 1em !important}
#poll_result_wcmt td {padding:0 0 0.3em;border:0}
#poll_result_wcmt input[type=text] {background:#fff !important}
#pc_idea {width:98%}
.poll_cmt_del a {display:inline-block;padding-bottom:1em}
#poll_result_oth {margin:0 auto 1.5em}
#poll_result_oth h2 {padding:1em}
#poll_result_oth ul {margin:0;padding:0 1em;list-style:none}
#poll_result_oth a {display:block;padding:1em 0;border-bottom:1px solid #eee;color:#000;text-decoration:none}
/* 폼메일 */
#formmail #subject {width:98%}

7
js/common.js
View File

@ -524,7 +524,7 @@ var win_poll = function(href) {
**/
function font_resize(id, act)
{
var $elements = $("#"+id+" *");
var $elements = $("#"+id+" *").not("select").not("option");
$elements.removeClass("applied");
var count = parseInt(get_cookie("ck_font_resize_count"));
if(isNaN(count))
@ -539,14 +539,15 @@ function font_resize(id, act)
} else {
set_font_size($(this), act);
// 텍스트 노드가 있는 경우 부모에 스타일 적용
// 텍스트 노드가 있는지 체크
var $parent = $(this).parent();
var text = $parent.contents().filter(function() {
return this.nodeType == 3;
}).text().replace(/\s*/, "");
if(text.length) {
// 텍스트노드와 형제가 있을 경우 마지막 형제엘리먼트에 스타일 적용 후 부모에 스타일 적용
// 텍스트노드의 형제가 있을 경우 마지막 형제에
// 스타일 적용 후 부모에 폰트 스타일 적용
var $child = $parent.children();
var chdlen = $child.length;
if(chdlen == ($child.index($(this)) + 1)) {

2
mobile/head.php
View File

@ -108,7 +108,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<div id="wrapper">
<div id="lnb">
<?=(G4_IS_MOBILE?outlogin('basic'):outlogin('basic')); // 외부 로그인 ?>
<?//=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
<?=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
</div>
<div id="container">
<? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>

9
mobile/skin/poll/basic/poll_result.skin.php
View File

@ -17,7 +17,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<p>
<?=$list[$i]['content']?>
<strong><?=$list[$i]['cnt']?> 표</strong>
<span><?=number_format($list[$i]['rate'], 1)?> 퍼센트</span>
<span><?=number_format($list[$i]['rate'], 1)?>%</span>
</p>
<div class="poll_result_graph">
<span style="width:<?=number_format($list[$i]['rate'], 1)?>%"></span>
@ -60,17 +60,14 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<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="frm_input required" size="10" required></td>
<td><input type="text" id="pc_name" name="pc_name" class="frm_input required" required placeholder="이름(필수)"></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="frm_input required" size="47" required maxlength="100"></td>
<td><input type="text" id="pc_idea" name="pc_idea" class="frm_input required" required maxlength="100" placeholder="의견(필수)"></td>
</tr>
<? if ($is_guest) { ?>
<tr>
<th scope="row">자동등록방지</th>
<td><?=captcha_html();?></td>
</tr>
<? } ?>

10
skin/latest/basic/latest.skin.php
View File

@ -16,17 +16,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
echo $list[$i]['subject'];
if ($list[$i]['comment_cnt'])
echo " <span class=\"cnt_cmt\">".$list[$i]['comment_cnt']."</span>";
echo $list[$i]['comment_cnt'];
echo "</a>";
// if ($list[$i]['link']['count']) { echo "[{$list[$i]['link']['count']}]"; }
// if ($list[$i]['file']['count']) { echo "<{$list[$i]['file']['count']}>"; }
if (isset($list[$i]['icon_new'])) echo " " . $list[$i]['icon_new'];
if (isset($list[$i]['icon_hot'])) echo " " . $list[$i]['icon_hot'];
if (isset($list[$i]['icon_file'])) echo " " . $list[$i]['icon_file'];
if (isset($list[$i]['icon_link'])) echo " " . $list[$i]['icon_link'];
if (isset($list[$i]['icon_new'])) echo " " . $list[$i]['icon_new'];
if (isset($list[$i]['icon_hot'])) echo " " . $list[$i]['icon_hot'];
if (isset($list[$i]['icon_file'])) echo " " . $list[$i]['icon_file'];
if (isset($list[$i]['icon_link'])) echo " " . $list[$i]['icon_link'];
if (isset($list[$i]['icon_secret'])) echo " " . $list[$i]['icon_secret'];
?>
</li>