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
2013-10-01 10:19:53 +09:00
parent fceece482e aed9ef05c1
commit a84177b6e2
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -19,3 +19,6 @@ cheditor*
*.key *.key
g5_tree g5_tree
*.sh *.sh
kcho07_rss/
mobile/skin/board/bach72_mobile/
skin/board

6
adm/boardgroup_form.php
View File

@ -7,9 +7,11 @@ auth_check($auth[$sub_menu], 'w');
if ($is_admin != 'super' && $w == '') alert('최고관리자만 접근 가능합니다.'); if ($is_admin != 'super' && $w == '') alert('최고관리자만 접근 가능합니다.');
$html_title = '게시판그룹'; $html_title = '게시판그룹';
$gr_id_attr = '';
$sound_only = '';
if ($w == '') { if ($w == '') {
$gr_id_attr = 'required'; $gr_id_attr = 'required';
$sound_only = '<strong class="sound_only">필수</strong>'; $sound_only = '<strong class="sound_only"> 필수</strong>';
$gr['gr_use_access'] = 0; $gr['gr_use_access'] = 0;
$html_title .= ' 생성'; $html_title .= ' 생성';
} else if ($w == 'u') { } else if ($w == 'u') {
@ -53,7 +55,7 @@ include_once('./admin.head.php');
<tbody> <tbody>
<tr> <tr>
<th scope="row"><label for="gr_id">그룹 ID<?php echo $sound_only ?></label></th> <th scope="row"><label for="gr_id">그룹 ID<?php echo $sound_only ?></label></th>
<td><input type="text" name="gr_id" value="<?php echo $group['gr_id'] ?>" id="gr_id" class="<?php echo $gr_id_attr ?> alnum_ frm_input" maxlength="10"> <td><input type="text" name="gr_id" value="<?php echo $group['gr_id'] ?>" id="gr_id" <?php echo $gr_id_attr; ?> class="<?php echo $gr_id_attr; ?> alnum_ frm_input" maxlength="10">
<?php <?php
if ($w=='') if ($w=='')
echo '영문자, 숫자, _ 만 가능 (공백없이)'; echo '영문자, 숫자, _ 만 가능 (공백없이)';

8
head.sub.php
View File

@ -44,9 +44,15 @@ if (G5_IS_MOBILE) {
if (defined('G5_IS_ADMIN')) { if (defined('G5_IS_ADMIN')) {
echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/admin.css">'.PHP_EOL; echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/admin.css">'.PHP_EOL;
} else { } else {
// canonical 지정
$canonical = '';
if ($bo_table && $wr_id) $canonical = 'http://'.$_SERVER["HTTP_HOST"].'/bbs/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
else $canonical = 'http://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
echo '<link rel="canonical" href="'.$canonical.'">';
$shop_css = ''; $shop_css = '';
if (defined('_SHOP_')) $shop_css = '_shop'; if (defined('_SHOP_')) $shop_css = '_shop';
echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').$shop_css.'.css">'.PHP_EOL; echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css">'.PHP_EOL;
} }
echo '<meta http-equiv="imagetoolbar" content="no">'; echo '<meta http-equiv="imagetoolbar" content="no">';
echo '<meta http-equiv="X-UA-Compatible" content="IE=Edge">'; echo '<meta http-equiv="X-UA-Compatible" content="IE=Edge">';

4
plugin/gcaptcha/gcaptcha.lib.php
View File

@ -184,9 +184,9 @@ function captcha_html($class='captcha')
$html .= '<fieldset id="captcha" class="'.$class.'">'; $html .= '<fieldset id="captcha" class="'.$class.'">';
$html .= '<legend class="sound_only">자동등록방지</legend>'; $html .= '<legend class="sound_only">자동등록방지</legend>';
if (G5_IS_MOBILE) $html .= '<audio src="'.$mp3_file_url.'?_='.$rand.'" controls></audio>'; if (G5_IS_MOBILE) $html .= '<audio src="'.$mp3_file_url.'?_='.$rand.'" controls></audio>';
$html .= '<img src="'.$jpg_file_url.'?_='.$rand.'" alt="자동등록방지 숫자">'; $html .= '<img src="'.$jpg_file_url.'?_='.$rand.'" alt="">';
if (!G5_IS_MOBILE) $html .= '<a href="'.$mp3_file_url.'?_='.$rand.'" id="captcha_mp3" target="_blank"><img src="'.G5_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>'; if (!G5_IS_MOBILE) $html .= '<a href="'.$mp3_file_url.'?_='.$rand.'" id="captcha_mp3" target="_blank"><img src="'.G5_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
$html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input" size="6" maxlength="6" required title="자동등록방지 숫자 입력">'; $html .= '<label class="sound_only">자동등록방지 숫자 </label><input type="text" name="captcha_key" id="captcha_key" required class="captcha_box frm_input required" size="6" maxlength="6">';
$html .= '<p class="sound_only">자동등록방지 숫자를 순서대로 입력하세요.</p>'; $html .= '<p class="sound_only">자동등록방지 숫자를 순서대로 입력하세요.</p>';
$html .= '</fieldset>'; $html .= '</fieldset>';
return $html; return $html;