From 999371c47ffeee23cc1ba3f3e2857bc9f03e5861 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 28 Jun 2013 15:12:08 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=EB=B3=84=20=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.php | 3 + index.php | 4 +- skin/board/basic/list.skin.php | 10 +- skin/board/basic/view.skin.php | 20 +- skin/board/basic/view_comment.skin.php | 441 +++++++++---------- skin/board/basic/write.skin.php | 2 + skin/board/gallery/list.skin.php | 6 +- skin/board/gallery/view.skin.php | 24 +- skin/board/gallery/view_comment.skin.php | 445 ++++++++++---------- skin/board/gallery/write.skin.php | 45 +- skin/connect/basic/current_connect.skin.php | 2 + skin/latest/basic/latest.skin.php | 4 +- skin/member/basic/formmail.skin.php | 4 +- skin/member/basic/login.skin.php | 4 +- skin/member/basic/member_confirm.skin.php | 4 +- skin/member/basic/memo.skin.php | 4 +- skin/member/basic/memo_form.skin.php | 6 +- skin/member/basic/memo_view.skin.php | 6 +- skin/member/basic/password.skin.php | 2 + skin/member/basic/password_lost.skin.php | 4 +- skin/member/basic/profile.skin.php | 4 +- skin/member/basic/register.skin.php | 2 + skin/member/basic/register_form.skin.php | 2 + skin/member/basic/register_result.skin.php | 2 + skin/member/basic/scrap.skin.php | 4 +- skin/member/basic/scrap_popin.skin.php | 4 +- skin/member/basic/zip.skin.php | 9 +- skin/new/basic/new.skin.php | 7 +- skin/outlogin/basic/outlogin.skin.1.php | 4 +- skin/outlogin/basic/outlogin.skin.2.php | 4 +- skin/poll/basic/poll.skin.php | 4 +- skin/poll/basic/poll_result.skin.php | 10 +- skin/popular/basic/popular.skin.php | 4 +- skin/search/basic/search.skin.php | 4 +- skin/visit/basic/visit.skin.php | 2 + tail.php | 5 + 36 files changed, 592 insertions(+), 519 deletions(-) diff --git a/head.php b/head.php index 59d102b97..878d5039a 100644 --- a/head.php +++ b/head.php @@ -23,6 +23,7 @@ if ($config['cf_include_head']) { } ?> +

@@ -154,9 +155,11 @@ if ($config['cf_include_head']) {
+
+
diff --git a/index.php b/index.php index 546d4ba7e..27f3da6c1 100644 --- a/index.php +++ b/index.php @@ -18,7 +18,7 @@ if ($config['cf_include_index']) { include_once('./_head.php'); ?> - + 'mobile' order by b.gr_order, a.bo_order "; @@ -37,7 +37,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { - +

목록

- +
+
+ +
Total 건 @@ -41,6 +44,7 @@ if ($is_nogood) $colspan++;
+
@@ -156,6 +160,7 @@ if ($is_nogood) $colspan++; +
게시물 검색 @@ -178,6 +183,7 @@ if ($is_nogood) $colspan++;
+ - + diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index ff5a50928..aedf0870b 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -5,6 +5,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); +
@@ -36,6 +37,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); ?> +

첨부파일

    @@ -59,11 +61,13 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); ?>
+ + + +
+

본문

@@ -137,11 +144,14 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } ?> +
+

+
스크랩 @@ -165,6 +175,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } } ?> +
+
-
+
+ - - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index bb68bbb84..7d941cc9c 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -8,7 +8,7 @@ var char_min = parseInt(); // 최소 var char_max = parseInt(); // 최대 - +

댓글목록

); // 최대 -

등록된 댓글이 없습니다.

+

등록된 댓글이 없습니다.

+ - + + + + \ No newline at end of file diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 62b913c16..cec6ba51b 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -6,6 +6,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

+
@@ -210,3 +211,4 @@ function fwrite_submit(f) return true; } + \ No newline at end of file diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php index 19119d3f7..56d3e5626 100644 --- a/skin/board/gallery/list.skin.php +++ b/skin/board/gallery/list.skin.php @@ -7,7 +7,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');

목록

