firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g5 merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-02-03 11:22:49 +09:00
parent 14a394750d b6f76f8885
commit c2fd1d0470
9 changed files with 661 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adm/board_form.php
View File

@ -826,8 +826,7 @@ $frm_submit .= '</div>';
<label for="chk_all_skin">전체적용</label>
</td>
</tr>
<tbody>
<tr>
<tr>
<th scope="row"><label for="bo_mobile_skin">모바일<br>스킨 디렉토리<strong class="sound_only">필수</strong></label></th>
<td>
<?php echo get_mobile_skin_select('board', 'bo_mobile_skin', 'bo_mobile_skin', $board['bo_mobile_skin'], 'required'); ?>
@ -1067,7 +1066,7 @@ $frm_submit .= '</div>';
<tr>
<th scope="row"><label for="bo_new">새글 아이콘<strong class="sound_only">필수</strong></label></th>
<td>
<?php echo help('글 입력후 new 이미지를 출력하는 시간') ?>
<?php echo help('글 입력후 new 이미지를 출력하는 시간. 0을 입력하시면 아이콘을 출력하지 않습니다.') ?>
<input type="text" name="bo_new" value="<?php echo $board['bo_new'] ?>" id="bo_new" required class="required numeric frm_input" size="4">
</td>
<td class="td_grpset">
@ -1080,7 +1079,7 @@ $frm_submit .= '</div>';
<tr>
<th scope="row"><label for="bo_hot">인기글 아이콘<strong class="sound_only">필수</strong></label></th>
<td>
<?php echo help('조회수가 설정값 이상이면 hot 이미지 출력') ?>
<?php echo help('조회수가 설정값 이상이면 hot 이미지 출력. 0을 입력하시면 아이콘을 출력하지 않습니다.') ?>
<input type="text" name="bo_hot" value="<?php echo $board['bo_hot'] ?>" id="bo_hot" required class="required numeric frm_input" size="4">
</td>
<td class="td_grpset">

2
adm/config_form.php
View File

@ -656,7 +656,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
<td colspan="3"><textarea name="cf_stipulation" id="cf_stipulation" rows="10"><?php echo $config['cf_stipulation'] ?></textarea></td>
</tr>
<tr>
<th scope="row"><label for="cf_privacy">개인정보취급방침</label></th>
<th scope="row"><label for="cf_privacy">개인정보처리방침</label></th>
<td colspan="3"><textarea id="cf_privacy" name="cf_privacy" rows="10"><?php echo $config['cf_privacy'] ?></textarea></td>
</tr>
</tbody>