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

This commit is contained in:
chicpro
2013-03-12 10:27:23 +09:00
4 changed files with 9 additions and 7 deletions

View File

@ -7,6 +7,7 @@ function editor_html($id, $content, $ckeditor=true, $class="")
static $js = true;
$html = "";
$html .= "<span class=\"sound_only\">웹에디터 시작</span>";
if ($js) {
$html .= "\n".'<script src="'.G4_CKEDITOR_URL.'/ckeditor.js"></script>';
$html .= "\n".'<script>var g4_ckeditor_url = "'.G4_CKEDITOR_URL.'";</script>';
@ -16,6 +17,7 @@ function editor_html($id, $content, $ckeditor=true, $class="")
$ckeditor_class = $ckeditor ? "ckeditor" : "";
$html .= "\n<textarea id=\"$id\" name=\"$id\" class=\"$ckeditor_class $class\" style=\"width:100%;\">$content</textarea>";
$html .= "\n<span class=\"sound_only\">웹 에디터 끝</span>";
return $html;
}

View File

@ -33,7 +33,7 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산
if (!$page) $page = 1; // 페이지가 없으면 첫 페이지 (1 페이지)
$from_record = ($page - 1) * $rows; // 시작 열을 구함
$group_select = '<select name="gr_id" id="gr_id" title="검색대상" onchange="select_change();"><option value="">전체그룹';
$group_select = '<select name="gr_id" id="gr_id" title="검색대상"><option value="">전체그룹';
$sql = " select gr_id, gr_subject from {$g4['group_table']} order by gr_id ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {

View File

@ -74,13 +74,13 @@ a:active {color:#000;text-decoration:underline}
.gnb_2depth {float:left}
.gnb_2depth a {font-weight:normal}
/* gnb js on */
.gnb_js {padding-left:1px}
.gnb_js {}
.gnb_js #gnb_ul {zoom:1}
.gnb_js #gnb_ul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_js .gnb_1depth {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #e0e5e9;border-top:0;border-bottom:0}
.gnb_js .gnb_1depth {clear:none;position:relative;float:left}
.gnb_js .gnb_1depth a {text-align:center}
.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000}
.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000}
.gnb_js .gnb_1depth_on a {float:none;border-color:#e0e5e9;background:#fff;color:#000}
.gnb_js .gnb_sub_ul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden}
.gnb_js .gnb_2depth a {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left}
.gnb_1depth_over .gnb_sub_ul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}

View File

@ -7,13 +7,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<legend>상세검색</legend>
<form name="fnew" method="get">
<?=$group_select?>
<select name="view" id="view" title="검색종류" onchange="select_change()">
<select name="view" id="view" title="검색종류">
<option value="">전체게시물
<option value="w">원글만
<option value="c">코멘트만
</select>
<input type="text" name="mb_id" value="<?=$mb_id?>" id="mb_id" title="검색어(필수)" class="fs_input">
<input type="submit" value="검색" class="fs_submit">
<input type="text" name="mb_id" value="<?=$mb_id?>" id="mb_id" title="검색어(필수)" required class="frm_input requird">
<input type="submit" value="검색" class="btn_submit">
</form>
<script>
/* 셀렉트 박스에서 자동 이동 해제