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:
gnuboard
2012-12-31 10:37:32 +09:00
parent e43aa7d664 bf2784fc67
commit ad79897e37
5 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bbs/board.php
View File

@ -128,9 +128,9 @@ if (isset($wr_id) && $wr_id) {
alert('목록을 볼 권한이 없습니다.'.PHP_EOL.PHP_EOL.'회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode('board.php?bo_table='.$bo_table.'&wr_id='.$wr_id));
}
if (!isset($page)) $page = 1;
if (!isset($page) || (isset($page) && $page == 0)) $page = 1;
$g4['title'] = $board['bo_subject'].$page.' 페이지';
$g4['title'] = $board['bo_subject']." ".$page."페이지";
}
include_once($g4['path'].'/head.sub.php');
@ -194,7 +194,7 @@ if ($member['mb_level'] >= $board['bo_list_level'] && $board['bo_use_list_view']
include_once('./board_tail.php');
echo "\\n<!-- 사용스킨 : {$board['bo_skin']} -->\\n";
echo "\n<!-- 사용스킨 : {$board['bo_skin']} -->\n";
include_once($g4['path'].'/tail.sub.php');
?>

58
bbs/write_comment_update.php
View File

@ -158,34 +158,34 @@ if ($w == 'c') // 코멘트 입력
}
$sql = " insert into {$write_table}
set ca_name = '{$wr[ca_name]',
wr_option = '{$wr_secret}',
wr_num = '{$wr[wr_num]}',
wr_reply = '',
wr_parent = '{$wr_id}',
wr_is_comment = 1,
wr_comment = '{$tmp_comment}',
wr_comment_reply = '{$tmp_comment_reply}',
wr_subject = '{$wr_subject}',
wr_content = '{$wr_content}',
mb_id = '{$mb_id}',
wr_password = '{$wr_password}',
wr_name = '{$wr_name}',
wr_email = '{$wr_email}',
wr_homepage = '{$wr_homepage}',
wr_datetime = '{$g4[time_ymdhis]}',
wr_last = '',
wr_ip = '{$_SERVER[REMOTE_ADDR]}',
wr_1 = '{$wr_1}',
wr_2 = '{$wr_2}',
wr_3 = '{$wr_3}',
wr_4 = '{$wr_4}',
wr_5 = '{$wr_5}',
wr_6 = '{$wr_6}',
wr_7 = '{$wr_7}',
wr_8 = '{$wr_8}',
wr_9 = '{$wr_9}',
wr_10 = '{$wr_10}' ";
set ca_name = '{$wr[ca_name]}',
wr_option = '{$wr_secret}',
wr_num = '{$wr[wr_num]}',
wr_reply = '',
wr_parent = '{$wr_id}',
wr_is_comment = 1,
wr_comment = '{$tmp_comment}',
wr_comment_reply = '{$tmp_comment_reply}',
wr_subject = '{$wr_subject}',
wr_content = '{$wr_content}',
mb_id = '{$mb_id}',
wr_password = '{$wr_password}',
wr_name = '{$wr_name}',
wr_email = '{$wr_email}',
wr_homepage = '{$wr_homepage}',
wr_datetime = '{$g4[time_ymdhis]}',
wr_last = '',
wr_ip = '{$_SERVER[REMOTE_ADDR]}',
wr_1 = '{$wr_1}',
wr_2 = '{$wr_2}',
wr_3 = '{$wr_3}',
wr_4 = '{$wr_4}',
wr_5 = '{$wr_5}',
wr_6 = '{$wr_6}',
wr_7 = '{$wr_7}',
wr_8 = '{$wr_8}',
wr_9 = '{$wr_9}',
wr_10 = '{$wr_10}' ";
sql_query($sql);
$comment_id = mysql_insert_id();
@ -219,7 +219,7 @@ if ($w == 'c') // 코멘트 입력
$subject = $board[bo_subject].' 게시판에 '.$str.'글이 올라왔습니다.';
// 4.00.15 - 메일로 보내는 코멘트의 바로가기 링크 수정
$link_url = $g4[url]'./.'$g4[bbs]'./board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;'.$qstr.'#c_'.$comment_id;
$link_url = $g4['url']"./."$g4['bbs']"./board.php?bo_table=".$bo_table."&amp;wr_id=".$wr_id."&amp;".$qstr."#c_".$comment_id;
include_once($g4['path'].'/lib/mailer.lib.php');

