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-03-29 10:45:05 +09:00
parent 79e124a0f6 d6b59d1231
commit 7de63f929b
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bbs/board.php
View File

@ -112,7 +112,7 @@ if (isset($wr_id) && $wr_id) {
set_session($ss_name, TRUE);
}
$g4['title'] = strip_tags(conv_subject($write['wr_subject'], 255));
$g4['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".$board['bo_subject'];
} else {
if ($member['mb_level'] < $board['bo_list_level']) {
if ($member['mb_id'])
@ -123,7 +123,7 @@ if (isset($wr_id) && $wr_id) {
if (!isset($page) || (isset($page) && $page == 0)) $page = 1;
$g4['title'] = $board['bo_subject'];
$g4['title'] = $board['bo_subject']." ".$page." 페이지";
}
include_once(G4_PATH.'/head.sub.php');

2
css/default.css
View File

@ -110,7 +110,7 @@ a:active {color:#000;text-decoration:underline}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#wrapper_title {margin-bottom:20px;font-size:1.2em}
#side_nb {float:right;width:209px;border:1px solid #cfded8;background:#fff}
#wrapper #aside {float:right;width:209px;border:1px solid #cfded8;background:#fff}
#container {z-index:4;position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #cfded8;background:#fff;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}

4
head.php
View File

@ -155,10 +155,10 @@ if ($config['cf_include_head']) {
<hr>
<div id="wrapper">
<div id="side_nb">
<aside id="aside">
<?=(G4_IS_MOBILE?outlogin('basic'):outlogin('basic')); // 외부 로그인 ?>
<?=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
</div>
</aside>
<div id="container">
<? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>
<div id="text_size">

2
head.sub.php
View File

@ -10,7 +10,7 @@ if (!isset($g4['title'])) {
}
else {
$g4_head_title = $g4['title']; // 상태바에 표시될 제목
$g4_head_title .= " : ".$config['cf_title'];
$g4_head_title .= " | ".$config['cf_title'];
}
// 현재 접속자

4
mobile/head.php
View File

@ -94,9 +94,9 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<hr>
<div id="wrapper">
<div id="side_nb">
<aside id="aside">
<?=(G4_IS_MOBILE?outlogin('basic'):outlogin('basic')); // 외부 로그인 ?>
</div>
</aside>
<div id="container">
<? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>
<div id="text_size">

2
skin/board/basic/list.skin.php
View File

@ -9,7 +9,7 @@ if ($is_good) $colspan++;
if ($is_nogood) $colspan++;
?>
<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$g4['title']?></h1><?}?>
<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$board['bo_subject']?></h1><?}?>
<!-- 게시판 목록 시작 -->
<div id="bo_list" style="width:<?=$width;?>">

2
skin/board/gallery/list.skin.php
View File

@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$g4['title']?></h1><?}?>
<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$board['bo_subject']?></h1><?}?>
<!-- 게시판 목록 시작 -->
<div id="bo_img" style="width:<?=$width;?>">