git-svn-id: http://xe-core.googlecode.com/svn/trunk@1595 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/blog/blog.model.php

@@ -39,7 +39,7 @@
             Context::set('comment_srl', $upload_target_srl);
 
             // template 가져옴
-            $template_path = sprintf("%sskins/%s/",$this->module_path, $this->skin);
+            $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
 
             $oTemplate = &TemplateHandler::getInstance();
             $tpl = $oTemplate->compile($template_path, 'comment_form');

modules/blog/blog.view.php

@@ -189,7 +189,7 @@
             $option->enable_default_component = true;
             $option->enable_component = true;
             $option->resizable = true;
-            $option->height = 400;
+            $option->height = 600;
             $editor = $oEditorModel->getEditor($document_srl, $option);
             Context::set('editor', $editor);
 

modules/board/board.view.php

@@ -158,7 +158,7 @@
             $option->enable_default_component = true;
             $option->enable_component = true;
             $option->resizable = true;
-            $option->height = 400;
+            $option->height = 600;
             $editor = $oEditorModel->getEditor($document_srl, $option);
             Context::set('editor', $editor);
 

modules/board/skins/xe_list/comment_form.html

@@ -28,50 +28,45 @@
 <!--@end-->
 
 <!-- 글쓰기 폼 -->
-<form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" <!--@if($grant->fileupload)-->enctype="multipart/form-data"<!--@end-->>
+<div class="boardWrite">
-    <input type="hidden" name="mid" value="{$mid}" />
-    <input type="hidden" name="document_srl" value="{$document_srl?$document_srl:$comment->document_srl}" />
-    <input type="hidden" name="comment_srl" value="{$comment_srl}" />
-    <input type="hidden" name="content" value="{htmlspecialchars($comment->content)}" />
-    <input type="hidden" name="parent_srl" value="{$parent_srl}" />
 
-    <table width="100%" border="1">
+    <form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" <!--@if($grant->fileupload)-->enctype="multipart/form-data"<!--@end--> class="boardEditor" id="fo_comment_write" >
-    <col width="120" />
+        <fieldset>
-    <col width="*" />
+            <input type="hidden" name="mid" value="{$mid}" />
+            <input type="hidden" name="document_srl" value="{$document_srl?$document_srl:$comment->document_srl}" />
+            <input type="hidden" name="comment_srl" value="{$comment_srl}" />
+            <input type="hidden" name="content" value="{htmlspecialchars($comment->content)}" />
+            <input type="hidden" name="parent_srl" value="{$parent_srl}" />
 
-    <!--@if(!$is_logged)-->
+            <!--@if(!$is_logged)-->
-    <tr>
+            <div class="userNameAndPw">
-        <th>{$lang->writer}</th>
+                <label for="userName">{$lang->writer}</label>
-        <td><input type="text" name="nick_name" value="{htmlspecialchars($comment->nick_name)}" /></td>
+                <input type="text" name="nick_name" value="{$comment->nick_name}" class="userName inputTypeText" id="userName"/>
-    </tr>
-    <tr>
-        <th>{$lang->password}</th>
-        <td><input type="password" name="password" value="" /></td>
-    </tr>
-    <tr>
-        <th>{$lang->email_address}</th>
-        <td><input type="text" name="email_address" value="{htmlspecialchars($comment->email_address)}"/></td>
-    </tr>
-    <tr>
-        <th>{$lang->homepage}</th>
-        <td><input type="text" name="homepage" value="{htmlspecialchars($comment->homepage)}" /></td>
-    </tr>
-    <!--@end-->
 
-    <tr>
+                <label for="userPw">{$lang->password}</label>
-        <td colspan="2">{$comment_editor}</td>
+                <input type="password" name="password" value="" id="userPw" class="userPw inputTypeText" />
-    </tr>
+
-    <tr>
+                <label for="emailAddress">{$lang->email_address}</label>
-        <td colspan="2">
+                <input type="text" name="email_address" value="{htmlspecialchars($comment->email_address)}" id="emailAddress" class="emailAddress inputTypeText"/>
+
+                <label for="homePage">{$lang->homepage}</label>
+                <input type="text" name="homepage" value="{htmlspecialchars($comment->homepage)}" id="homePage" class="homePage inputTypeText"/>
+            </div>
+            <!--@end-->
+
+            <div>{$comment_editor}</div>
+
+        </fieldset>
+
+        <div class="buttonWrite">
             <!--@if($act&&$act!='dispBoardContent')-->
                 <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('act','')}'" />
             <!--@end-->