- +
@@ -150,6 +150,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); +
게시물 검색 @@ -172,6 +173,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
+ - + diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index bfc24059f..aedf0870b 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -5,6 +5,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); +
@@ -36,6 +37,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); ?> +

첨부파일

    @@ -59,11 +61,13 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); ?>
+ + + +
+

본문

@@ -137,11 +144,14 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } ?> +
+

+
스크랩 @@ -165,10 +175,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } } ?> +
- +
-
+
+ - - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php index f0f0769ac..7d941cc9c 100644 --- a/skin/board/gallery/view_comment.skin.php +++ b/skin/board/gallery/view_comment.skin.php @@ -8,7 +8,7 @@ var char_min = parseInt(); // 최소 var char_max = parseInt(); // 최대 - +

댓글목록

); // 최대 -

등록된 댓글이 없습니다.

+

등록된 댓글이 없습니다.

+ - + + + + \ No newline at end of file diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php index ca4e94033..cec6ba51b 100644 --- a/skin/board/gallery/write.skin.php +++ b/skin/board/gallery/write.skin.php @@ -6,6 +6,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

+
@@ -55,7 +56,7 @@ echo $option_hidden; - + @@ -91,7 +92,7 @@ echo $option_hidden; - @@ -101,7 +102,7 @@ echo $option_hidden; - + @@ -125,7 +126,7 @@ echo $option_hidden; - + @@ -145,7 +146,7 @@ echo $option_hidden;

- 작성하신 내용을 제출하시려면 글쓰기 버튼을, 작성을 취소하고 목록으로 돌아가시려면 취소 링크를 누르세요. + 작성하신 내용을 제출하시려면 글쓰기 버튼을, 작성을 취소하고 목록으로 돌아가시려면 취소 링크를 누르세요.

취소 @@ -153,34 +154,6 @@ echo $option_hidden; + \ No newline at end of file diff --git a/skin/connect/basic/current_connect.skin.php b/skin/connect/basic/current_connect.skin.php index aafbb14ca..4913abe9d 100644 --- a/skin/connect/basic/current_connect.skin.php +++ b/skin/connect/basic/current_connect.skin.php @@ -4,6 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 + @@ -33,3 +34,4 @@ if ($i == 0) ?>
+ \ No newline at end of file diff --git a/skin/latest/basic/latest.skin.php b/skin/latest/basic/latest.skin.php index df33929b4..50a6417fd 100644 --- a/skin/latest/basic/latest.skin.php +++ b/skin/latest/basic/latest.skin.php @@ -4,8 +4,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 +
- +
  • @@ -39,3 +40,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
더보기
+ \ No newline at end of file diff --git a/skin/member/basic/formmail.skin.php b/skin/member/basic/formmail.skin.php index 864c2cb79..78275b6cf 100644 --- a/skin/member/basic/formmail.skin.php +++ b/skin/member/basic/formmail.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -93,4 +94,5 @@ function fformmail_submit(f) return true; } - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/member/basic/login.skin.php b/skin/member/basic/login.skin.php index 5be38aaf0..46519e91b 100644 --- a/skin/member/basic/login.skin.php +++ b/skin/member/basic/login.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -54,4 +55,5 @@ function flogin_submit(f) { return true; } - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/member/basic/member_confirm.skin.php b/skin/member/basic/member_confirm.skin.php index 7d347fc9b..be7b87908 100644 --- a/skin/member/basic/member_confirm.skin.php +++ b/skin/member/basic/member_confirm.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -44,4 +45,5 @@ function fmemberconfirm_submit(f) return true; } - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/member/basic/memo.skin.php b/skin/member/basic/memo.skin.php index 76a0ad28c..16aaa59a9 100644 --- a/skin/member/basic/memo.skin.php +++ b/skin/member/basic/memo.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -45,4 +46,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/skin/member/basic/memo_form.skin.php b/skin/member/basic/memo_form.skin.php index d12354bd8..2337e316b 100644 --- a/skin/member/basic/memo_form.skin.php +++ b/skin/member/basic/memo_form.skin.php @@ -2,10 +2,11 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
-

쪽지보내기

+

