diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index d03d1b904..e5d82e066 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -60,9 +60,13 @@
if(!$option->enable_component) $enable_component = false;
else $enable_component = true;
+ // html 모드 조절
+ if($option->disable_html) $html_mode = false;
+ else $html_mode = true;
+
// 크기 조절 옵션 설정
- if(!$option->resizable) $resizable = 'false';
- else $resizable = 'true';
+ if(!$option->resizable) $resizable = false;
+ else $resizable = true;
// 높이 설정
if(!$option->height) $editor_height = 400;
@@ -145,6 +149,11 @@
Context::set('enable_component', $enable_component);
Context::set('enable_default_component', $enable_default_component);
+ /**
+ * html_mode 가능한지 변수 설정
+ **/
+ Context::set('html_mode', $html_mode);
+
/**
* resizable 가능한지 변수 설정
**/
diff --git a/modules/editor/skins/default/css/editor.css b/modules/editor/skins/default/css/editor.css
index a6562c128..75b180997 100644
--- a/modules/editor/skins/default/css/editor.css
+++ b/modules/editor/skins/default/css/editor.css
@@ -21,13 +21,13 @@
.xeEditor .editorInfo { background:#fbfbfb; padding:.5em; border:1px solid #e1e1dd; color:#999999; position:relative; margin:5px 20px 0 20px;}
.xeEditor .close { cursor:pointer; position:absolute; top:3px; right:3px; _top:3px; _right:25px;}
-.xeEditor .editor_iframe_box { background:#ffffff; clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:5px; margin:0 20px 0 20px; }
+.xeEditor .editor_iframe_box { background:#ffffff; clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:5px; margin:10px 20px 10px 20px; }
.xeEditor .editor_iframe_textarea { background:#ffffff; clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:.5em; margin:0 20px 0 20px; width:100%; font-size:1em; display:none;}
.xeEditor .textAreaDragIndicator { text-align:center; background:url(../images/lineTextAreaDrag.gif) repeat-x left center; padding:5px 0 5px 0; }
.xeEditor .textAreaDragIndicatorBar { background:url(../images/buttonTextAreaDrag.gif) no-repeat center; cursor:move;height:14px;}
-.xeEditor .editor_info { clear:both; padding:5px 20px 5px 20px; overflow:hidden;}
+.xeEditor .editor_info { clear:both; padding:10px 20px 5px 20px; overflow:hidden;}
.xeEditor .editor_info .editor_option { float:left; color:#888888; }
.xeEditor .editor_info .editor_autosaved_message { color:#888888; float:right; }
diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html
index 9cd093c51..cb0ce0c67 100644
--- a/modules/editor/skins/default/editor.html
+++ b/modules/editor/skins/default/editor.html
@@ -10,7 +10,7 @@
var auto_saved_msg = "{$lang->msg_auto_saved}";
- xAddEventListener(window, 'load', function() { editorStart("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", {$enable_resizable}, '{$editor_height}' ) } );
+ xAddEventListener(window, 'load', function() { editorStart("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", '{$editor_height}' ) } );
//]]>
@@ -129,19 +129,27 @@
+
+
+
+
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index a6d96dd99..f7efdad0f 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -95,11 +95,7 @@ function editorGetSelectedNode(editor_sequence) {
/**
* editor 시작 (editor_sequence로 iframe객체를 얻어서 쓰기 모드로 전환)
**/
-function editorStart(editor_sequence, primary_key, content_key, resizable, editor_height) {
- // resize 가/불가에 대한 체크
- if(typeof(resizable)=="undefined"||!resizable) resizable = false;
- else resizable = true;
-
+function editorStart(editor_sequence, primary_key, content_key, editor_height) {
// iframe obj를 찾음
var iframe_obj = editorGetIFrame(editor_sequence);
if(!iframe_obj) return;
@@ -140,13 +136,6 @@ function editorStart(editor_sequence, primary_key, content_key, resizable, edito
// IE가 아니고 내용이 없으면
추가 (FF등에서 iframe 선택시 focus를 주기 위한 꽁수)
if(!content && !xIE4Up) content = "
";
- // 크기 변경 불가일 경우 드래그바 숨김
- var dragObj = xGetElementById("editor_drag_bar_"+editor_sequence);
- if(dragObj) {
- if(resizable == false) dragObj.style.display = "none";
- else dragObj.style.display = "block";
- }
-
// IE일 경우 ctrl-Enter 안내 문구를 노출
var ieHelpObj = xGetElementById("for_ie_help_"+editor_sequence);
if(xIE4Up && ieHelpObj) {
diff --git a/modules/guestbook/guestbook.view.php b/modules/guestbook/guestbook.view.php
index 051ff7760..ad0836358 100644
--- a/modules/guestbook/guestbook.view.php
+++ b/modules/guestbook/guestbook.view.php
@@ -38,11 +38,6 @@
$template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
$this->setTemplatePath($template_path);
- /**
- * 방명록 모듈 생성 또는 정보 수정시 open_rss값의 세팅에 따라서 rss_url을 선언해 놓는다.
- * 이 rss_url은 ./common/tpl/common_layout.html에서 application/rss+xml의 href로 지정된다
- **/
- if($this->module_info->open_rss != 'N') Context::set('rss_url', getUrl('','mid',$this->mid,'act','rss'));
}
/**
@@ -83,10 +78,11 @@
$option->primary_key_name = 'document_srl';
$option->content_key_name = 'content';
$option->allow_fileupload = false; ///< 파일 업로드 기능을 제한
- $option->enable_autosave = true; ///< 자동 저장 기능을 활성화
- $option->enable_default_component = true; ///< 기본 에디터 컴포넌트의 활성화
- $option->enable_component = true; ///< 추가 에디터 컴포넌트의 활성화
+ $option->enable_autosave = false; ///< 자동 저장 기능을 활성화
+ $option->enable_default_component = false; ///< 기본 에디터 컴포넌트의 활성화
+ $option->enable_component = false; ///< 추가 에디터 컴포넌트의 활성화
$option->resizable = false; ///< 글쓰기 폼의 상하 조절 가능하도록 설정
+ $option->disable_html = true; ///< html_mode
$option->height = 200; ///< 에디터의 높이 지정
$editor = $oEditorModel->getEditor($document_srl, $option); ///< 에디터코드를 받음
Context::set('editor', $editor); ///< 에디터코드를 editor라는 이름으로 세팅.
diff --git a/modules/guestbook/skins/default/comment.html b/modules/guestbook/skins/default/comment.html
index 929fb703e..441f5d69d 100644
--- a/modules/guestbook/skins/default/comment.html
+++ b/modules/guestbook/skins/default/comment.html
@@ -1,43 +1,66 @@
-
-
+
+
-
-
-
+ {@ $_comment_list = $document->getComments() }
+
-
+
+
-
-
-
-
-
-
-
-
-
-
- {@ $document_srl = $document->document_srl }
-
+
diff --git a/modules/guestbook/skins/default/comment_form.html b/modules/guestbook/skins/default/comment_form.html
index 9a68d8e01..46a55f4da 100644
--- a/modules/guestbook/skins/default/comment_form.html
+++ b/modules/guestbook/skins/default/comment_form.html
@@ -7,72 +7,98 @@
-
-
-
-
-
- | {$lang->date} |
- {$source_comment->regdate} |
-
-
- | {$lang->writer} |
- |
-
-
- | {$lang->content} |
- {$source_comment->content} |
-
-
+
+
+
+
+ {$source_comment->getRegdate('Y.m.d')} {$source_comment->getRegdate('H:i:s')}
+
+
+ ({$source_comment->get('ipaddress')})
+
+
+
+
+
+
+
+
+
+
+
{$lang->msg_is_secret}
+
+
+ {$source_comment->getContent(false)}
+
+
+
-
+
diff --git a/modules/guestbook/skins/default/css/guestbook.css b/modules/guestbook/skins/default/css/guestbook.css
index 41c4e7a47..d44618ada 100644
--- a/modules/guestbook/skins/default/css/guestbook.css
+++ b/modules/guestbook/skins/default/css/guestbook.css
@@ -1,28 +1,105 @@
@charset "utf-8";
-a { color:#555555; text-decoration:none; }
+/* guestbook Title */
+.guestbookHeader { border:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/bgH3.gif) repeat-x left bottom; overflow:hidden; _width:100%;}
+.guestbookHeader h3 { border-bottom:3px solid #fe3614; }
+.guestbookHeader h3 { float:left; font-size:1.2em; padding:1em 2em .7em 1.2em; background:#ffffff url(../images/lineH3.gif) no-repeat right bottom;}
-.titleBox { border:4px solid #EEEEEE; padding:.5em; margin-bottom:1em; }
-.titleBox .title { font-weight:bold; }
-.titleBox .memo { color:#888888; }
+/* guestbook Description */
+.guestbookDescription { color:#AEAEAE; border:1px solid #DDDDDD; overflow:hidden; padding:1em; margin-top:1em;}
-.info .status { float:left; overflow:hidden; }
-.info .link { float:right; overflow:hidden; }
+.guestbookInformation { width:100%; clear:both; margin:1em 0 .5em 0; overflow:hidden; color:#666666;}
-.write_form { padding:10px; margin:0px; border:3px solid #CCCCCC; margin-top:.5em; }
-.write_form table { border:0; padding:0; }
-.write_form td.option { text-align:right; padding:.3em; }
+.articleNum { float:left; padding:0 0 0 15px; }
-.document { padding:0; margin-top:1em; border:3px solid #EEEEEE; }
-.document .info { background-color:#EFEFEF; padding:.5em; }
-.document .subinfo { text-align:right; color:#CCCCCC;}
-.document .content { padding:1em; }
-.document .comment { padding:1em; }
+/* account Navigation */
+.accountNavigation { float:right; }
+.accountNavigation li { float:left; margin-left:7px; list-style:none; padding-top:3px;}
+.accountNavigation li a { font-size:12px; white-space:nowrap; color:#666666; text-decoration:none;}
+.accountNavigation li.setup a { background:url(../images/iconSetup.gif) no-repeat left top; padding-left:14px; }
+.accountNavigation li.admin a { background:url(../images/iconAdmin.gif) no-repeat left top; padding-left:12px; }
+.accountNavigation li.listType { margin-left:5px; }
+.accountNavigation li.loginAndLogout { background:url(../images/line_1x10_e0e0e0.gif) no-repeat left 5px; padding-left:8px; _padding-top:5px;}
+*:first-child+html li.loginAndLogout { padding-top:5px; }
-.comment_box { border:0; padding:.5em; border-top:1px solid #EEEEEE; margin:1em 0 1em 0;}
-.comment_box .comment_content { }
-.comment_box .comment_content .content { margin:1em 0 2em 0;}
-.comment_box .comment_content .comment_sub_info { float:left; }
-.comment_box .comment_content .button_area { float:right; }
-textarea.comment_form { border:1px solid #EEEEEE; width:90%;}
+/* pageNavigation */
+.pageNavigation { display:block; margin-top:1em; text-align:center; font:bold 11px Tahoma; margin-top:1.5em;}
+.pageNavigation a { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#666666; display:inline-block; padding:1px 7px 2px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; }
+.pageNavigation .current { position:relative; margin-left:-4px; font:bold 11px Tahoma; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; text-decoration:none; line-height:1em; }
+.pageNavigation a:hover { background:#F7F7F7; text-decoration:none; }
+.pageNavigation a:visited { color:#999999; }
+.pageNavigation a.goToFirst, .pageNavigation a.goToLast { border:none; border-right:1px solid #ffffff; border-left:1px solid #ffffff; z-index:99; vertical-align:top; padding:0px 7px 4px 6px;}
+.pageNavigation a.goToFirst img, .pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;}
+
+.boardWrite { border:1px solid #DDDDDD; background-color:#EFEFEF; overflow:hidden; position:relative; margin-bottom:20px; padding:.5em 0; }
+.boardWrite .inputTypeText { width:100px; }
+.boardWrite .userNameAndPw { margin-bottom:-1px; padding:.5em 0; margin-left:20px;}
+.boardWrite .boardEditor fieldset { width:auto; position:relative;}
+.boardWrite .option { margin-left:20px; padding:.5em 0; overflow:hidden; width:90%;}
+.boardWrite .option dd { float:left; margin-right:1em; padding-top:.2em; _padding-top:.1em;}
+.boardWrite .option dd * { vertical-align:middle;}
+.boardWrite .option dd select { width:7em; font-size:.95em;height:20px;}
+.boardWrite .inputTypeText { background:#fbfbfb;}
+
+.commentWrite { border:1px solid #EFEFEF; overflow:hidden; position:relative; margin-top:10px; margin-bottom:20px; padding:.5em 0; }
+.commentWrite .inputTypeText { width:100px; }
+.commentWrite .userNameAndPw { margin-bottom:-1px; padding:.5em 0; margin-left:20px;}
+.commentWrite .commentEditor fieldset { width:auto; position:relative; border:none;}
+.commentWrite .option { margin-left:20px; padding:.5em 0; overflow:hidden; width:90%;}
+.commentWrite .option dd { float:left; margin-right:1em; padding-top:.2em; _padding-top:.1em;}
+.commentWrite .option dd * { vertical-align:middle;}
+.commentWrite .option dd select { width:7em; font-size:.95em;height:20px;}
+.commentWrite .inputTypeText { background:#fbfbfb;}
+.commentWrite .editorBox { text-align:center; margin-bottom:10px;}
+.commentWrite .textarea { width:98%; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:8em; padding:.2em 0 0 .3em; background:#ffffff; font-size:1em; }
+
+.documentBox { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;}
+.documentBox .documentItem { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; list-style:none;}
+.documentBox p { display:inline; margin-bottom:1em;}
+.documentBox .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
+.documentBox .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
+.documentBox .voted { float:left; font-size:.9em; color:#AAAAAA; margin:0 .3em .5em 1em;}
+.documentBox .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
+
+.documentBox .documentOption { float:right; white-space:nowrap; margin-left:.2em;}
+.documentBox .documentOption img { vertical-align:middle;}
+
+.documentBox .documentContent { clear:left; }
+.documentBox .documentContent p { display:block; }
+.documentBox .documentContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;}
+.documentBox .documentContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;}
+.documentBox .document { background-color:#FAFAFA;}
+
+.smallBox { border:1px solid #e0e1db; margin-left:auto; margin-right:auto; }
+.smallBox.w268 { width:268px;}
+.smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;}
+.smallBox .header h3 { clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; }
+.smallBox .complex { padding:1.5em 2em 2em 2em;}
+.smallBox .inputPassword { position:relative; border:none; padding:2em 2em 1.5em 2em;}
+.smallBox .inputPassword .inputTypeText { float:left; margin-right:.5em; width:8em;}
+.smallBox .inputPassword legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;}
+
+
+.replyBox { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;}
+.replyBox .replyItem { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; list-style:none; border-bottom:1px dotted #e0e1db;}
+.replyBox p { display:inline; margin-bottom:1em;}
+.replyBox .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
+.replyBox .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
+.replyBox .voted { float:left; font-size:.9em; color:#AAAAAA; margin:0 .3em .5em 1em;}
+.replyBox .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
+
+.replyBox .replyOption { float:right; white-space:nowrap; margin-left:.2em;}
+.replyBox .replyOption img { vertical-align:middle;}
+
+.replyBox .replyContent { clear:left; }
+.replyBox .replyContent p { display:block; }
+.replyBox .replyContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;}
+.replyBox .replyContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;}
+.replyBox .reply { background-color:#FAFAFA;}
+.replyBox .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;}
+
+.replyBox .fileAttached { _width:99%; border:1px solid #eaeae7; overflow:hidden; background:#fbfbfb; margin-top:.3em; list-style:none;}
+.replyBox .fileAttached ul { float:left; padding:.3em 1em .2em 0; margin-left:.5em; _margin-left:.25em;}
+.replyBox .fileAttached li a { font-size:.9em; white-space:nowrap; position:relative; color:#444444; }
+.replyBox .fileAttached li a:visited { color:#777777;}
diff --git a/modules/guestbook/skins/default/delete_comment_form.html b/modules/guestbook/skins/default/delete_comment_form.html
index a3ed7cf27..e79019194 100644
--- a/modules/guestbook/skins/default/delete_comment_form.html
+++ b/modules/guestbook/skins/default/delete_comment_form.html
@@ -1,23 +1,25 @@
-
diff --git a/modules/guestbook/skins/default/delete_form.html b/modules/guestbook/skins/default/delete_form.html
index e0890106c..1ca638c93 100644
--- a/modules/guestbook/skins/default/delete_form.html
+++ b/modules/guestbook/skins/default/delete_form.html
@@ -1,27 +1,23 @@
-