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
2013-06-18 10:18:08 +09:00
parent 62720cd5ac d3d6e9a0e0
commit 485c08870e
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ skin/latest/basic2
rankiss*
thumb.lib.php
test.php
itzimara*

4
adm/boardgroup_form.php
View File

@ -58,7 +58,7 @@ include_once('./admin.head.php');
if ($w=='')
echo '영문자, 숫자, _ 만 가능 (공백없이)';
else
echo '<a href="'.G4_BBS_URL.'/group.php?gr_id='.$group['gr_id'].'">게시판그룹 바로가기</a>';
echo '<a href="'.G4_BBS_URL.'/group.php?gr_id='.$group['gr_id'].'" class="btn_frmline">게시판그룹 바로가기</a>';
?>
</td>
</tr>
@ -68,7 +68,7 @@ include_once('./admin.head.php');
<input type="text" name="gr_subject" value="<?php echo get_text($group['gr_subject']) ?>" id="gr_subject" required class="required frm_input" size="80">
<?php
if ($w == 'u')
echo '<a href="./board_form.php?gr_id='.$gr_id.'">게시판생성</a>';
echo '<a href="./board_form.php?gr_id='.$gr_id.'" class="btn_frmline">게시판생성</a>';
?>
</td>
</tr>

10
css/admin.css
View File

@ -41,7 +41,7 @@ h2 {font-size:1.2em}
/* gnb js off */
#gnb {z-index:12;background:#383a3f}
#gnb h2 {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
#gnb_1dul {margin:0 auto;padding:0;width:1000px;zoom:1}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli {z-index:13;clear:both;zoom:1}
@ -59,10 +59,10 @@ h2 {font-size:1.2em}
.gnb_js .gnb_1dli a {color:#fff;text-align:center}
.gnb_js .gnb_1dli_air a {float:none;background:#f5f6fa;color:#000}
.gnb_js .gnb_1dli_on a {float:none;background:#fff;color:#000}
.gnb_js .gnb_2dul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden}
.gnb_js .gnb_2dul {display:none;position:absolute;top:35px}
.gnb_js .gnb_2dli a {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left}
.gnb_1dli_over .gnb_2dul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
.gnb_1dli_over2 .gnb_2dul {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
.gnb_1dli_over .gnb_2dul {display:block;left:-1px;width:181px;border:1px solid #c3c7c5;border-top:0;background:#fff}
.gnb_1dli_over2 .gnb_2dul {display:block;right:-1px;width:181px;border:1px solid #c3c7c5;border-top:0;background:#fff}
.gnb_js .gnb_grp_style {background:#f7f7f7 !important}
.gnb_js .gnb_grp_div {border-top:1px solid #eee}
@ -184,7 +184,7 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f
#sort_mb {width:800px}
/* 테이블 */
table {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0}
table {clear:both;margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0}
caption {padding:10px 0 15px;font-weight:bold;text-align:left}
thead th {padding:12px 0 8px;border-bottom:1px solid #666;background:#565e60;color:#fff}
thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */

12
css/default.css
View File

@ -41,7 +41,7 @@ a:active {color:#000;text-decoration:underline}
/* gnb js off */
#gnb {position:relative;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8}
#gnb h2 {position:absolute;margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
#gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#gnb_1dul {margin:0 auto;padding:0;width:980px;zoom:1}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli {z-index:10;clear:both;zoom:1}
@ -60,10 +60,10 @@ a:active {color:#000;text-decoration:underline}
.gnb_js .gnb_1da {text-align:center}
.gnb_js .gnb_1dli_air a {float:none;background:#333;color:#fff}
.gnb_js .gnb_1dli_on a {float:none;background:#333;color:#fff}
.gnb_js .gnb_2dul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden}
.gnb_js .gnb_2dul {display:none;position:absolute;top:35px}
.gnb_js .gnb_2da {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left}
.gnb_1dli_over .gnb_2dul {left:0;width:180px;height:auto;background:#fff}
.gnb_1dli_over2 .gnb_2dul {right:0;width:180px;height:auto;background:#fff}
.gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff}
.gnb_1dli_over2 .gnb_2dul {display:block;right:0;width:180px;background:#fff}
.gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em}
@ -125,7 +125,7 @@ a:active {color:#000;text-decoration:underline}
/* 버튼 */
.btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc;background:#fafafa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
.btn01:focus, .btn01:hover {text-decoration:none !important}
.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #333;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #000;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
.btn02:focus, .btn02:hover {text-decoration:none !important}
.btn_confirm {text-align:center} /* 서식단계 진행 */
.btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer}
@ -144,7 +144,7 @@ button.btn_frmline {font-size:1em}
/* 게시판용 버튼 */
.btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f5f6fa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
.btn_b01:focus, .btn_b01:hover {text-decoration:none !important}
.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #eee;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #000;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
.btn_b02:focus, .btn_b02:hover {text-decoration:none !important}
.btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c;background:#e8180c;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */
.btn_admin:focus, .btn_admin:hover {text-decoration:none !important}

6
lib/thumbnail.lib.php
View File

@ -34,6 +34,9 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
else
$data_path = $p['path'];
if(!preg_match('/^\/'.G4_DATA_DIR.'/', $data_path))
continue;
$srcfile = G4_PATH.$data_path;
if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) {
@ -109,6 +112,9 @@ function get_view_thumbnail($contents, $thumb_width=0)
else
$data_path = $p['path'];
if(!preg_match('/^\/'.G4_DATA_DIR.'/', $data_path))
continue;
$srcfile = G4_PATH.$data_path;
if(is_file($srcfile)) {