쪽지 보내기

  • 받은쪽지
    • @@ -56,4 +57,5 @@ function fmemoform_submit(f) return true; } - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/member/basic/memo_view.skin.php b/skin/member/basic/memo_view.skin.php index 717921c54..7f7c903e3 100644 --- a/skin/member/basic/memo_view.skin.php +++ b/skin/member/basic/memo_view.skin.php @@ -11,16 +11,19 @@ else { } ?> +

    + +
    -
\ No newline at end of file +
+ \ No newline at end of file diff --git a/skin/member/basic/password.skin.php b/skin/member/basic/password.skin.php index d9b04b85f..86777bea9 100644 --- a/skin/member/basic/password.skin.php +++ b/skin/member/basic/password.skin.php @@ -7,6 +7,7 @@ else if ($w == 'd' || $w == 'x') $g4['title'] = $delete_str."글 삭제"; else $g4['title'] = $g4['title']; ?> +
@@ -45,3 +46,4 @@ else $g4['title'] = $g4['title'];
+ \ No newline at end of file diff --git a/skin/member/basic/password_lost.skin.php b/skin/member/basic/password_lost.skin.php index 67564ec81..323d59fda 100644 --- a/skin/member/basic/password_lost.skin.php +++ b/skin/member/basic/password_lost.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -41,4 +42,5 @@ $(function() { var left = sw / 2 - cw / 2; moveTo(left, top); }); - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/member/basic/profile.skin.php b/skin/member/basic/profile.skin.php index a2a45fdbe..efdf20024 100644 --- a/skin/member/basic/profile.skin.php +++ b/skin/member/basic/profile.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -42,4 +43,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/skin/member/basic/register.skin.php b/skin/member/basic/register.skin.php index 8a06f9135..e0071551b 100644 --- a/skin/member/basic/register.skin.php +++ b/skin/member/basic/register.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -49,3 +50,4 @@ function fregister_submit(f) return true; } + \ No newline at end of file diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index b5e165fa8..cb5deadd5 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> + @@ -391,3 +392,4 @@ function fregisterform_submit(f) return true; } + \ No newline at end of file diff --git a/skin/member/basic/register_result.skin.php b/skin/member/basic/register_result.skin.php index f3b9a419d..6692611ff 100644 --- a/skin/member/basic/register_result.skin.php +++ b/skin/member/basic/register_result.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -43,3 +44,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+ \ No newline at end of file diff --git a/skin/member/basic/scrap.skin.php b/skin/member/basic/scrap.skin.php index d51b850d9..27084d032 100644 --- a/skin/member/basic/scrap.skin.php +++ b/skin/member/basic/scrap.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -38,4 +39,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/skin/member/basic/scrap_popin.skin.php b/skin/member/basic/scrap_popin.skin.php index e575870c9..835dfc778 100644 --- a/skin/member/basic/scrap_popin.skin.php +++ b/skin/member/basic/scrap_popin.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -33,4 +34,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/skin/member/basic/zip.skin.php b/skin/member/basic/zip.skin.php index f45b36ec5..d0e11d887 100644 --- a/skin/member/basic/zip.skin.php +++ b/skin/member/basic/zip.skin.php @@ -2,6 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -14,13 +15,15 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 +
+ - + 0) { ?>
@@ -38,6 +41,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

검색결과가 끝났습니다.

+
@@ -59,4 +63,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 } -
\ No newline at end of file +
+ \ No newline at end of file diff --git a/skin/new/basic/new.skin.php b/skin/new/basic/new.skin.php index 2f0d4e1c8..2cc72cc0b 100644 --- a/skin/new/basic/new.skin.php +++ b/skin/new/basic/new.skin.php @@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - +
상세검색
@@ -30,9 +30,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 document.getElementById("view").value = "";
- + - + @@ -65,5 +65,6 @@ for ($i=0; $i
+ diff --git a/skin/outlogin/basic/outlogin.skin.1.php b/skin/outlogin/basic/outlogin.skin.1.php index 22d5bd510..6c04f53ce 100644 --- a/skin/outlogin/basic/outlogin.skin.1.php +++ b/skin/outlogin/basic/outlogin.skin.1.php @@ -2,11 +2,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> +

회원로그인

-
@@ -65,4 +65,4 @@ function fhead_submit(f) return true; } - + diff --git a/skin/outlogin/basic/outlogin.skin.2.php b/skin/outlogin/basic/outlogin.skin.2.php index 5d987d0ff..2150993ce 100644 --- a/skin/outlogin/basic/outlogin.skin.2.php +++ b/skin/outlogin/basic/outlogin.skin.2.php @@ -2,9 +2,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> + -

