g5 merge 충동 수정

This commit is contained in:
chicpro
2013-10-07 14:57:35 +09:00
6 changed files with 14 additions and 11 deletions

View File

@ -994,10 +994,10 @@ $pg_anchor = '<ul class="anchor">
<input type="text" name="bo_mobile_gallery_width" value="<?php echo $board['bo_mobile_gallery_width'] ?>" id="bo_mobile_gallery_width" required class="required numeric frm_input" size="4">
</td>
<td class="group_setting">
<input type="checkbox" name="mobile_chk_grp_gallery_width" value="1" id="mobile_chk_grp_gallery_width">
<label for="mobile_chk_grp_gallery_width">그룹적용</label>
<input type="checkbox" name="mobile_chk_all_gallery_width" value="1" id="mobile_chk_all_gallery_width">
<label for="mobile_chk_all_gallery_width">전체적용</label>
<input type="checkbox" name="chk_grp_mobile_gallery_width" value="1" id="chk_grp_mobile_gallery_width">
<label for="chk_grp_mobile_gallery_width">그룹적용</label>
<input type="checkbox" name="chk_all_mobile_gallery_width" value="1" id="chk_all_mobile_gallery_width">
<label for="chk_all_mobile_gallery_width">전체적용</label>
</td>
</tr>
<tr>
@ -1007,10 +1007,10 @@ $pg_anchor = '<ul class="anchor">
<input type="text" name="bo_mobile_gallery_height" value="<?php echo $board['bo_mobile_gallery_height'] ?>" id="bo_mobile_gallery_height" required class="required numeric frm_input" size="4">
</td>
<td class="group_setting">
<input type="checkbox" name="mobile_chk_grp_gallery_height" value="1" id="mobile_chk_grp_gallery_height">
<label for="mobile_chk_grp_gallery_height">그룹적용</label>
<input type="checkbox" name="mobile_chk_all_gallery_height" value="1" id="mobile_chk_all_gallery_height">
<label for="mobile_chk_all_gallery_height">전체적용</label>
<input type="checkbox" name="chk_grp_mobile_gallery_height" value="1" id="chk_grp_mobile_gallery_height">
<label for="chk_grp_mobile_gallery_height">그룹적용</label>
<input type="checkbox" name="chk_all_mobile_gallery_height" value="1" id="chk_all_mobile_gallery_height">
<label for="chk_all_mobile_gallery_height">전체적용</label>
</td>
</tr>
<tr>

View File

@ -130,6 +130,9 @@ $k = 0;
while ($row = sql_fetch_array($result))
{
// 공지글인 경우는 해당글을 같은 페이지에서 다시 노출하지 않는다.
if ($arr_notice && in_array($row['wr_id'], $arr_notice)) continue;
// 검색일 경우 wr_id만 얻었으므로 다시 한행을 얻는다
if ($sca || $stx)
$row = sql_fetch(" select * from {$write_table} where wr_id = '{$row['wr_parent']}' ");

View File

@ -10,7 +10,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none}
label, input, select, img {vertical-align:middle}
textarea, select {font-size:1em}
textarea, select {font-family:dotum;font-size:1em}
input {margin:0;padding:0;border-radius:0;font-family:dotum}
input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none}

View File

@ -10,7 +10,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
label, input, select, img {vertical-align:middle}
textarea,
select {font-size:1em}
select {font-family:dotum;font-size:1em}
input {margin:0;padding:0;border-radius:0;font-family:dotum}
input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none}
button {border-radius:0;font-size:1em;-webkit-appearance:none}

View File

@ -51,6 +51,7 @@ if ($is_nogood) $colspan++;
<input type="hidden" name="sfl" value="<?php echo $sfl ?>">
<input type="hidden" name="stx" value="<?php echo $stx ?>">
<input type="hidden" name="spt" value="<?php echo $spt ?>">
<input type="hidden" name="sca" value="<?php echo $sca ?>">
<input type="hidden" name="page" value="<?php echo $page ?>">
<input type="hidden" name="sw" value="">

View File

@ -79,7 +79,6 @@
#fregister section {margin:0 0 20px;padding:20px 0;border-bottom:3px solid #eee}
#fregister h2 {margin:0 0 20px;text-align:center}
#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #d9d9d9;background:#f7f7f7}
#fregister textarea:focus {background:#21272e;color:#fff}
.fregister_agree {padding:10px 0 0;text-align:right}
.fregister_agree label {display:inline-block;margin-right:5px}
#fregister p {color:#e8180c;text-align:center}