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

Conflicts:
	shop/search.php
This commit is contained in:
gnuboard
2013-11-08 18:08:24 +09:00
27 changed files with 187 additions and 371 deletions

View File

@ -74,28 +74,51 @@ $total_count = $row['cnt'];
<!-- 검색결과 시작 { -->
<div id="ssch">
<<<<<<< HEAD
=======
>>>>>>> f13964c6ecb1d12f0b922f1ef98f6813242c39ca
<div id="ssch_frm">
<form name="frmdetailsearch" onsubmit="return detail_search_submit(this);">
상세검색 :
<input type="checkbox" name="qname" <?php echo isset($qname)?'checked="checked"':'';?>> 상품명
<input type="checkbox" name="qexplan" <?php echo isset($qexplan)?'checked="checked"':'';?>> 상품
<input type="checkbox" name="qid" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드<br>
상품가격 :
<input type="text" name="qfrom" value="<?php echo $qfrom; ?>" size="10">원 부터
<input type="text" name="qto" value="<?php echo $qto; ?>" size="10">원 까지<br>
검색어 : <input type="text" name="q" value="<?php echo $q; ?>" size="40" maxlength="30">
<input type="submit" value="검색">
<div>
<strong>검색범위</strong>
<input type="checkbox" name="qname" class="frm_input" <?php echo isset($qname)?'checked="checked"':'';?>> 상품명
<input type="checkbox" name="qexplan" class="frm_input" <?php echo isset($qexplan)?'checked="checked"':'';?>> 상품설명
<input type="checkbox" name="qid" class="frm_input" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드<br>
</div>
<div>
<strong>상품가격</strong>
<input type="text" name="qfrom" value="<?php echo $qfrom; ?>" class="frm_input" size="10">원 부터
<input type="text" name="qto" value="<?php echo $qto; ?>" class="frm_input" size="10">원 까지<br>
</div>
<div>
<strong>검색어</strong>
<input type="text" name="q" value="<?php echo $q; ?>" class="frm_input" size="40" maxlength="30">
<input type="submit" value="검색" class="btn_submit">
</div>
<p>상세검색을 선택하지 않거나, 상품가격을 입력하지 않으면 전체에서 검색합니다.</p>
</form>
</div>
<<<<<<< HEAD
<!-- <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div> -->
<a href="#">판매량 많은순</a>
<a href="#">선호도 높은순</a>
<a href="#">사용후기 많은순</a>
<a href="#">최근 등록순</a>
검색 결과 <strong><?php echo $total_count; ?></strong>건
=======
<ul id="ssch_sort">
<li><a href="#" class="btn01">판매량 많은순</a></li>
<li><a href="#" class="btn01">선호도 높은순</a></li>
<li><a href="#" class="btn01">사용후기 많은순</a></li>
<li><a href="#" class="btn01">최근 등록순</a></li>
</ul>
<div id="ssch_ov">
검색 결과 <b><?php echo $total_count; ?></b>건
</div>
</div>
>>>>>>> f13964c6ecb1d12f0b922f1ef98f6813242c39ca
<div>
<?php