4
css/adm.css
View File

@ -1,6 +1,8 @@
/* SIR SOFT 지운아빠 Dec 2012 */
/* 초기화 */
html {overflow-y:scroll}
body {background:#dfe4e6;font-size:1em}
html, body, h1, h2, h3, h4, h5, h6 {margin:0;padding:0}
article,aside,details,figcaption,figure, footer,header,hgroup,menu,nav,section {display:block}
header ul, nav ul {margin:0;padding:0;list-style:none}
@ -17,8 +19,6 @@ p {margin:10px 0;line-height:1.5em}
.empty_table {padding:200px 0;text-align:center}
/* 레이아웃 */
html {overflow-y:scroll}
body {background:#dfe4e6;font-size:1em}
header {background:#2c2f34}
#logo {padding-top:4px;height:46px;background:url('../adm/img/logo_bg.png') repeat-x;text-align:center}
#home_link {z-index:2;position:absolute;top:50px;right:20px;height:35px;zoom:1}

16
css/def.css
View File

@ -1,6 +1,8 @@
/* SIR SOFT 지운아빠 Dec 2012 */
/* 초기화 */
html {overflow-y:scroll}
body {font-size:1em}
html, body, h1, h2, h3, h4, h5, h6 {margin:0;padding:0}
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
header ul, nav ul {margin:0;padding:0;list-style:none}
@ -9,6 +11,9 @@ form, img {border:0}
input, img {vertical-align:middle}
p {margin:10px 0;line-height:1.5em}
/* 이미지 등비율 리사이징 */
.img_fix {float:left;width:100%;height:auto}
/* 내용 건너뛰기 */
#to_content a {display:block;position:absolute;top:0;left:0;margin:5px;height:0;text-decoration:none;overflow:hidden}
#to_content a:focus,
@ -20,10 +25,10 @@ p {margin:10px 0;line-height:1.5em}
#logo {position:absolute;top:40px;left:50px}
#tnb {position:absolute;top:53px;left:140px;zoom:1}
#tnb {position:absolute;top:43px;left:140px;zoom:1}
#tnb:after {display:block;visibility:hidden;clear:both;content:""}
#tnb li {float:left;margin-right:25px}
#tnb a {color:#333;font-family:"dotum";font-size:0.9em;font-weight:bold;text-decoration:none}
#tnb li {float:left;margin-right:15px}
#tnb a {display:block;padding:10px;color:#333;font-family:"dotum";font-size:0.9em;font-weight:bold;text-decoration:none}
#hdsch {position:absolute;top:47px;right:45px;padding:0;border:0}
#hdsch legend {height:0;overflow:hidden}
@ -52,10 +57,11 @@ p {margin:10px 0;line-height:1.5em}
#visit {margin-bottom:10px;zoom:1}
#visit:after {display:block;visibility:hidden;clear:both;content:""}
#visit h2 {float:left}
#visit dl {zoom:1}
#visit dl {float:left;margin:0;zoom:1}
#visit dl:after {display:block;visibility:hidden;clear:both;content:""}
#visit dt {float:left}
#visit dd {float:left;margin:0 15px 0 5px;color:#000;font-style:italic}
#visit a {float:left;font-weight:bold}
#current_connect {margin-bottom:10px;zoom:1}
#current_connect:after {display:block;visibility:hidden;clear:both;content:""}
@ -66,7 +72,7 @@ p {margin:10px 0;line-height:1.5em}
#popular h2 {float:left}
#popular ul {list-style:none;zoom:1}
#popular ul:after {display:block;visibility:hidden;clear:both;content:""}
#popular li {float:left}
#popular li {float:left;margin-right:20px}
#footer p {position:absolute;top:15px;right:50px}

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

@ -171,5 +171,20 @@ function file_download(link, file) {
<!-- 게시글 보기 끝 -->
<script>
//이미지등비율리사이즈 스크립트 추가 요망ㅎ
// 이미지 등비율 리사이징
$(document).ready(function(){
var img = $('article img');
var img_org_width = img.width();
$(window).resize(function(){
var wrapper_width = $('#wrapper').width();
img.each(function() {
var img_width = $(this).width();
if (img_width > wrapper_width) {
$(this).addClass('img_fix');
} else if (img_width <= wrapper_width && img_width >= img_org_width) {
$(this).removeClass('img_fix');
}
});
}).resize();
});
</script>