diff --git a/modules/blog/blog.controller.php b/modules/blog/blog.controller.php index 6678d83dd..42a723be4 100644 --- a/modules/blog/blog.controller.php +++ b/modules/blog/blog.controller.php @@ -108,6 +108,18 @@ // comment_srl이 존재하는지 체크 $comment = $oCommentModel->getComment($obj->comment_srl, $this->grant->manager); + // 줄바꾸임나 태그제거등의 작업 + $obj->content = nl2br(strip_tags($obj->content)); + + /** + * 존재하는 댓글인지를 확인하여 존재 하지 않는 댓글이라면 신규로 등록하기 위해서 comment_srl의 sequence값을 받는다 + **/ + if(!$obj->comment_srl) { + $obj->comment_srl = getNextSequence(); + } else { + $comment = $oCommentModel->getComment($obj->comment_srl, $this->grant->manager); + } + // comment_srl이 없을 경우 신규 입력 if($comment->comment_srl != $obj->comment_srl) { diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php index 782b90f09..1e7cf38dd 100644 --- a/modules/blog/blog.view.php +++ b/modules/blog/blog.view.php @@ -96,7 +96,7 @@ Context::setBrowserTitle($oDocument->getTitleText()); // 댓글에디터 설정 - if($this->grant->write_comment && $oDocument->allowComment() && !$oDocument->isLocked()) $this->setCommentEditor(0, 100); + //if($this->grant->write_comment && $oDocument->allowComment() && !$oDocument->isLocked()) $this->setCommentEditor(0, 100); // 조회수 증가 $oDocument->updateReadedCount(); @@ -106,7 +106,7 @@ Context::set('oDocument', $oDocument); // 댓글 - $this->setCommentEditor(0, 100); + //$this->setCommentEditor(0, 100); // 만약 document_srl은 있는데 page가 없다면 글만 호출된 경우 page를 구해서 세팅해주자.. if($document_srl && !$page) { @@ -256,7 +256,7 @@ Context::set('source_comment',$source_comment); // 댓글 에디터 세팅 - $this->setCommentEditor(0,400); + //$this->setCommentEditor(0,400); $this->setTemplateFile('comment_form'); } @@ -292,7 +292,7 @@ Context::set('comment', $comment); // 댓글 에디터 세팅 - $this->setCommentEditor($comment_srl,400); + //$this->setCommentEditor($comment_srl,400); $this->setTemplateFile('comment_form'); } @@ -362,6 +362,7 @@ * 따라서 고유값이 없을 경우 고유값을 가져와서 지정해 주어야 함 **/ function setCommentEditor($comment_srl=0, $height = 100) { + return; if(!$comment_srl) { $comment_srl = getNextSequence(); Context::set('comment_srl', $comment_srl); diff --git a/modules/blog/skins/default/comment_form.html b/modules/blog/skins/default/comment_form.html index 9191fe733..2506a0652 100644 --- a/modules/blog/skins/default/comment_form.html +++ b/modules/blog/skins/default/comment_form.html @@ -32,7 +32,6 @@ - @@ -59,7 +58,7 @@ - +
{$comment_editor}
diff --git a/modules/blog/skins/xe_blog/comment.html b/modules/blog/skins/xe_blog/comment.html index 9ae8270ba..acf94db03 100644 --- a/modules/blog/skins/xe_blog/comment.html +++ b/modules/blog/skins/xe_blog/comment.html @@ -1,7 +1,7 @@ -
    +
      diff --git a/modules/blog/skins/xe_blog/comment_form.html b/modules/blog/skins/xe_blog/comment_form.html index b2a13bcb2..16d4d5f0a 100644 --- a/modules/blog/skins/xe_blog/comment_form.html +++ b/modules/blog/skins/xe_blog/comment_form.html @@ -7,7 +7,7 @@ -
        +
        • {htmlspecialchars($source_comment->nick_name)}
          @@ -32,7 +32,6 @@ - @@ -51,13 +50,15 @@
          -
          {$comment_editor}
          +
          + +
          + +
          +
          -
          - -
          diff --git a/modules/blog/skins/xe_blog/css/white.css b/modules/blog/skins/xe_blog/css/white.css index 5ddb8e00c..e40c73924 100644 --- a/modules/blog/skins/xe_blog/css/white.css +++ b/modules/blog/skins/xe_blog/css/white.css @@ -178,19 +178,19 @@ Jeong, Chan Myeong 070601~070630 #trackbacks address a { font-size:.9em; color:#3074a5; margin-right:.3em; float:left;} #trackbacks address .date { font:.8em Tahoma; color:#cccccc; float:right;} -#reply { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;} -#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE;} -#reply p { display:inline; margin-bottom:1em;} -#reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} -#reply .author a { font-size:.9em; color:#3074a5; margin-right:.3em;} -#reply .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;} +ul.replyZone { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;} +ul.replyZone li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE;} +ul.replyZone p { display:inline; margin-bottom:1em;} +ul.replyZone .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} +ul.replyZone .author a { font-size:.9em; color:#3074a5; margin-right:.3em;} +ul.replyZone .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;} -#reply .replyOption { float:right; white-space:nowrap; margin-left:.2em;} -#reply .replyOption img { vertical-align:middle;} +ul.replyZone .replyOption { float:right; white-space:nowrap; margin-left:.2em;} +ul.replyZone .replyOption img { vertical-align:middle;} -#reply .replyContent { clear:left; } -#reply .reply { background-color:#FAFAFA;} -#reply .replyIndent { background:url(../images/white/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} +ul.replyZone .replyContent { clear:left; } +ul.replyZone .reply { background-color:#FAFAFA;} +ul.replyZone .replyIndent { background:url(../images/white/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} #reply li .fileAttached { _width:100%; border:1px solid #eaeae7; overflow:hidden; background:#fbfbfb; margin-top:.3em;} #reply li .fileAttached ul { float:left; padding:.3em 1em .2em 0; margin-left:.5em; _margin-left:.25em;} @@ -202,8 +202,8 @@ Jeong, Chan Myeong 070601~070630 .boardEditor { padding:.5em 0 1em 0; width:100%; overflow:hidden;} .boardEditor.reply { padding:.5em 1em 1em 1em; width:auto; overflow:hidden;} .boardEditor legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em;} -.boardEditor fieldset { _width:100%; border:1px solid #eaeae7; border-top:none;} -.boardEditor .userNameAndPw { position:relative; background:#fbfbfb; border-top:1px solid #eaeae7; border-bottom:1px solid #e1e1e1; padding:.5em 1em; white-space:nowrap;} +.boardEditor fieldset { _width:100%; border:1px solid #eaeae7; } +.boardEditor .userNameAndPw { position:relative; padding:.5em 1em; white-space:nowrap;} .boardEditor .userNameAndPw * { vertical-align:middle;} .boardEditor .userNameAndPw label { margin-right:.2em; color:#666760;} .boardEditor .userNameAndPw input { color:#aaaaaa;} @@ -213,6 +213,8 @@ Jeong, Chan Myeong 070601~070630 .boardEditor .userNameAndPw .homePage { width:6em;} .boardEditor .userNameAndPw .checkSecret { position:absolute; right:2em; top:.7em;} .boardEditor .buttonReply { position:relative; float:left; left:50%; margin:.5em 0 0 -2em; _padding-bottom:1em;} +.boardEditor .commentForm { width:100%; padding-bottom:.5em;} +.boardEditor .commentForm textarea { width:632px; margin:.3em; height:100px;} /* boardWrite */ .boardWrite { width:100%; position:relative;}