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

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-24 09:06:49 +09:00
parent 979af49812 84e0bdab8c
commit f594b2ec66
28 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skin/board/basic/list.skin.php
View File

@ -86,7 +86,7 @@ if ($is_nogood) $colspan++;
</td>
<?php if ($is_checkbox) { ?>
<td class="td_chk">
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['wr_subject'] ?></label>
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
<input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
</td>
<?php } ?>

2
skin/board/basic/style.css
View File

@ -31,7 +31,7 @@
.cnt_cmt {font-weight:bold}
#bo_sch {margin-bottom:10px;padding-top:5px;text-align:center}
#bo_sch legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
#bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}

2
skin/board/gallery/list.skin.php
View File

@ -58,7 +58,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
<li class="bo_img_list_li <?php if ($wr_id == $list[$i]['wr_id']) { ?>bo_img_now<?php } ?>" style="<?php echo $style ?>width:<?php echo $board['bo_gallery_width'] ?>px">
<?php if ($is_checkbox) { ?>
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['wr_subject'] ?></label>
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
<input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
<?php } ?>
<span class="sound_only">

2
skin/board/gallery/style.css
View File

@ -55,7 +55,7 @@
.bo_current {color:#e8180c}
#bo_sch {margin-bottom:10px;padding-top:5px;text-align:center}
#bo_sch legend {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}

2
skin/member/basic/formmail.skin.php
View File

@ -65,7 +65,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
작성하신 메일을 발송하시려면 <strong>메일발송</strong> 버튼을, 작성을 취소하고 창을 닫으시려면 <strong>창닫기</strong> 버튼을 누르세요.
</p>
<input type="submit" value="메일발송" id="btn_submit" class="btn_submit">
<button type="button" class="btn_cancel" onclick="javascript:window.close();">창닫기</button>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</form>

4
skin/member/basic/memo.skin.php
View File

@ -42,5 +42,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
</p>
<div class="btn_win"><a href="javascript:;" onclick="window.close();">창닫기</a></div>
<div class="btn_win">
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>

2
skin/member/basic/memo_form.skin.php
View File

@ -44,7 +44,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
작성하신 쪽지를 발송하시려면 <strong>보내기</strong> 버튼을, 작성을 취소하고 창을 닫으시려면 <strong>창닫기</strong> 링크를 누르세요.
</p>
<input type="submit" value="보내기" id="btn_submit" class="btn_submit">
<a href="javascript:;" onclick="window.close();">창닫기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</form>
</div>

4
skin/member/basic/memo_view.skin.php
View File

@ -47,8 +47,8 @@ else {
<?php if($next_link) { ?>
<a href="<?php echo $next_link ?>">다음쪽지</a>
<?php } ?>
<?php if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>" class="btn01">답장</a><?php } ?>
<?php if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>">답장</a><?php } ?>
<a href="./memo.php?kind=<?php echo $kind ?>">목록보기</a>
<a href="javascript:;" onclick="window.close();">창닫기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>

2
skin/member/basic/password_lost.skin.php
View File

@ -19,7 +19,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<?php echo captcha_html(); ?>
<div class="btn_win">
<input type="submit" value="확인" class="btn_submit">
<a href="javascript:window.close();" class="btn_cancel">창닫기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</form>
</div>

2
skin/member/basic/profile.skin.php
View File

@ -40,6 +40,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</section>
<div class="btn_win">
<a href="javascript:window.close();">창닫기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>

4
skin/member/basic/scrap.skin.php
View File

@ -35,5 +35,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<?php echo get_paging($config['cf_write_pages'], $page, $total_page, "?$qstr&amp;page="); ?>
<div class="btn_win"><a href="javascript:;" onclick="window.close();">창닫기</a></div>
<div class="btn_win">
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>

2
skin/member/basic/style.css
View File

@ -38,7 +38,7 @@
#mb_login h1 {margin:0 0 20px;font-size:1.3em}
#mb_login h2 {margin:0}
#mb_login_fs {position:relative;margin:0;padding:20px 20px 20px 95px;border:1px solid #cfded8;border-bottom:0;background:#fff}
#mb_login_fs legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
#mb_login_fs legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#mb_login_fs label {letter-spacing:-0.1em}
#mb_login_fs .login_id {position:absolute;top:26px;left:95px}
#mb_login_fs .login_pw {position:absolute;top:52px;left:95px}

2
skin/member/basic/zip.skin.php
View File

@ -45,7 +45,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<p>검색결과가 끝났습니다.</p>
<div class="btn_win">
<a href="javascript:window.close();">창닫기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
<script>

2
skin/new/basic/style.css
View File

@ -1,4 +1,4 @@
/* 최근게시물 스킨 (new) */
#new_sch {margin-bottom:10px;text-align:right}
#new_sch legend {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#new_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#new_sch .btn_submit {height:22px}

2
skin/poll/basic/poll_result.skin.php
View File

@ -98,7 +98,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</aside>
<div class="btn_win">
<a href="javascript:;" onclick="window.close();">창닫기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>

2
skin/poll/basic/style.css
View File

@ -43,7 +43,7 @@
#poll_result_cmt footer {text-align:right}
#poll_result_wcmt {margin-bottom:10px;width:93%}
.poll_cmt_del a {display:inline-block;padding-bottom:10px}
#poll_result_oth {margin:0 auto 20px}
#poll_result_oth {margin:0 auto 20px;width:93%}
#poll_result_oth h2 {padding:0 0 10px}
#poll_result_oth ul {margin:0;padding:0;list-style:none}
#poll_result_oth a {display:block;padding:10px 0;border-bottom:1px solid #eee}

2
skin/search/basic/style.css
View File

@ -1,6 +1,6 @@
/* 전체검색결과 스킨 */
#sch_res_detail {padding:0 0 10px;border-bottom:1px solid #e9e9e9;text-align:center}
#sch_res_detail legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
#sch_res_detail legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#sch_res_ov {margin:0 0 10px;padding:10px;border-bottom:1px solid #e9e9e9;background:#f5f6fa;zoom:1}
#sch_res_ov:after {display:block;visibility:hidden;clear:both;content:""}
#sch_res_ov h2 {float:left}