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:
whitedot
2013-03-15 09:53:21 +09:00
parent 1d15755995 2a8ea18e78
commit deee5e7f8d
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adm/board_form.php
View File

@ -48,11 +48,11 @@ if ($w == '') {
$board['bo_download_point'] = $config['cf_download_point'];
$board['bo_gallery_cols'] = 4;
$board['bo_gallery_width'] = 200;
$board['bo_gallery_height'] = 150;
$board['bo_mobile_gallery_cols'] = 2;
$board['bo_mobile_gallery_width'] = 160;
$board['bo_mobile_gallery_height'] = 120;
$board['bo_gallery_width'] = 174;
$board['bo_gallery_height'] = 124;
$board['bo_mobile_gallery_cols'] = 3;
$board['bo_mobile_gallery_width'] = 125;
$board['bo_mobile_gallery_height'] = 100;
$board['bo_table_width'] = 100;
$board['bo_page_rows'] = $config['cf_page_rows'];
$board['bo_subject_len'] = 60;

2
install/gnuboard4s.sql
View File

@ -64,6 +64,7 @@ CREATE TABLE IF NOT EXISTS `g4s_board` (
`bo_hot` int(11) NOT NULL default '0',
`bo_image_width` int(11) NOT NULL default '0',
`bo_skin` varchar(255) NOT NULL default '',
`bo_mobile_skin` varchar(255) NOT NULL default '',
`bo_image_head` varchar(255) NOT NULL default '',
`bo_image_tail` varchar(255) NOT NULL default '',
`bo_include_head` varchar(255) NOT NULL default '',
@ -304,6 +305,7 @@ DROP TABLE IF EXISTS `g4s_group`;
CREATE TABLE IF NOT EXISTS `g4s_group` (
`gr_id` varchar(10) NOT NULL default '',
`gr_subject` varchar(255) NOT NULL default '',
`gr_device` ENUM('both','pc','mobile') NOT NULL DEFAULT 'both',
`gr_admin` varchar(255) NOT NULL default '',
`gr_use_access` tinyint(4) NOT NULL default '0',
`gr_show_menu` tinyint(4) NOT NULL default '0',

2
mobile/skin/member/basic/register_form.skin.php
View File

@ -130,7 +130,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</tr>
<? } ?>
<? if ($member['mb_level'] >= $config['cf_icon_level']) { ?>
<? if ($config['cf_use_member_icon'] && $member['mb_level'] >= $config['cf_icon_level']) { ?>
<tr>
<th scope="row"><label for="reg_mb_icon">회원아이콘</label></th>
<td>

2
mobile/skin/member/kcpcert/register_form.skin.php
View File

@ -135,7 +135,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</tr>
<? } ?>
<? if ($member['mb_level'] >= $config['cf_icon_level']) { ?>
<? if ($config['cf_use_member_icon'] && $member['mb_level'] >= $config['cf_icon_level']) { ?>
<tr>
<th scope="row"><label for="reg_mb_icon">회원아이콘</label></th>
<td>

2
skin/member/kcpcert/register_form.skin.php
View File

@ -135,7 +135,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</tr>
<? } ?>
<? if ($member['mb_level'] >= $config['cf_icon_level']) { ?>
<? if ($config['cf_use_member_icon'] && $member['mb_level'] >= $config['cf_icon_level']) { ?>
<tr>
<th scope="row"><label for="reg_mb_icon">회원아이콘</label></th>
<td>