firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
chicpro
2013-11-08 16:43:55 +09:00
parent 449730f00f f4fbce8b6e
commit 8437da722e
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/default_shop.css
View File

@ -573,7 +573,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7
#sps li:after {display:block;visibility:hidden;clear:both;content:""} #sps li:after {display:block;visibility:hidden;clear:both;content:""}
.sps_img {float:left;margin:0 10px 0 0;width:80px} .sps_img {float:left;margin:0 10px 0 0;width:80px}
.sps_img span {position:absolute;font-size:0;line-height:0} .sps_img span {position:absolute;font-size:0;line-height:0;overflow:hidden}
#sps dl {margin:5px 0 10px;zoom:1} #sps dl {margin:5px 0 10px;zoom:1}
#sps dl:after {display:block;visibility:hidden;clear:both;content:""} #sps dl:after {display:block;visibility:hidden;clear:both;content:""}

30
css/mobile_shop.css
View File

@ -274,24 +274,24 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
/* 사용후기 모음 */ /* 사용후기 모음 */
#sps_sch {margin:0 0 10px} #sps_sch {margin:0 0 10px}
#sps_sch a {display:inline-block;padding:0 8px;height:1.8em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.8em} #sps_sch a {display:inline-block;padding:0 8px;height:23px;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:23px}
#sps_sch .btn_submit {height:1.8em;vertical-align:middle;line-height:1.8em} #sps_sch .btn_submit {height:23px;vertical-align:middle}
#sps {zoom:1} #sps {zoom:1}
#sps ol {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} #sps ol {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none}
#sps li {position:relative;padding:10px;border-bottom:1px solid #e9e9e9} #sps li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
#sps li:after {display:block;visibility:hidden;clear:both;content:""} #sps li:after {display:block;visibility:hidden;clear:both;content:""}
.sps_img {float:left;width:15%} .sps_img {float:left;width:25%}
.sps_img span {position:absolute;font-size:0;line-height:0} .sps_img span {position:absolute;font-size:0;line-height:0;overflow:hidden}
#sps dl {margin:5px 0 10px;zoom:1} #sps dl {margin:5px 0 10px;zoom:1}
#sps dl:after {display:block;visibility:hidden;clear:both;content:""} #sps dl:after {display:block;visibility:hidden;clear:both;content:""}
#sps dt {float:left} #sps dt {float:left;margin:0 0 5px}
#sps dd {float:left;margin:0 15px 0 5px} #sps dd {float:left;margin:0 15px 5px 5px}
#sps dd img {position:relative;top:-2px} #sps dd img {position:relative;top:-2px}
.sps_section {float:right;width:80%} .sps_section {float:right;width:75%}
.sps_section p {padding:0;width:100%;height:1.8em;overflow:hidden} .sps_section p {padding:0;width:100%;height:1.8em;overflow:hidden}
.sps_con_full {padding:0;height:auto !important} .sps_con_full {padding:0;height:auto !important}
.sps_con_btn {margin:5px 0 0;text-align:right} .sps_con_btn {margin:5px 0 0;text-align:right}
@ -299,24 +299,24 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
/* 상품문의 모음 */ /* 상품문의 모음 */
#sqa_sch {margin:0 0 10px} #sqa_sch {margin:0 0 10px}
#sqa_sch a {display:inline-block;padding:0 8px;height:1.8em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.8em} #sqa_sch a {display:inline-block;padding:0 8px;height:2em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.9em}
#sqa_sch .btn_submit {height:1.8em;vertical-align:middle;line-height:1.8em} #sqa_sch .btn_submit {height:2em;vertical-align:middle}
#sqa {zoom:1} #sqa {zoom:1}
#sqa ol {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} #sqa ol {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none}
#sqa li {position:relative;padding:10px;border-bottom:1px solid #e9e9e9} #sqa li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
#sqa li:after {display:block;visibility:hidden;clear:both;content:""} #sqa li:after {display:block;visibility:hidden;clear:both;content:""}
.sqa_img {float:left;width:15%} .sqa_img {float:left;width:25%}
.sqa_img span {position:absolute;font-size:0;line-height:0} .sqa_img span {position:absolute;font-size:0;line-height:0}
#sqa dl {margin:5px 0 10px;zoom:1} #sqa dl {margin:5px 0 10px;zoom:1}
#sqa dl:after {display:block;visibility:hidden;clear:both;content:""} #sqa dl:after {display:block;visibility:hidden;clear:both;content:""}
#sqa dt {float:left} #sqa dt {float:left;margin:0 0 5px}
#sqa dd {float:left;margin:0 15px 0 5px} #sqa dd {float:left;margin:0 15px 5px 5px}
#sqa dd img {position:relative;top:-2px} #sqa dd img {position:relative;top:-2px}
.sqa_section {float:right;width:80%} .sqa_section {float:right;width:75%}
.sqa_section .sqa_con {padding:10px;background:#f2f5f9;line-height:1.7em} .sqa_section .sqa_con {padding:10px;background:#f2f5f9;line-height:1.7em}
.sqa_section p {padding:0;width:100%;height:1.8em;overflow:hidden} .sqa_section p {padding:0;width:100%;height:1.8em;overflow:hidden}
.sqa_con_full {padding:0;height:auto !important} .sqa_con_full {padding:0;height:auto !important}

3
mobile/skin/shop/basic/itemuselist.skin.php
View File

@ -19,9 +19,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<option value="a.is_name" <?php echo get_selected($sfl, "a.is_name"); ?>>작성자명</option> <option value="a.is_name" <?php echo get_selected($sfl, "a.is_name"); ?>>작성자명</option>
<option value="a.mb_id" <?php echo get_selected($sfl, "a.mb_id"); ?>>작성자아이디</option> <option value="a.mb_id" <?php echo get_selected($sfl, "a.mb_id"); ?>>작성자아이디</option>
</select> </select>
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label> <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $stx; ?>" id="stx" required class="required frm_input"> <input type="text" name="stx" value="<?php echo $stx; ?>" id="stx" required class="required frm_input" size="10">
<input type="submit" value="검색" class="btn_submit"> <input type="submit" value="검색" class="btn_submit">
</div> </div>
</form> </form>

9
shop/search.php
View File

@ -75,6 +75,14 @@ $total_count = $row['cnt'];
<!-- 검색결과 시작 { --> <!-- 검색결과 시작 { -->
<div id="ssch"> <div id="ssch">
<<<<<<< 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>건
=======
<div id="ssch_frm"> <div id="ssch_frm">
<form name="frmdetailsearch" onsubmit="return detail_search_submit(this);"> <form name="frmdetailsearch" onsubmit="return detail_search_submit(this);">
상세검색 : 상세검색 :
@ -91,6 +99,7 @@ $total_count = $row['cnt'];
</div> </div>
<div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div> <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div>
>>>>>>> 23fe590917161cae409fb47b3b92131921dd5c97
<div> <div>
<?php <?php