나의 회원정보

@@ -42,4 +42,4 @@ function member_leave() location.href = "/member_confirm.php?url=member_leave.php"; } - + diff --git a/skin/poll/basic/poll.skin.php b/skin/poll/basic/poll.skin.php index 5c7b051a7..4340463b9 100644 --- a/skin/poll/basic/poll.skin.php +++ b/skin/poll/basic/poll.skin.php @@ -2,6 +2,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> + @@ -61,4 +62,5 @@ function poll_result(url) win_poll(url); } - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/poll/basic/poll_result.skin.php b/skin/poll/basic/poll_result.skin.php index abea3b0ae..2b3182246 100644 --- a/skin/poll/basic/poll_result.skin.php +++ b/skin/poll/basic/poll_result.skin.php @@ -2,11 +2,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> +

+

결과

@@ -30,7 +32,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+ +

이 설문에 대한 기타의견

@@ -87,7 +91,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+ + +
@@ -116,4 +123,5 @@ function fpollresult_submit(f) return true; } - \ No newline at end of file + + \ No newline at end of file diff --git a/skin/popular/basic/popular.skin.php b/skin/popular/basic/popular.skin.php index e4240823a..cd15db9e4 100644 --- a/skin/popular/basic/popular.skin.php +++ b/skin/popular/basic/popular.skin.php @@ -2,6 +2,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> +
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/skin/search/basic/search.skin.php b/skin/search/basic/search.skin.php index 2cafe220a..d11cbf042 100644 --- a/skin/search/basic/search.skin.php +++ b/skin/search/basic/search.skin.php @@ -2,6 +2,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> + @@ -131,4 +132,5 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 -
\ No newline at end of file +
+ \ No newline at end of file diff --git a/skin/visit/basic/visit.skin.php b/skin/visit/basic/visit.skin.php index e9cfb4dbb..2aa9f756c 100644 --- a/skin/visit/basic/visit.skin.php +++ b/skin/visit/basic/visit.skin.php @@ -4,6 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 global $is_admin; ?> +
@@ -22,3 +23,4 @@ global $is_admin; 상세보기
+ \ No newline at end of file diff --git a/tail.php b/tail.php index 9343649fb..e33306e94 100644 --- a/tail.php +++ b/tail.php @@ -17,8 +17,11 @@ if ($config['cf_include_tail']) { + +
+
@@ -35,6 +38,8 @@ if ($config['cf_include_tail']) { " id="device_change">모바일 버전으로 보기 + + \ No newline at end of file From 9a555f038f68661fd9054378a84627dac970f874 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 28 Jun 2013 15:21:40 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EC=9D=BD=EA=B8=B0=20=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/style.css | 4 ++-- skin/board/gallery/style.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index 22cf7fb3f..6f064dc09 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -55,7 +55,7 @@ #bo_v_file a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word} #bo_v_file a:focus, #bo_v_file a:hover, #bo_v_file a:active {text-decoration:none} #bo_v_file img {float:left;margin:0 10px 0 0} -.bo_v_file_cnt {display:inline-block;margin:0 0 3px 22px} +.bo_v_file_cnt {display:inline-block;margin:0 0 3px 16px} #bo_v_link {} #bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden} @@ -63,7 +63,7 @@ #bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa} #bo_v_link a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word} #bo_v_link a:focus, #bo_v_link a:hover, #bo_v_link a:active {text-decoration:none} -.bo_v_link_cnt {display:inline-block;margin:0 0 3px 22px} +.bo_v_link_cnt {display:inline-block;margin:0 0 3px 16px} #bo_v_top {margin:0 0 10px;padding:10px 0;zoom:1} #bo_v_top:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index c59f9ea0f..fd0f04abb 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -79,7 +79,7 @@ #bo_v_file a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word} #bo_v_file a:focus, #bo_v_file a:hover, #bo_v_file a:active {text-decoration:none} #bo_v_file img {float:left;margin:0 10px 0 0} -.bo_v_file_cnt {display:inline-block;margin:0 0 3px 22px} +.bo_v_file_cnt {display:inline-block;margin:0 0 3px 16px} #bo_v_link {} #bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden} @@ -87,7 +87,7 @@ #bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa} #bo_v_link a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word} #bo_v_link a:focus, #bo_v_link a:hover, #bo_v_link a:active {text-decoration:none} -.bo_v_link_cnt {display:inline-block;margin:0 0 3px 22px} +.bo_v_link_cnt {display:inline-block;margin:0 0 3px 16px} #bo_v_top {margin:0 0 10px;padding:10px 0;zoom:1} #bo_v_top:after {display:block;visibility:hidden;clear:both;content:""} From aab807d4f673bcb1324443b16ad1cfdaddf5925e Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Jun 2013 17:00:28 +0900 Subject: [PATCH 3/8] =?UTF-8?q?#460=20=EA=B8=80=EC=9E=90=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=A1=B0=EC=A0=88=20=EA=B8=B0=EB=8A=A5=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=EC=95=88=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.head.php | 6 ++-- adm/admin.tail.php | 23 +++++------- head.php | 6 ++-- js/common.js | 90 +++++++++------------------------------------- js/jquery.menu.js | 23 +++++------- 5 files changed, 39 insertions(+), 109 deletions(-) diff --git a/adm/admin.head.php b/adm/admin.head.php index c1da43fc9..2db21b366 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -134,8 +134,8 @@ function imageview(id, w, h)
- - - + + +

diff --git a/adm/admin.tail.php b/adm/admin.tail.php index b3827e495..f0f644e74 100644 --- a/adm/admin.tail.php +++ b/adm/admin.tail.php @@ -94,24 +94,17 @@ $(function(){ } }); - function submenu_hide() { - $(".gnb_1dli").removeClass("gnb_1dli_over gnb_1dli_over2 gnb_1dli_on"); - } - - // 텍스트 리사이즈 카운트 쿠키있으면 실행 - var resize_act; - var text_resize_count = parseInt(get_cookie("ck_font_resize_count")); - if(!isNaN(text_resize_count)) { - if(text_resize_count > 0) - resize_act = "increase"; - else if(text_resize_count < 0) - resize_act = "decrease"; - - if(Math.abs(text_resize_count) > 0) - font_resize2("container", resize_act, Math.abs(text_resize_count)); + // 폰트 리사이즈 쿠키있으면 실행 + var font_resize_act = get_cookie("ck_font_resize_act"); + if(font_resize_act != "") { + font_resize("container", font_resize_act); } }); +function submenu_hide() { + $(".gnb_1dli").removeClass("gnb_1dli_over gnb_1dli_over2 gnb_1dli_on"); +} + function menu_rearrange(el) { var width = $("#gnb_1dul").width(); diff --git a/head.php b/head.php index 59d102b97..ea81ad01c 100644 --- a/head.php +++ b/head.php @@ -165,7 +165,7 @@ if ($config['cf_include_head']) {
- - - + + +
\ No newline at end of file diff --git a/js/common.js b/js/common.js index dadbf203c..2edf6cae2 100644 --- a/js/common.js +++ b/js/common.js @@ -293,12 +293,6 @@ function doc_write(cont) document.write(cont); } -// php chr() 대응 -function chr(code) -{ - return String.fromCharCode(code); -} - var win_password_lost = function(href) { window.open(href, "win_password_lost", "left=50, top=50, width=617, height=330, scrollbars=1"); } @@ -404,19 +398,11 @@ function font_resize(id, act) { var $elements = $("#"+id+" *").not("select").not("option"); $elements.removeClass("applied"); - var count = parseInt(get_cookie("ck_font_resize_count")); - if(isNaN(count)) - count = 0; - // 엘리먼트의 기본 폰트사이즈 저장 if(!default_font_size_saved) { save_default_font_size($elements); } - // 크롬의 최소 폰트사이즈 버그로 작게는 한단계만 가능 - if(act == "decrease" && count == -1) - return; - $elements.each(function() { if($(this).hasClass("no_text_resize")) return true; @@ -426,54 +412,7 @@ function font_resize(id, act) } }); - // 텍스트 리사이즈 회수 쿠키에 기록 - if(act == "increase") - count++; - else - count--; - - set_cookie("ck_font_resize_count", count, 1, g4_cookie_domain); -} - - -/** - * 텍스트 기본사이즈 -**/ -function font_default(id) -{ - var act; - var count = parseInt(get_cookie("ck_font_resize_count")); - if(isNaN(count)) - count = 0; - - if(count > 0) { - act = "decrease"; - } else { - act = "increase"; - // 작게 후 기본 크기가 되지 않는 문제해결을 위해 추가 - set_cookie("ck_font_resize_count", 0, 1, g4_cookie_domain); - } - - for(i=0; i mx) { + $("textarea#wr_content[maxlength]").live("keyup change", function() { + var str = $(this).val() + var mx = parseInt($(this).attr("maxlength")) + if (str.length > mx) { $(this).val(str.substr(0, mx)); - return false; - } + return false; + } }); }); \ No newline at end of file diff --git a/js/jquery.menu.js b/js/jquery.menu.js index f992825c5..a84e0997f 100644 --- a/js/jquery.menu.js +++ b/js/jquery.menu.js @@ -69,24 +69,17 @@ $(function(){ } }); - function submenu_hide() { - $(".gnb_1dli").removeClass("gnb_1dli_over gnb_1dli_over2 gnb_1dli_on"); - } - - // 텍스트 리사이즈 카운트 쿠키있으면 실행 - var resize_act; - var text_resize_count = parseInt(get_cookie("ck_font_resize_count")); - if(!isNaN(text_resize_count)) { - if(text_resize_count > 0) - resize_act = "increase"; - else if(text_resize_count < 0) - resize_act = "decrease"; - - if(Math.abs(text_resize_count) > 0) - font_resize2("container", resize_act, Math.abs(text_resize_count)); + // 폰트 리사이즈 쿠키있으면 실행 + var font_resize_act = get_cookie("ck_font_resize_act"); + if(font_resize_act != "") { + font_resize("container", font_resize_act); } }); +function submenu_hide() { + $(".gnb_1dli").removeClass("gnb_1dli_over gnb_1dli_over2 gnb_1dli_on"); +} + function menu_rearrange(el) { var width = $("#gnb_1dul").width(); From bd9cc8c9270ef78a7c3bdb1be105e65ed8dab9e8 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 28 Jun 2013 17:08:09 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20?= =?UTF-8?q?=EC=98=A4=EB=A5=B8=EC=AA=BD=20=EC=A0=95=EB=A0=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 2080a1eb0..859cf30b4 100644 --- a/css/default.css +++ b/css/default.css @@ -63,7 +63,7 @@ a:active {color:#000;text-decoration:underline} .gnb_js .gnb_2dul {display:none;position:absolute;top:35px} .gnb_js .gnb_2da {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left} .gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff} -.gnb_1dli_over2 .gnb_2dul {display:block;right:0;width:180px;background:#fff} +.gnb_1dli_over2 .gnb_2dul {display:block;right:1px;width:180px;background:#fff} .gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em} From e0e9d1a5a86305218a47e2661050be352ab7e60f Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 28 Jun 2013 17:12:20 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=9D=B8?= =?UTF-8?q?=EB=8D=B1=EC=8A=A4=20=EC=B5=9C=EC=8B=A0=EA=B8=80=20=ED=97=A4?= =?UTF-8?q?=EB=94=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/index.php b/index.php index 27f3da6c1..cd599b6ee 100644 --- a/index.php +++ b/index.php @@ -18,6 +18,7 @@ if ($config['cf_include_index']) { include_once('./_head.php'); ?> +