+            <a href="#" onclick="doCommentSubmit();return false;" class="buttonTypeA" accesskey="s"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->cmd_registration}<img src="./images/blank.gif" alt="" class="rightCap" /></a>
+        </div>
 
-            <input type="submit" value="{$lang->cmd_registration}" accesskey="s" />
+    </form>
-        </td>
+</div>
-    </tr>
-    </table>
-</form>
 
 <!--@if($source_comment)-->
     <!--#include("footer.html")-->

modules/board/skins/xe_list/js/board.js

@@ -20,7 +20,7 @@ function doAddCart(mid, obj) {
 /* 글쓰기 submit */
 function doSubmit() {
     var fo_obj = xGetElementById('fo_write');
-    procFilter(fo_write, insert);
+    procFilter(fo_obj, insert);
 }
 
 /* 글쓰기 작성후 */
@@ -79,6 +79,12 @@ function completeReload(ret_obj) {
     location.href = location.href;
 }
 
+/* 댓글쓰기 submit */
+function doCommentSubmit() {
+    var fo_obj = xGetElementById('fo_comment_write');
+    procFilter(fo_obj, insert);
+}
+
 /* 댓글 글쓰기 작성후 */
 function completeInsertComment(ret_obj) {
     var error = ret_obj['error'];

modules/board/skins/xe_list/write_form.html

@@ -90,7 +90,7 @@
         </fieldset>
 
         <div class="buttonWrite">
-            <a href="#" onclick="doSubmit();return false;" class="buttonTypeA"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->cmd_registration}<img src="./images/blank.gif" alt="" class="rightCap" /></a>
+            <a href="#" onclick="doSubmit();return false;" class="buttonTypeA" accesskey="s"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->cmd_registration}<img src="./images/blank.gif" alt="" class="rightCap" /></a>
         </div>
 
     </form>

modules/editor/editor.class.php

@@ -24,10 +24,10 @@
             $oEditorController->insertComponent('url_link',true);
             $oEditorController->insertComponent('image_link',true);
             $oEditorController->insertComponent('multimedia_link',true);
-            $oEditorController->insertComponent('poll_maker',true);
             $oEditorController->insertComponent('quotation',true);
-            $oEditorController->insertComponent('image_gallery',true);
             $oEditorController->insertComponent('table_maker',true);
+            $oEditorController->insertComponent('poll_maker',true);
+            $oEditorController->insertComponent('image_gallery',true);
 
             // 에디터 모듈에서 사용할 디렉토리 생성
             FileHandler::makeDir('./files/cache/editor');

plugins/newest_comment/skins/blog_newest_comment/list.html

@@ -16,7 +16,7 @@
         <div class="comment_box">
             <!--@foreach($plugin_info->comment_list as $val)-->
             <div class="comment">
-                <a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}">{cut_str(strip_tags($val->content),13,'...')}</a>
+                <a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}">{htmlspecialchars(cut_str(strip_tags($val->content),13,'...'))}</a>
                 <!--@if($val->member_srl)-->
                     <span class="member_{$val->member_srl} writer">{$val->nick_name}</span>
                 <!--@else-->

plugins/newest_document/skins/blog_newest_document/list.html

@@ -16,7 +16,7 @@
         <div class="document_box">
             <!--@foreach($plugin_info->document_list as $val)-->
             <div class="document">
-                <a href="{getUrl('','document_srl',$val->document_srl)}#{$val->comment_count}">{cut_str($val->title,20)}</a>
+                <a href="{getUrl('','document_srl',$val->document_srl)}#{$val->comment_count}">{htmlspecialchars(cut_str($val->title,20))}</a>
                 <!--@if($val->comment_count)-->
                 &nbsp;<span class="comment"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_top_{$val->document_srl}">*{$val->comment_count}</a></span>
                 <!--@end-->

plugins/newest_document/skins/default/list.html

@@ -20,7 +20,7 @@
         <!--@foreach($plugin_info->document_list as $val)-->
         <div class="document_box">
             <div class="document">
-                <a href="{getUrl('','document_srl',$val->document_srl)}#{$val->comment_count}">{cut_str($val->title,20)}</a>
+                <a href="{getUrl('','document_srl',$val->document_srl)}#{$val->comment_count}">{htmlspecialchars(cut_str($val->title,20))}</a>
                 <!--@if($val->comment_count)-->
                 <span class="comment"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_top_{$val->document_srl}">( {$val->comment_count} )</a></span>
                 <!--@end-->