Merge branch 'master' of github.com:gnuboard/g4s

This commit is contained in:
chicpro
2013-01-29 17:12:53 +09:00
5 changed files with 11 additions and 7 deletions

View File

@ -180,7 +180,7 @@ if ($member['mb_id'] && ($is_admin == 'super' || $group['gr_admin'] == $member['
include_once('./board_head.php');
echo "<script src=\"".$g4['url']."/js/sideview.js\"></script>";
echo '<script src="'.G4_JS_URL.'/sideview.js"></script>';
// 게시물 아이디가 있다면 게시물 보기를 INCLUDE
if (isset($wr_id) && $wr_id) {

View File

@ -101,9 +101,9 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
</tbody>
</table>
<div class="pg">
<?=get_paging($config[cf_write_pages], $page, $total_page, $_SERVER[PHP_SELF].'?'.$qstr.'&amp;page=');?>
</div>
<?=get_paging($config[cf_write_pages], $page, $total_page, $_SERVER[PHP_SELF].'?'.$qstr.'&amp;page=');?>
</div>
<script>

View File

@ -137,7 +137,7 @@ table a {color:#000;text-decoration:none}
.td_name {width:100px;text-align:left}
.td_name div {position:relative}
.td_date {width:60px;text-align:center}
.td_datetime {width:100px;text-align:center}
.td_datetime {width:110px;text-align:center}
.td_mng {width:80px;text-align:center}
/* ///// 새창 기본 스타일 ///// */

View File

@ -56,7 +56,11 @@ var g4_charset = "<?=$g4['charset']?>";
var g4_cookie_domain = "<?=$g4['cookie_domain']?>";
var g4_is_gecko = navigator.userAgent.toLowerCase().indexOf("gecko") != -1;
var g4_is_ie = navigator.userAgent.toLowerCase().indexOf("msie") != -1;
<? if ($is_admin) { echo "var g4_admin = '{$g4['admin']}';"; } ?>
<?
if ($is_admin) {
echo PHP_EOL.'var g4_admin_url = "'.G4_ADMIN_URL.'";';
}
?>
</script>
<script src="<?=G4_JS_URL?>/jquery-1.8.3.min.js"></script>
<script src="<?=G4_JS_URL?>/common.js"></script>

View File

@ -13,7 +13,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
해당 이메일로 아이디와 패스워드 정보를 보내드립니다.
</p>
<label for="mb_email">E-mail 주소<strong class="sound_only">필수</strong></label>
<input type="text" id="mb_email" name="mb_email" class="fieldset_input email" required size="30" title="E-mail 주소">
<input type="text" id="mb_email" name="mb_email" class="fs_input email" required size="30" title="E-mail 주소">
</fieldset>
<?=captcha_html(); ?>
<div class="btn_win">