최신글

Date: Fri, 28 Jun 2013 17:29:29 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=ED=81=AC=EA=B8=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0=EB=9D=BC=20line-height?= =?UTF-8?q?=20=EA=B0=92=EB=8F=84=20=EB=B3=80=EA=B2=BD=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/common.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/js/common.js b/js/common.js index 2edf6cae2..6eeb997f7 100644 --- a/js/common.js +++ b/js/common.js @@ -394,10 +394,24 @@ $(function() { * 텍스트 리사이즈 **/ var default_font_size_saved = false; +var default_line_height_saved = false; function font_resize(id, act) { var $elements = $("#"+id+" *").not("select").not("option"); $elements.removeClass("applied"); + + // container의 기본 line-height 저장 + if(!default_line_height_saved) { + $("#"+id+" *").data("lh", $("#"+id+" *").css("line-height")); + default_line_height_saved = true; + } + + // 폰트 크기 변경에 따른 line-height 적용 + var lh = 1.5; + if(act == "default") + lh = $("#"+id+" *").data("lh"); + $("#"+id+" *").css("line-height", lh); + // 엘리먼트의 기본 폰트사이즈 저장 if(!default_font_size_saved) { save_default_font_size($elements); @@ -445,6 +459,7 @@ function set_font_size($el, act) break; default: nfsize = fsize; + lh = 1; break; } From 7eee66085afcd3c7ec6ab50a3d58e1bd3c9453e4 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 28 Jun 2013 17:40:22 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20ie6=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95,=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=ED=83=80=EC=9D=B4=ED=8B=80=20=EB=B0=91=EC=9D=98=20?= =?UTF-8?q?=EC=84=A4=EB=AA=85=20p=20=EC=A7=A4=EB=A6=AC=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 4d66783dd..8ea61f2c1 100644 --- a/css/admin.css +++ b/css/admin.css @@ -176,7 +176,7 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f .anchor a:focus, .anchor a:hover {background:#434f54;text-decoration:none} /* 리스트 정렬 */ -.sort_odr {float:left;margin:0 0 10px;padding-left:1px;list-style:none;zoom:1} +.sort_odr {margin:0 0 10px;padding-left:1px;list-style:none;zoom:1} .sort_odr:after {display:block;visibility:hidden;clear:both;content:""} .sort_odr li {float:left;margin-bottom:-1px} .sort_odr a {display:inline-block;position:relative;margin-left:-1px;padding:8px 0 6px;width:70px;border:1px solid #e9e9e9;background:#f5f6fa;color:#000;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} From f5fe47df0c34fc377417240bbd9da52335efce9f Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Jun 2013 17:54:22 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=95=84=EC=9B=83=EC=8B=9C=20=EC=87=BC=ED=95=91?= =?UTF-8?q?=EB=AA=B0=EC=97=90=20=EB=A8=B8=EB=AC=BC=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/logout.php | 9 ++++++--- mobile/shop/shop.head.php | 2 +- shop/shop.head.php | 2 +- skin/outlogin/shop_basic/outlogin.skin.2.php | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bbs/logout.php b/bbs/logout.php index f3c5bff41..b62fb3af7 100644 --- a/bbs/logout.php +++ b/bbs/logout.php @@ -2,8 +2,8 @@ include_once('./_common.php'); // 이호경님 제안 코드 -session_unset(); // 모든 세션변수를 언레지스터 시켜줌 -session_destroy(); // 세션해제함 +session_unset(); // 모든 세션변수를 언레지스터 시켜줌 +session_destroy(); // 세션해제함 // 자동로그인 해제 -------------------------------- set_cookie('ck_mb_id', '', 0); @@ -16,7 +16,10 @@ if ($url) { alert('url에 도메인을 지정할 수 없습니다.'); } - $link = $url; + if($url == 'shop') + $link = G4_SHOP_URL; + else + $link = $url; } else if ($bo_table) { $link = G4_BBS_URL.'/board.php?bo_table='.$bo_table; } else { diff --git a/mobile/shop/shop.head.php b/mobile/shop/shop.head.php index 843b00594..b9c1d2702 100644 --- a/mobile/shop/shop.head.php +++ b/mobile/shop/shop.head.php @@ -42,7 +42,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
    -
  • 로그아웃
    • +
  • 로그아웃
  • 로그인
    • diff --git a/shop/shop.head.php b/shop/shop.head.php index 3ad802d99..9382e4f5b 100644 --- a/shop/shop.head.php +++ b/shop/shop.head.php @@ -71,7 +71,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');

    회원메뉴 및 FAQ

      -
    • 로그아웃
      • +
    • 로그아웃
    • 정보수정
    • 로그인
      • diff --git a/skin/outlogin/shop_basic/outlogin.skin.2.php b/skin/outlogin/shop_basic/outlogin.skin.2.php index 410f75f51..471de1abe 100644 --- a/skin/outlogin/shop_basic/outlogin.skin.2.php +++ b/skin/outlogin/shop_basic/outlogin.skin.2.php @@ -30,7 +30,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가