g5 merge 충돌수정

This commit is contained in:
chicpro
2013-12-05 17:26:34 +09:00
4 changed files with 15 additions and 13 deletions

View File

@ -35,14 +35,14 @@ if ($config['cf_include_head']) {
<a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a>
</div>
<fieldset id="sch_all">
<fieldset id="sch">
<legend>사이트 내 전체검색</legend>
<form name="fsearchbox" method="get" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);">
<input type="hidden" name="sfl" value="wr_subject||wr_content">
<input type="hidden" name="sop" value="and">
<label for="sch_all_stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" id="sch_all_stx" maxlength="20">
<input type="submit" id="sch_all_submit" value="검색">
<label for="sch_stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" id="sch_stx" maxlength="20">
<input type="submit" id="sch_submit" value="검색">
</form>
<script>