From 913696689fa7719aa95e11450ee873ed759447e1 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 20 Feb 2013 16:10:30 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=81=AC=EA=B2=8C=20?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/view_image.php | 89 ++++++++++++++++++++++++++++++++++ lib/common.lib.php | 11 +++-- skin/board/basic/view.skin.php | 15 ++++-- 3 files changed, 107 insertions(+), 8 deletions(-) create mode 100644 bbs/view_image.php diff --git a/bbs/view_image.php b/bbs/view_image.php new file mode 100644 index 000000000..bcc110031 --- /dev/null +++ b/bbs/view_image.php @@ -0,0 +1,89 @@ +'; +} else { + alert_close('파일이 존재하지 않습니다.'); +} +?> + + + +
+ + + + \ No newline at end of file diff --git a/lib/common.lib.php b/lib/common.lib.php index f07710a6c..3b70f9303 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1047,10 +1047,13 @@ function view_file_link($file, $width, $height, $content='') else $attr = ''; - if (preg_match("/\.({$config['cf_image_extension']})$/i", $file)) - // 이미지에 속성을 주지 않는 이유는 이미지 클릭시 원본 이미지를 보여주기 위한것임 - // 게시판설정 이미지보다 크다면 스킨의 자바스크립트에서 이미지를 줄여준다 - return "{$content}"; + if (preg_match("/\.({$config['cf_image_extension']})$/i", $file)) { + $img = ''; + $img .= ''.$content.''; + $img .= ''; + + return $img; + } } diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 7daa2bf92..fd52ba4aa 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -186,18 +186,25 @@ $(window).load(function() { view_image_resize(); }); +$(function() { + $("a.view_image").click(function() { + window.open(this.href, "large_image", "top=10,left=10,width=10,height=10,resizable=yes,scrollbars=no,status=no"); + return false; + }); +}); + function view_image_resize() { - var $img = $('#bo_v_atc img'); - var img_wrap = $('#bo_v_atc').width(); + var $img = $("#bo_v_atc img"); + var img_wrap = $("#bo_v_atc").width(); $img.each(function() { var img_width = $(this).width(); $(this).data("width", img_width); // 원래 이미지 사이즈 if (img_width > img_wrap) { - $(this).addClass('img_fix'); + $(this).addClass("img_fix"); } else if (img_width <= img_wrap && img_width >= $(this).data("width")) { - $(this).removeClass('img_fix'); + $(this).removeClass("img_fix"); } }); } From d3ab5d760cf593bfca31daab61ebd5350cd53bb0 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 20 Feb 2013 16:17:08 +0900 Subject: [PATCH 02/14] =?UTF-8?q?view=5Fimage.php=20=EB=A7=88=ED=81=AC?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/view_image.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bbs/view_image.php b/bbs/view_image.php index bcc110031..7b6a8984c 100644 --- a/bbs/view_image.php +++ b/bbs/view_image.php @@ -18,16 +18,12 @@ if(is_file($filepath)) { $height = $size[1]; $fileurl = G4_DATA_URL.'/file/'.$bo_table.'/'.$filename; - $img = ''; + $img = ''; } else { alert_close('파일이 존재하지 않습니다.'); } ?> - -
From dd3095f3bc06bce4a07615d34a425211dcc99100 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 20 Feb 2013 17:10:39 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=83=89=204e5d60=20=EC=9D=84=20334356=20=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/css/default.css b/css/default.css index 737169b23..24e043aa6 100644 --- a/css/default.css +++ b/css/default.css @@ -47,7 +47,7 @@ a:active {color:#000;text-decoration:underline} #snb {position:absolute;top:18px;right:0;zoom:1} #snb:after {display:block;visibility:hidden;clear:both;content:""} #snb li {float:left} -#snb a {display:block;padding:5px 10px;color:#4e5d60;letter-spacing:-0.1em} +#snb a {display:block;padding:5px 10px;color:#334356;letter-spacing:-0.1em} #snb a:focus, #snb a:hover, #snb a:active {text-decoration:none} @@ -97,13 +97,13 @@ a:active {color:#000;text-decoration:underline} .btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn01:focus, .btn01:hover {text-decoration:none !important} -.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #4e5d60 !important;background:#4e5d60 !important;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #334356 !important;background:#334356 !important;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn02:focus, .btn02:hover {text-decoration:none !important} .btn_confirm {text-align:center} /* 서식단계 진행 */ -.btn_submit {padding:0 10px;height:24px;border:0;background:#4e5d60;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} +.btn_submit {padding:0 10px;height:24px;border:0;background:#334356;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} -.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#4e5d60;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#334356;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer} .btn_win a:focus, @@ -149,7 +149,7 @@ fieldset textarea {padding:3px 3px 4px;border:1px solid #b8c9c2;background:#f7f7 fieldset textarea:focus {padding:4px 4px 5px;border:0;background:#21272e;color:#fff} .fs_submit, -fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#fff;line-height:1.7em;vertical-align:middle;cursor:pointer} +fieldset button {padding:0 15px;height:24px;border:0;background:#334356;color:#fff;line-height:1.7em;vertical-align:middle;cursor:pointer} .frm_info {display:block;padding:5px 0 0;color:#666;line-height:1.3em} @@ -218,13 +218,13 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f #ol_before fieldset {position:relative} #ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:168px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;line-height:1.6em} #ol_id:focus {border-color:#333;background:#21272e;color:#fff} -.ol_idlabel {position:absolute;top:6px;left:5px;color:#4e5d60;font-size:0.9em} +.ol_idlabel {position:absolute;top:6px;left:5px;color:#334356;font-size:0.9em} #ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:168px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:top;line-height:1.6em} #ol_pw:focus {border-color:#333;background:#21272e;color:#fff} -.ol_pwlabel {position:absolute;top:35px;left:5px;color:#4e5d60;font-size:0.9em} +.ol_pwlabel {position:absolute;top:35px;left:5px;color:#334356;font-size:0.9em} #auto_login {} #auto_login_label {letter-spacing:-0.1em} -#ol_submit {display:inline-block;width:60px;height:24px;border:0;background:#4e5d60;color:#fff;font-size:0.9em;font-weight:bold;vertical-align:top} +#ol_submit {display:inline-block;width:60px;height:24px;border:0;background:#334356;color:#fff;font-size:0.9em;font-weight:bold;vertical-align:top} #ol_before ul {float:right;margin:7px 0 13px;zoom:1} #ol_before ul:after {display:block;visibility:hidden;clear:both;content:""} #ol_before li {float:left;margin-left:5px;padding-top:2px} @@ -241,14 +241,14 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f #ol_after_private a {display:block;padding-top:8px;height:37px;background:#f7f7f7;text-align:center} #ol_after_private a strong {display:block;padding-top:3px;color:#000;font-weight:normal} #ol_after_private a:focus, -#ol_after_private a:hover {background:#4e5d60;color:#fff;text-decoration:none} +#ol_after_private a:hover {background:#334356;color:#fff;text-decoration:none} #ol_after_private a:focus strong, #ol_after_private a:hover strong {color:#fff;text-decoration:none} #ol_after_memo {width:50px;margin-right:1px} #ol_after_pt {width:80px;margin-right:1px} #ol_after_scrap {width:48px;line-height:2.6em !important} #ol_after_ft {text-align:justify} -#ol_after_ft a {display:inline-block;width:88px;height:22px;background:#4e5d60;color:#fff;text-align:center;line-height:1.8em} +#ol_after_ft a {display:inline-block;width:88px;height:22px;background:#334356;color:#fff;text-align:center;line-height:1.8em} #ol_after_ft a:focus, #ol_after_ft a:hover {text-decoration:none !important} @@ -309,7 +309,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f #poll ul {margin:0 0 10px;padding:5px 14px;list-style:none} #poll li {padding:3px 0} #poll footer {padding:0 14px 14px} -#poll footer input {width:88px;height:24px;border:0;background:#4e5d60;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} +#poll footer input {width:88px;height:24px;border:0;background:#334356;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} #poll footer a {display:inline-block;width:86px;height:22px;border:1px solid #ccc;background:#fafafa;text-align:center;line-height:2em} #poll footer a:focus, #poll footer a:hover {text-decoration:none !important} From 339bf02ef1d5001c1d1aed07200c8ede0b1f3afa Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 20 Feb 2013 17:13:06 +0900 Subject: [PATCH 09/14] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=ED=85=8C=EC=9D=B4=EB=B8=94=20th=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 --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 24e043aa6..c5a888d1c 100644 --- a/css/default.css +++ b/css/default.css @@ -112,7 +112,7 @@ a:active {color:#000;text-decoration:underline} /* 기본테이블 */ .basic_tbl {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} .basic_tbl caption {padding:0 0 10px;color:#777;text-align:left} -.basic_tbl thead th {padding:12px 0 8px;background:#334356;color:#fff} +.basic_tbl thead th {padding:12px 0 8px;background:#4193a7;color:#fff} .basic_tbl thead a {color:#fff} .basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ .basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} From 56e92d4375c047deb5f07b130ef68b4c344a6140 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 20 Feb 2013 17:13:39 +0900 Subject: [PATCH 10/14] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=ED=99=9C=EC=84=B1=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 --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index c5a888d1c..19ae14c30 100644 --- a/css/default.css +++ b/css/default.css @@ -585,4 +585,4 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#334356;color:#f .pg_prev {border-right:1px solid #cfded8} .pg_end, .pg_next {border-left:1px solid #cfded8} -.pg_current {background:#5b6964;color:#fff;font-weight:bold} \ No newline at end of file +.pg_current {background:#334356;color:#fff;font-weight:bold} \ No newline at end of file From 39a6540a397852e3e7dd1e05bd0aae1673ace22e Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 20 Feb 2013 17:14:39 +0900 Subject: [PATCH 11/14] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=95=84?= =?UTF-8?q?=EC=9B=83=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9B=84=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EB=AA=A8=EB=93=9C=20=EB=A1=9C=20=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/outlogin/basic/outlogin.skin.2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/outlogin/basic/outlogin.skin.2.php b/skin/outlogin/basic/outlogin.skin.2.php index 795ca8ca7..d62d45b12 100644 --- a/skin/outlogin/basic/outlogin.skin.2.php +++ b/skin/outlogin/basic/outlogin.skin.2.php @@ -6,7 +6,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

- 관리자 + 관리자 모드
  • From 8b66d4542336ab05b83e77ec9a91a3c941e3e29e Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 20 Feb 2013 17:16:29 +0900 Subject: [PATCH 12/14] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=ED=85=8C=EC=9D=B4=EB=B8=94=20th=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC2?= 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 19ae14c30..0384fef77 100644 --- a/css/default.css +++ b/css/default.css @@ -112,7 +112,7 @@ a:active {color:#000;text-decoration:underline} /* 기본테이블 */ .basic_tbl {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} .basic_tbl caption {padding:0 0 10px;color:#777;text-align:left} -.basic_tbl thead th {padding:12px 0 8px;background:#4193a7;color:#fff} +.basic_tbl thead th {padding:12px 0 8px;background:#079dd2;color:#fff} .basic_tbl thead a {color:#fff} .basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ .basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} From f5db23788ac10c40c0817cfc6a5b091fb25935ef Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 20 Feb 2013 17:17:25 +0900 Subject: [PATCH 13/14] =?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=EC=8A=A4=ED=82=A8=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=99=9C=EC=84=B1=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC?= 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 0384fef77..a3b968c5a 100644 --- a/css/default.css +++ b/css/default.css @@ -429,7 +429,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#334356;color:#f #bo_cate a:focus, #bo_cate a:hover, #bo_cate a:active {text-decoration:none} -#bo_cate #bo_cate_on {z-index:2;border:1px solid #555;background:#fff;color:#555;font-weight:bold} +#bo_cate #bo_cate_on {z-index:2;border:1px solid #079dd2;background:#fff;color:#079dd2;font-weight:bold} .bo_fx {margin-bottom:5px;zoom:1} .bo_fx:after {display:block;visibility:hidden;clear:both;content:""} From eaa902cb3412631bb0bd1661abdae08d42310719 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 20 Feb 2013 17:22:53 +0900 Subject: [PATCH 14/14] =?UTF-8?q?#274=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EB=A7=88=ED=81=AC=EC=97=85=20=EC=B2=98=EB=A6=AC,=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=EC=A3=BC=EC=86=8C=EB=8A=94=20=EB=AF=B8=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=EB=90=9C=20=EC=83=81=ED=83=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_form.php | 1 + adm/config_form.php | 4 ++++ css/adm.css | 3 +++ 3 files changed, 8 insertions(+) diff --git a/adm/board_form.php b/adm/board_form.php index 289f53218..503ffce68 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -567,6 +567,7 @@ $pg_anchor = "
      + 스킨자료실 diff --git a/adm/config_form.php b/adm/config_form.php index 9e940196f..df769bb81 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -127,6 +127,7 @@ $pg_anchor = " } ?> + 스킨자료실 @@ -145,6 +146,7 @@ $pg_anchor = " } ?> + 스킨자료실 @@ -158,6 +160,7 @@ $pg_anchor = " } ?> + 스킨자료실 @@ -284,6 +287,7 @@ $pg_anchor = " } ?> + 스킨자료실 diff --git a/css/adm.css b/css/adm.css index 9678a8847..3baf5cf6e 100644 --- a/css/adm.css +++ b/css/adm.css @@ -310,3 +310,6 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9 .pg_end, .pg_next {border-left:1px solid #ddd} .pg_current {background:#444;color:#fff;font-weight:bold} + +/* 스킨자료실 바로가기 */ +.goto_sirskin {color:#ff5300} \ No newline at end of file