From 376a5ca5571cf184ed4c28255f801a6729a226e3 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Wed, 6 Mar 2013 15:08:50 +0900
Subject: [PATCH 01/20] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20=EC=B5=9C?=
=?UTF-8?q?=EC=8B=A0=EA=B8=80=EC=8A=A4=ED=82=A8=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/mobile.css | 12 +++++-------
index.php | 2 +-
mobile/index.php | 18 ++++++++++++++++--
mobile/skin/latest/basic/latest.skin.php | 2 +-
skin/latest/basic/latest.skin.php | 2 +-
5 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/css/mobile.css b/css/mobile.css
index c174b6240..c49361ce8 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -336,14 +336,12 @@ input.required:focus {border:0;background:#21272e !important;color:#fff;line-hei
#profile .sv_wrap a {margin:0 0 0.3em;padding:0;font-weight:bold;line-height:1em}
/* 최근게시물 스킨 (latest) */
-.lt {float:left}
-.lt ul {display:none}
-.lt_title {display:inline-block;padding:1em}
-.lt_title:focus ~ ul,
-.lt_title:hover ~ ul,
-.lt_title:active ~ ul {display:block;position:absolute;top:100px;left:0}
+.lt {position:relative;margin:0 0 1em;padding:0 1em 1.5em;border-bottom:1px solid #ddd}
+.lt ul {margin:0 0 1em;padding:0;list-style:none}
+.lt li {padding:0.2em 0}
.lt a {color:#000;text-decoration:none}
-.lt_more {display:none}
+.lt_title {display:block;padding:1em 0}
+.lt_more {position:absolute;top:1em;right:1em}
/* 현재접속자 */
#current_connect_tbl {}
diff --git a/index.php b/index.php
index 68d12dd6f..6fece6758 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-
-모바일 메인
+
+
+// 최신글
+$sql = " select bo_table from {$g4['board_table']} order by gr_id, bo_table ";
+$result = sql_query($sql);
+for ($i=0; $row=sql_fetch_array($result); $i++) {
+ // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
+ // 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
+
+ // 사용방법
+ // latest(스킨, 게시판아이디, 출력라인, 글자수);
+ echo latest("basic", $row['bo_table'], 5, 25);
+}
+?>
+
include_once(G4_MOBILE_PATH.'/_tail.php');
diff --git a/mobile/skin/latest/basic/latest.skin.php b/mobile/skin/latest/basic/latest.skin.php
index 1c8fcdbe6..85fea6148 100644
--- a/mobile/skin/latest/basic/latest.skin.php
+++ b/mobile/skin/latest/basic/latest.skin.php
@@ -35,5 +35,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
게시물이 없습니다.
} ?>
-
+
diff --git a/skin/latest/basic/latest.skin.php b/skin/latest/basic/latest.skin.php
index f4099937e..712bc3f91 100644
--- a/skin/latest/basic/latest.skin.php
+++ b/skin/latest/basic/latest.skin.php
@@ -35,5 +35,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
게시물이 없습니다.
} ?>
-
+
From 9f26b0b77341d32133bfe81f627372e500c6f187 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Wed, 6 Mar 2013 15:19:00 +0900
Subject: [PATCH 02/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=84=A4?=
=?UTF-8?q?=EB=AC=B8=EC=A1=B0=EC=82=AC=20=EA=B2=B0=EA=B3=BC=EB=B3=B4?=
=?UTF-8?q?=EA=B8=B0=20=EA=B8=B0=ED=83=80=EC=9D=98=EA=B2=AC=20h1?=
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 f8377e2de..9a644edf0 100644
--- a/css/default.css
+++ b/css/default.css
@@ -385,7 +385,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
#poll_result_cmt h2 {text-align:center}
#poll_result_cmt h3 {margin:0 auto 10px;padding-top:15px;width:93%}
#poll_result_cmt article {margin:0 18px 15px;border-bottom:1px solid #eee}
-#poll_result_cmt h1 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
+#poll_result_cmt h1 {margin:0;padding:0;height:0;border:0;font-size:0;line-height:0;overflow:hidden}
.poll_datetime {display:inline-block;margin-left:10px}
#poll_result_cmt p {padding:3px 0}
#poll_result_cmt fieldset {margin-bottom:0;text-align:left}
From 05de03dc181c060716d4e3555d03b309c2559124 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Wed, 6 Mar 2013 15:30:49 +0900
Subject: [PATCH 03/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20ie6=20?=
=?UTF-8?q?=EC=97=90=EC=84=9C=20hd=20=EA=B9=A8=EC=A7=80=EB=8A=94=20?=
=?UTF-8?q?=ED=98=84=EC=83=81=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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/css/default.css b/css/default.css
index 9a644edf0..1f4728db1 100644
--- a/css/default.css
+++ b/css/default.css
@@ -34,7 +34,7 @@ a:active {color:#000;text-decoration:underline}
#captcha_wav img {border:1px solid #cfded8;border-left:0;background:#494949}
/* 상단 레이아웃 */
-#hd {border-top:3px solid #151515;border-bottom:1px solid #e7f1ed;background:#fff}
+#hd {height:auto !important;height:0;border-top:3px solid #151515;border-bottom:1px solid #e7f1ed;background:#fff} /* height 중첩은 ie6 대응을 위한 것임 */
#hd h1 {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#hd_wrapper {position:relative;margin:0 auto;width:980px}
@@ -260,7 +260,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
/* 아웃로그인 스킨 */
.ol {position:relative;padding:15px 15px 14px 14px}
-.ol h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
+.ol h2 {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
.ol ul {margin:0;padding:0;list-style:none}
#ol_before {}
From 99e370c6e507423e6efcd96397f31b0ab7dd4db7 Mon Sep 17 00:00:00 2001
From: chicpro
Date: Wed, 6 Mar 2013 16:40:07 +0900
Subject: [PATCH 04/20] =?UTF-8?q?#336=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?=
=?UTF-8?q?=EC=8A=A4=ED=82=A8=EC=9D=98=20css=20=ED=8C=8C=EC=9D=BC=20?=
=?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
head.sub.php | 14 ++++++++++++++
lib/common.lib.php | 32 ++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/head.sub.php b/head.sub.php
index 9092df604..32afa2d89 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -40,6 +40,20 @@ header("Pragma: no-cache"); // HTTP/1.0
} else { ?>
">
}?>
+ // 스킨의 style sheet 불러옴
+if(isset($board_skin_path))
+ echo get_skin_stylesheet($board_skin_path);
+if(isset($member_skin_path))
+ echo get_skin_stylesheet($member_skin_path);
+if(isset($new_skin_path))
+ echo get_skin_stylesheet($new_skin_path);
+if(isset($search_skin_path))
+ echo get_skin_stylesheet($search_skin_path);
+if(isset($connect_skin_path))
+ echo get_skin_stylesheet($connect_skin_path);
+if(isset($poll_skin_path))
+ echo get_skin_stylesheet($poll_skin_path);
+?>
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 7e3ff5dbf..46d23aad1 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1785,4 +1785,36 @@ function delete_editor_thumbnail($contents)
}
}
}
+
+// 스킨 style sheet 파일 얻기
+function get_skin_stylesheet($skin_path)
+{
+ if(!$skin_path)
+ return "";
+
+ $str = "";
+
+ $p = parse_url(G4_URL);
+ $skin_url = $p['scheme'].'://'.$p['host'];
+ if(isset($p['port']))
+ $skin_url .= ':'.$p['port'];
+ $skin_url .= str_replace($_SERVER['DOCUMENT_ROOT'], "", $skin_path);
+
+ if(is_dir($skin_path)) {
+ if($dh = opendir($skin_path)) {
+ while(($file = readdir($dh)) !== false) {
+ if($file == "." || $file == "..")
+ continue;
+
+ if(is_dir($skin_path.'/'.$file))
+ continue;
+
+ if(preg_match("/\.(css)$/i", $file))
+ $str .= ' '."\n";
+ }
+ }
+ }
+
+ return $str;
+}
?>
\ No newline at end of file
From 71fb99e250e83a1efbd91c37676c966ccc0ae020 Mon Sep 17 00:00:00 2001
From: chicpro
Date: Wed, 6 Mar 2013 16:43:12 +0900
Subject: [PATCH 05/20] =?UTF-8?q?closedir=20=EC=BD=94=EB=93=9C=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/common.lib.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 46d23aad1..b5bc48bfc 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1812,6 +1812,7 @@ function get_skin_stylesheet($skin_path)
if(preg_match("/\.(css)$/i", $file))
$str .= ' '."\n";
}
+ closedir($dh);
}
}
From 2fd35ef10801b36b8239943ddf687715e0519278 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Wed, 6 Mar 2013 17:11:12 +0900
Subject: [PATCH 06/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20?=
=?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20#327=20,=20#313=20=EC=97=90=20?=
=?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/default.css | 59 ++++++++++++++++++++++++-------------------------
head.sub.php | 2 +-
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/css/default.css b/css/default.css
index 1f4728db1..1187d1480 100644
--- a/css/default.css
+++ b/css/default.css
@@ -8,7 +8,12 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"}
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
label, input, select, img {vertical-align:middle}
-input {margin:0;padding:0;font-family:"dotum"}
+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;-webkit-appearance:none}
p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all}
hr {display:none}
pre {overflow-x:scroll;font-size:1.1em}
@@ -34,11 +39,11 @@ a:active {color:#000;text-decoration:underline}
#captcha_wav img {border:1px solid #cfded8;border-left:0;background:#494949}
/* 상단 레이아웃 */
-#hd {height:auto !important;height:0;border-top:3px solid #151515;border-bottom:1px solid #e7f1ed;background:#fff} /* height 중첩은 ie6 대응을 위한 것임 */
+#hd {height:73px;border-top:3px solid #151515;border-bottom:1px solid #e7f1ed;background:#fff}
#hd h1 {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#hd_wrapper {position:relative;margin:0 auto;width:980px}
-#logo {padding:17px 0 17px 0}
+#logo {padding:17px 0}
#logo span {display:inline-block;margin-left:10px;color:#109ff1;font-family:"verdana";vertical-align:middle}
#schall {position:absolute;top:22px;left:70px;margin:0;padding:0;letter-spacing:-5px}
@@ -56,50 +61,44 @@ a:active {color:#000;text-decoration:underline}
#snb img {margin-right:3px}
/* gnb js off */
-#gnb {margin-top:-1px;background:#f0f4f8}
+#gnb {z-index:10;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8}
#gnb h2 {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
-#gnb_ul {z-index:10;margin:0 auto;padding:0;width:980px}
-.gnb_1depth {position:relative;margin-left:-1px;zoom:1}
+#gnb_ul {margin:0 auto;padding:0;width:980px;zoom:1}
+#gnb_ul:after {display:block;visibility:hidden;clear:both;content:""}
+.gnb_1depth {z-index:10;clear:both;zoom:1}
.gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""}
-.gnb_1depth a {display:block;float:left;height:35px;color:#000;line-height:2.7em !important;line-height:2.4em}
-.gnb_1depth_air a,
-.gnb_1depth_on a {color:#000}
+.gnb_1depth a {display:block;float:left;height:35px;width:80px;font-weight:bold;line-height:2.95em;text-decoration:none}
.gnb_1depth a:focus,
-.gnb_1depth a:hover,
-.gnb_1depth a:active {text-decoration:none}
-.gnb_1depth ul {float:left;zoom:1}
-.gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""}
-.gnb_1depth li {float:left}
-.gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:0 5px;width:auto;height:35px;border-bottom:0;color:#000;font-weight:normal;text-align:left;line-height:2.7em !important;line-height:2.4em}
+.gnb_1depth a:hover {text-decoration:none}
+.gnb_1depth ul {float:left;width:auto}
+.gnb_2depth {float:left}
+.gnb_2depth a {font-weight:normal}
/* gnb js on */
-.gnb_js {padding-left:1px;border-bottom:1px solid #c3c7c5;background:#fff}
-.gnb_js ul {zoom:1}
-.gnb_js ul:after {display:block;visibility:hidden;clear:both;content:""}
-.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px;width:80px;border:1px solid #e0e5e9;border-top:0;border-bottom:0}
-.gnb_js .gnb_1depth a {display:inline-block;float:none;width:100%;height:35px;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em}
+.gnb_js {padding-left:1px}
+.gnb_js #gnb_ul {zoom:1}
+.gnb_js #gnb_ul:after {display:block;visibility:hidden;clear:both;content:""}
+.gnb_js .gnb_1depth {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #e0e5e9;border-top:0;border-bottom:0}
+.gnb_js .gnb_1depth a {text-align:center}
.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000}
.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000}
-.gnb_js .gnb_1depth a:focus,
-.gnb_js .gnb_1depth a:hover,
-.gnb_js .gnb_1depth a:active {text-decoration:none}
-.gnb_js .gnb_1depth ul {width:0 !important;height:0 !important;overflow:hidden}
-.gnb_js .gnb_1depth li {float:none}
-.gnb_js .gnb_1depth_over ul {position:absolute;top:35px;left:-1px;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0}
-.gnb_js .gnb_1depth_over2 ul {position:absolute;top:35px;right:-1px;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0}
-.gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em !important}
+.gnb_js ul ul {position:absolute;top:35px}
+.gnb_js .gnb_ul2 {width:1px;height:1px;overflow:hidden}
+.gnb_js .gnb_2depth a {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left}
+.gnb_1depth_over .gnb_ul2 {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
+.gnb_1depth_over2 .gnb_ul2 {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
/* 배포시에는 필요없는 부분 */
#sirgle_title {height:100px;color:#fff;font-size:3em}
#sirgle_title_span {display:block;position:relative;top:33px;left:0;margin:0 auto;width:980px}
/* 중간 레이아웃 */
-#wrapper {margin:50px auto;width:980px;zoom:1}
+#wrapper {z-index:5;margin:50px auto;width:980px;zoom:1}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#wrapper_title {margin-bottom:20px;font-size:1.2em}
#lnb {float:right;width:209px;border:1px solid #cfded8;background:#fff}
-#container {position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #cfded8;background:#fff;zoom:1}
+#container {z-index:4;position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #cfded8;background:#fff;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
/* 하단 레이아웃 */
diff --git a/head.sub.php b/head.sub.php
index 9092df604..14cdc85de 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -68,4 +68,4 @@ var g4_cookie_domain = "=G4_COOKIE_DOMAIN?>";
if (!defined('G4_IS_ADMIN')) { echo $config['cf_add_script']; } ?>
- if ($is_member) { ?>=$member['mb_nick']?>님 로그인 중 } ?>
\ No newline at end of file
+ if ($is_member) { ?>=$member['mb_nick']?>님 로그인 중
} ?>
\ No newline at end of file
From 1165427f363cd0b316e5c127ef1908c6728eeb1f Mon Sep 17 00:00:00 2001
From: whitedot
Date: Wed, 6 Mar 2013 17:34:09 +0900
Subject: [PATCH 07/20] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20#316=20?=
=?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=B2=98=EB=A6=AC,=20?=
=?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EA=B7=B8=EB=A3=B9=EA=B4=80=EB=A6=AC?=
=?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EB=84=93=EC=9D=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
adm/boardgroup_list.php | 2 +-
css/admin.css | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index baebd0b46..413d8e3a0 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -159,7 +159,7 @@ $colspan = 8;
>모바일
- =$s_upd?>
+ =$s_upd?>
diff --git a/css/admin.css b/css/admin.css
index 52dcffc7c..0f4aeeb3b 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -226,6 +226,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
/* 회원메일발송 목록 */
.td_test, .td_send {width:50px;text-align:center}
.td_mng {width:110px;text-align:center}
+.td_smallmng {width:50px;text-align:center}
/* 투표관리 목록 */
.td_etc {width:80px;text-align:center}
/* 게시판관리 목록 */
From 15e9e89727e9cf4029bf551b0da84fafea1b4df9 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Wed, 6 Mar 2013 17:41:18 +0900
Subject: [PATCH 08/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/default.css | 7 +++----
head.php | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/css/default.css b/css/default.css
index 1187d1480..5d675ed12 100644
--- a/css/default.css
+++ b/css/default.css
@@ -81,11 +81,10 @@ a:active {color:#000;text-decoration:underline}
.gnb_js .gnb_1depth a {text-align:center}
.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000}
.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000}
-.gnb_js ul ul {position:absolute;top:35px}
-.gnb_js .gnb_ul2 {width:1px;height:1px;overflow:hidden}
+.gnb_js .gnb_sub_ul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden}
.gnb_js .gnb_2depth a {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left}
-.gnb_1depth_over .gnb_ul2 {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
-.gnb_1depth_over2 .gnb_ul2 {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
+.gnb_1depth_over .gnb_sub_ul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
+.gnb_1depth_over2 .gnb_sub_ul {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
/* 배포시에는 필요없는 부분 */
#sirgle_title {height:100px;color:#fff;font-size:3em}
diff --git a/head.php b/head.php
index f76172255..3f28bc6a1 100644
--- a/head.php
+++ b/head.php
@@ -137,7 +137,7 @@ if ($config['cf_include_head']) {
?>
=$row['gr_subject']?>
-
+
$sql2 = " select * from {$g4['board_table']} where gr_id = '{$row['gr_id']}' order by bo_order ";
$result2 = sql_query($sql2);
From 9fabacfb7dfb8ec4eee2e50e51817add9bed1fc1 Mon Sep 17 00:00:00 2001
From: chicpro
Date: Wed, 6 Mar 2013 17:55:39 +0900
Subject: [PATCH 09/20] =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=82=AC?=
=?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EC=A1=B0=EC=A0=88=20=EA=B8=B0=EB=8A=A5?=
=?UTF-8?q?=EC=97=90=20=EC=9B=90=EB=9E=98=20=ED=81=AC=EA=B8=B0=EB=A1=9C=20?=
=?UTF-8?q?=EB=8F=8C=EB=A6=AC=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
head.php | 1 +
js/common.js | 33 ++++++++++++++++++++++++++++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/head.php b/head.php
index f76172255..54f33a20f 100644
--- a/head.php
+++ b/head.php
@@ -163,4 +163,5 @@ if ($config['cf_include_head']) {
크게
작게
+ 기본
\ No newline at end of file
diff --git a/js/common.js b/js/common.js
index 25d3c0c06..ba517b69d 100644
--- a/js/common.js
+++ b/js/common.js
@@ -530,6 +530,10 @@ function font_resize(id, act)
if(isNaN(count))
count = 0;
+ // 크롬의 최소 폰트사이즈 버그로 작게는 한단계만 가능
+ if(count == -1)
+ return;
+
$elements.each(function() {
if($(this).hasClass("no_text_resize"))
return true;
@@ -567,12 +571,39 @@ function font_resize(id, act)
}
+/**
+ * 텍스트 기본사이즈
+**/
+function font_default(id)
+{
+ var act;
+ var count = parseInt(get_cookie("ck_font_resize_count"));
+ if(isNaN(count))
+ count = 0;
+
+ // font resize 카운트 초기화
+ set_cookie("ck_font_resize_count", 0, 1, g4_cookie_domain);
+
+ if(count > 0)
+ act = "decrease";
+ else
+ act = "increase";
+
+ for(i=0; i
Date: Wed, 6 Mar 2013 18:02:44 +0900
Subject: [PATCH 10/20] =?UTF-8?q?#337=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?=
=?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=9D=B4=EC=99=B8=EC=97=90?=
=?UTF-8?q?=EC=84=9C=20=EB=B9=84=ED=9A=8C=EC=9B=90=20=EC=82=AC=EC=9D=B4?=
=?UTF-8?q?=EB=93=9C=EB=B7=B0=20=EC=B6=9C=EB=A0=A5=EB=90=98=EC=A7=80=20?=
=?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/common.lib.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/common.lib.php b/lib/common.lib.php
index b5bc48bfc..f18bd6476 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -987,6 +987,9 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$title_mb_id = '['.$mb_id.']';
} else {
+ if(!$bo_table)
+ return $name;
+
$tmp_name = "$name ";
$title_mb_id = '[비회원]';
}
From bb34b38d248f40301ab85502180dfe5a9dc03e53 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Wed, 6 Mar 2013 18:08:50 +0900
Subject: [PATCH 11/20] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20gnb=20?=
=?UTF-8?q?=EC=8A=A4=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
---
adm/admin.head.php | 2 +-
css/admin.css | 44 +++++++++++++++++++-------------------------
css/default.css | 2 +-
3 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/adm/admin.head.php b/adm/admin.head.php
index cbc8fbe9b..9b7df9ecc 100644
--- a/adm/admin.head.php
+++ b/adm/admin.head.php
@@ -18,7 +18,7 @@ function print_menu2($key, $no)
{
global $menu, $auth_menu, $is_admin, $auth, $g4;
- $str .= "";
+ $str .= "";
for($i=1; $i
Date: Wed, 6 Mar 2013 18:27:46 +0900
Subject: [PATCH 12/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20group.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bbs/group.php | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/bbs/group.php b/bbs/group.php
index ec3684040..716b27508 100644
--- a/bbs/group.php
+++ b/bbs/group.php
@@ -7,26 +7,19 @@ include_once('./_head.php');
?>
-
-
-
-
- // 최신글
- $sql = " select bo_table, bo_subject from {$g4[board_table]} where gr_id = '{$gr_id}' and bo_list_level <= '{$member[mb_level]}' order by bo_table ";
- $result = sql_query($sql);
- for ($i=0; $row=sql_fetch_array($result); $i++) {
- // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
- // 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
+
+// 최신글
+$sql = " select bo_table, bo_subject from {$g4[board_table]} where gr_id = '{$gr_id}' and bo_list_level <= '{$member[mb_level]}' order by bo_table ";
+$result = sql_query($sql);
+for ($i=0; $row=sql_fetch_array($result); $i++) {
+ // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
+ // 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
- // 사용방법
- // latest(스킨, 게시판아이디, 출력라인, 글자수);
- echo latest('basic', $row[bo_table], 5, 70);
- echo '';
- }
- ?>
-
-
-
+ // 사용방법
+ // latest(스킨, 게시판아이디, 출력라인, 글자수);
+ echo latest('basic', $row[bo_table], 5, 70);
+}
+?>
From f5dfce3ac17f2de22d14fc23e2c02e7742b0ba73 Mon Sep 17 00:00:00 2001
From: chicpro
Date: Wed, 6 Mar 2013 18:43:04 +0900
Subject: [PATCH 13/20] =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=9E=91?=
=?UTF-8?q?=EA=B2=8C=20=ED=9B=84=20=EA=B8=B0=EB=B3=B8=20=ED=81=AC=EA=B8=B0?=
=?UTF-8?q?=EA=B0=80=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4?=
=?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/common.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/js/common.js b/js/common.js
index ba517b69d..7150b7a43 100644
--- a/js/common.js
+++ b/js/common.js
@@ -581,13 +581,13 @@ function font_default(id)
if(isNaN(count))
count = 0;
- // font resize 카운트 초기화
- set_cookie("ck_font_resize_count", 0, 1, g4_cookie_domain);
-
- if(count > 0)
+ if(count > 0) {
act = "decrease";
- else
+ } else {
act = "increase";
+ // 작게 후 기본 크기가 되지 않는 문제해결을 위해 추가
+ set_cookie("ck_font_resize_count", 0, 1, g4_cookie_domain);
+ }
for(i=0; i
Date: Thu, 7 Mar 2013 09:17:17 +0900
Subject: [PATCH 14/20] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=A0=91?=
=?UTF-8?q?=EC=86=8D=EC=8B=9C=20=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=9A=A9?=
=?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A0=84=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bbs/group.php | 9 +++++++--
mobile/group.php | 11 +++++++++++
mobile/index.php | 2 ++
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 mobile/group.php
diff --git a/bbs/group.php b/bbs/group.php
index 716b27508..4ad83b98b 100644
--- a/bbs/group.php
+++ b/bbs/group.php
@@ -1,8 +1,13 @@
include_once('./_common.php');
include_once(G4_LIB_PATH.'/latest.lib.php');
+$g4['title'] = $group['gr_subject'];
+
+if (G4_IS_MOBILE) {
+ include_once(G4_MOBILE_PATH.'/group.php');
+ return;
+}
-$g4['title'] = $group[gr_subject];
include_once('./_head.php');
?>
@@ -17,7 +22,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
// 사용방법
// latest(스킨, 게시판아이디, 출력라인, 글자수);
- echo latest('basic', $row[bo_table], 5, 70);
+ echo latest('basic', $row['bo_table'], 5, 70);
}
?>
diff --git a/mobile/group.php b/mobile/group.php
new file mode 100644
index 000000000..a0cabaa4c
--- /dev/null
+++ b/mobile/group.php
@@ -0,0 +1,11 @@
+
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+include_once(G4_MOBILE_PATH.'/_head.php');
+?>
+
+모바일용 게시판 그룹
+
+
+include_once(G4_MOBILE_PATH.'/_tail.php');
+?>
diff --git a/mobile/index.php b/mobile/index.php
index 4ff043e78..ad42f959d 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -1,4 +1,6 @@
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
include_once(G4_MOBILE_PATH.'/_head.php');
?>
From 05508a62f2f6a3d543dafe535ff48382b191013b Mon Sep 17 00:00:00 2001
From: chicpro
Date: Thu, 7 Mar 2013 09:22:39 +0900
Subject: [PATCH 15/20] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EA=B8=B0?=
=?UTF-8?q?=EA=B8=B0=20=EC=8A=A4=ED=81=AC=EB=A6=B0=20=ED=8F=AD=20=EC=A0=80?=
=?UTF-8?q?=EC=9E=A5=20=EC=BF=A0=ED=82=A4=20=EC=BD=94=EB=93=9C=20=EB=B3=80?=
=?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
head.sub.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/head.sub.php b/head.sub.php
index 6a919310f..988a6c6af 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -76,7 +76,7 @@ var g4_cookie_domain = "=G4_COOKIE_DOMAIN?>";
if(G4_IS_MOBILE) { ?>
} ?>
if (!defined('G4_IS_ADMIN')) { echo $config['cf_add_script']; } ?>
From 731926df9ac021cf3dee42fd3fc283869d42c30f Mon Sep 17 00:00:00 2001
From: whitedot
Date: Thu, 7 Mar 2013 09:40:55 +0900
Subject: [PATCH 16/20] =?UTF-8?q?#339=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?=
=?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mobile/skin/member/basic/scrap_popin.skin.php | 2 +-
skin/member/basic/scrap_popin.skin.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mobile/skin/member/basic/scrap_popin.skin.php b/mobile/skin/member/basic/scrap_popin.skin.php
index 117d473c1..c42aabdd1 100644
--- a/mobile/skin/member/basic/scrap_popin.skin.php
+++ b/mobile/skin/member/basic/scrap_popin.skin.php
@@ -28,7 +28,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
+
\ 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 6b1167b26..f7bb40c63 100644
--- a/skin/member/basic/scrap_popin.skin.php
+++ b/skin/member/basic/scrap_popin.skin.php
@@ -28,7 +28,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
+
\ No newline at end of file
From 56311d8a26c06513c28400abe184d67b9c0162b2 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Thu, 7 Mar 2013 10:16:51 +0900
Subject: [PATCH 17/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B0=A4?=
=?UTF-8?q?=EB=9F=AC=EB=A6=AC=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=B6=94?=
=?UTF-8?q?=EC=B2=9C=20=EB=B9=84=EC=B6=94=EC=B2=9C=20=EA=B0=81=EA=B0=81=20?=
=?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=97=AC=EB=B6=80=EC=97=90=20=EB=94=B0?=
=?UTF-8?q?=EB=9D=BC=20=EC=B6=9C=EB=A0=A5=EB=90=98=EA=B2=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
skin/board/gallery/list.skin.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php
index 5214710b7..62ee6b956 100644
--- a/skin/board/gallery/list.skin.php
+++ b/skin/board/gallery/list.skin.php
@@ -109,10 +109,12 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
작성자 =$list[$i]['name']?>
작성일 =$list[$i]['datetime2']?>
조회 =$list[$i]['wr_hit']?>
+ if ($is_good || $is_nogood) {?>
- 추천=$list[$i]['wr_good']?>
- 비추천=$list[$i]['wr_nogood']?>
+ if ($is_good) {?>추천=$list[$i]['wr_good']?> } ?>
+ if ($is_nogood) {?>비추천=$list[$i]['wr_nogood']?> } ?>
+ } ?>
} ?>
From a97d9626d6859edabf374667d9d6a65464c98c0c Mon Sep 17 00:00:00 2001
From: whitedot
Date: Thu, 7 Mar 2013 10:18:14 +0900
Subject: [PATCH 18/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#338=20?=
=?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20bbs/group.php=20pc,=20mobile?=
=?UTF-8?q?=20=EA=B5=AC=EB=B6=84=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bbs/group.php | 10 ++++++++++
mobile/group.php | 16 +++++++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/bbs/group.php b/bbs/group.php
index 4ad83b98b..9e1d74987 100644
--- a/bbs/group.php
+++ b/bbs/group.php
@@ -11,18 +11,28 @@ if (G4_IS_MOBILE) {
include_once('./_head.php');
?>
+
// 최신글
$sql = " select bo_table, bo_subject from {$g4[board_table]} where gr_id = '{$gr_id}' and bo_list_level <= '{$member[mb_level]}' order by bo_table ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
+ $lt_style = "";
+ if ($i%2==1) $lt_style = "margin-left:20px";
+ else $lt_style = "";
+?>
+
+
// 이 함수가 바로 최신글을 추출하는 역할을 합니다.
// 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
// 사용방법
// latest(스킨, 게시판아이디, 출력라인, 글자수);
echo latest('basic', $row['bo_table'], 5, 70);
+ ?>
+
+
}
?>
diff --git a/mobile/group.php b/mobile/group.php
index a0cabaa4c..5eeb7e433 100644
--- a/mobile/group.php
+++ b/mobile/group.php
@@ -4,7 +4,21 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
include_once(G4_MOBILE_PATH.'/_head.php');
?>
-모바일용 게시판 그룹
+
+
+// 최신글
+$sql = " select bo_table, bo_subject from {$g4[board_table]} where gr_id = '{$gr_id}' and bo_list_level <= '{$member[mb_level]}' order by bo_table ";
+$result = sql_query($sql);
+for ($i=0; $row=sql_fetch_array($result); $i++) {
+ // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
+ // 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
+
+ // 사용방법
+ // latest(스킨, 게시판아이디, 출력라인, 글자수);
+ echo latest('basic', $row['bo_table'], 5, 70);
+}
+?>
+
include_once(G4_MOBILE_PATH.'/_tail.php');
From 9de881ae31271f84597aa0796c43531b27c000d7 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Thu, 7 Mar 2013 10:20:20 +0900
Subject: [PATCH 19/20] =?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=84=A0=ED=83=9D=EC=9D=B4=EB=8F=99=20?=
=?UTF-8?q?=EC=84=A0=ED=83=9D=EB=B3=B5=EC=82=AC=20=EC=8A=A4=ED=83=80?=
=?UTF-8?q?=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bbs/move.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bbs/move.php b/bbs/move.php
index 2643c31c7..6006a1180 100644
--- a/bbs/move.php
+++ b/bbs/move.php
@@ -55,7 +55,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
-
+
=$act?>할 게시판을 한개 이상 선택하여 주십시오.
From e09fce6f22bf4f64a334c70e027a71d0c4cc13f3 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Thu, 7 Mar 2013 10:34:41 +0900
Subject: [PATCH 20/20] =?UTF-8?q?ckeditor=20=EB=85=B8=EC=B6=9C=20=EC=95=88?=
=?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0,?=
=?UTF-8?q?=20basic=20skin=20=EC=BD=94=EB=93=9C=EB=A5=BC=20=EC=B0=B8?=
=?UTF-8?q?=EA=B3=A0=ED=95=98=EC=84=B8=EC=9A=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bbs/write.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/bbs/write.php b/bbs/write.php
index d4bdc6d10..7965b88ae 100644
--- a/bbs/write.php
+++ b/bbs/write.php
@@ -361,6 +361,7 @@ include_once('./board_head.php');
$action_url = G4_HTTPS_BBS_URL."/write_update.php";
+echo '';
include_once ($board_skin_path.'/write.skin.php');
include_once('./board_tail.php');