diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 7caa8577b..52f368ee0 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -715,7 +715,7 @@ function _getJsFile() { require_once("./classes/optimizer/Optimizer.class.php"); $oOptimizer = new Optimizer(); - return $oOptimizer->getOptimizedFiles($this->js_files, "js"); + return $oOptimizer->getOptimizedFiles(array_unique($this->js_files), "js"); } /** @@ -750,7 +750,7 @@ function _getCSSFile() { require_once("./classes/optimizer/Optimizer.class.php"); $oOptimizer = new Optimizer(); - return $oOptimizer->getOptimizedFiles($this->css_files, "css"); + return $oOptimizer->getOptimizedFiles(array_unique($this->css_files), "css"); } /** diff --git a/config/config.inc.php b/config/config.inc.php index c5e6e79b9..453cfab53 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -14,7 +14,7 @@ * 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며 * config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함 **/ - define('__ZBXE_VERSION__', '0.2.0'); + define('__ZBXE_VERSION__', '0.2.1'); /** * @brief 디버깅 메세지 출력 diff --git a/modules/board/board.view.php b/modules/board/board.view.php index a97638159..1d265fb7e 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -113,12 +113,6 @@ // 댓글에디터 설정 $this->setCommentEditor(0, 100); - // 만약 document_srl은 있는데 page가 없다면 글만 호출된 경우 page를 구해서 세팅해주자.. - if($document_srl && !$page && ($oDocument->isExists()&&!$oDocument->isNotice()) && !Context::get('category') && !Context::get('search_keyword')) { - $page = $oDocumentModel->getDocumentPage($document_srl, $this->module_srl, $this->list_count); - Context::set('page', $page); - } - // 목록을 구하기 위한 옵션 $args->module_srl = $this->module_srl; ///< 현재 모듈의 module_srl $args->page = $page; ///< 페이지 @@ -146,6 +140,14 @@ } } + // 만약 document_srl은 있는데 page가 없다면 글만 호출된 경우 page를 구해서 세팅해주자.. + if($document_srl && ($oDocument->isExists()&&!$oDocument->isNotice()) && !$args->category_srl && !$args->search_keyword && $args->sort_index == 'list_order' && $args->order_type == 'asc') { + $page = $oDocumentModel->getDocumentPage($document_srl, $this->module_srl, $this->list_count); + Context::set('page', $page); + $args->page = $page; + } + + // 목록 구함, document->getDocumentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다) $output = $oDocumentModel->getDocumentList($args); diff --git a/modules/board/skins/xe_gallery/css/common.css b/modules/board/skins/xe_gallery/css/common.css index 80a592e2f..ecf8347b9 100644 --- a/modules/board/skins/xe_gallery/css/common.css +++ b/modules/board/skins/xe_gallery/css/common.css @@ -189,7 +189,7 @@ Jeong, Chan Myeong 070601~070630 #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 li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none; } #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 { color:#3074a5; margin-right:.3em; text-decoration:none; } @@ -200,7 +200,8 @@ Jeong, Chan Myeong 070601~070630 #reply .replyContent { clear:left; } #reply .replyContent p { display:block; } -#reply .replyContent li { padding:0; border:none; line-height:1.25em; } +#reply .replyContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;} +#reply .replyContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;} #reply .reply { background-color:#FAFAFA;} #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} diff --git a/modules/board/skins/xe_gallery/header.html b/modules/board/skins/xe_gallery/header.html index 17d3a5dca..e442b748b 100644 --- a/modules/board/skins/xe_gallery/header.html +++ b/modules/board/skins/xe_gallery/header.html @@ -16,7 +16,7 @@ - + {@ $module_info->duration_new = 12 } diff --git a/modules/board/skins/xe_gallery/list.html b/modules/board/skins/xe_gallery/list.html index 1dce07363..30df0eec9 100644 --- a/modules/board/skins/xe_gallery/list.html +++ b/modules/board/skins/xe_gallery/list.html @@ -94,6 +94,7 @@ {@ $height = $module_info->thumbnail_height + 40; } +{@ $height += 20 } {@ $height += 25 } {@ $height += 25 } diff --git a/modules/board/skins/xe_list/css/common.css b/modules/board/skins/xe_list/css/common.css index 521575f3a..124ae6ee2 100644 --- a/modules/board/skins/xe_list/css/common.css +++ b/modules/board/skins/xe_list/css/common.css @@ -189,7 +189,7 @@ Jeong, Chan Myeong 070601~070630 #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 li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;} #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 { color:#3074a5; margin-right:.3em; text-decoration:none; } @@ -200,7 +200,8 @@ Jeong, Chan Myeong 070601~070630 #reply .replyContent { clear:left; } #reply .replyContent p { display:block; } -#reply .replyContent li { padding:0; border:none; line-height:1.25em; } +#reply .replyContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;} +#reply .replyContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;} #reply .reply { background-color:#FAFAFA;} #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} diff --git a/modules/board/skins/xe_list/header.html b/modules/board/skins/xe_list/header.html index 5e1bda72e..d3abc710f 100644 --- a/modules/board/skins/xe_list/header.html +++ b/modules/board/skins/xe_list/header.html @@ -16,7 +16,7 @@ - + {@ $module_info->duration_new = 12 } diff --git a/modules/board/skins/xe_webzine/css/common.css b/modules/board/skins/xe_webzine/css/common.css index 57fc2a75e..d86931918 100644 --- a/modules/board/skins/xe_webzine/css/common.css +++ b/modules/board/skins/xe_webzine/css/common.css @@ -59,7 +59,7 @@ Jeong, Chan Myeong 070601~070630 .boardList tr.notice td.notice { font-size:.9em; color:#999999; font-weight:bold; text-align:center;} .boardList td.thumb { padding:8px; width:145px; table-layout:fixed; white-space:nowrap;} .boardList td.thumb * { vertical-align:middle;} -.boardList td.title {padding-left:1em; height:1em; border-bottom:none;} +.boardList td.title {padding-left:1em; height:1em; } .boardList td.title strong.category { font-size:1em; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat right 3px; padding-right:.5em; margin-right:.5em;} .boardList td.title.bold { font-size:1.2em; font-weight:bold;} .boardList td.title.bold a { position:relative; top:.3em;} @@ -194,7 +194,7 @@ Jeong, Chan Myeong 070601~070630 #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 li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none; } #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 { color:#3074a5; margin-right:.3em; text-decoration:none; } @@ -205,7 +205,8 @@ Jeong, Chan Myeong 070601~070630 #reply .replyContent { clear:left; } #reply .replyContent p { display:block; } -#reply .replyContent li { padding:0; border:none; line-height:1.25em; } +#reply .replyContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;} +#reply .replyContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;} #reply .reply { background-color:#FAFAFA;} #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} diff --git a/modules/board/skins/xe_webzine/header.html b/modules/board/skins/xe_webzine/header.html index 268e27c2a..ad23fa71f 100644 --- a/modules/board/skins/xe_webzine/header.html +++ b/modules/board/skins/xe_webzine/header.html @@ -16,7 +16,7 @@ - + {@ $module_info->duration_new = 12 } diff --git a/modules/board/skins/xe_webzine/list.html b/modules/board/skins/xe_webzine/list.html index 6f3311deb..004a4220f 100644 --- a/modules/board/skins/xe_webzine/list.html +++ b/modules/board/skins/xe_webzine/list.html @@ -16,9 +16,9 @@ - - - + + + @@ -141,17 +141,16 @@ {zdate($document->get('last_update'),'Y-m-d H:i')} - {@ $_col_count = 7} + {@ $_col_count = 1} - {@ $_col_count = 8} + {@ $_col_count = 2} - {@ $_col_count --; } - {@ $_col_count --; } - {@ $_col_count --; } - {@ $_col_count --; } - {@ $_col_count --; } - {@ $_col_count --; } + {@ $_col_count ++; } + {@ $_col_count ++; } + {@ $_col_count ++; } + {@ $_col_count ++; } + {@ $_col_count ++; } {$document->getSummary(120)}  diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index 853399e66..e67204922 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -135,7 +135,7 @@ $oDB = &DB::getInstance(); $oDB->begin(); - for($i=0;$i=0;$i--) { $document_srl = $document_srl_list[$i]; $oDocument = $oDocumentModel->getDocument($document_srl); if(!$oDocument->isExists()) continue; @@ -202,13 +202,14 @@ $oDB = &DB::getInstance(); $oDB->begin(); - for($i=0;$i=0;$i--) { $document_srl = $document_srl_list[$i]; $oDocument = $oDocumentModel->getDocument($document_srl); if(!$oDocument->isExists()) continue; $obj = null; $obj = $oDocument->getObjectVars(); + $obj->module_srl = $module_srl; $obj->document_srl = getNextSequence(); $obj->category_srl = $category_srl; $obj->password_is_hashed = true; diff --git a/modules/document/document.item.php b/modules/document/document.item.php index e8304a02b..128abc5aa 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -29,7 +29,7 @@ } function setAttribute($attribute) { - if(!$attribute->document_srl || !$attribute->content) { + if(!$attribute->document_srl) { $this->document_srl = null; return; } diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js index ec123896e..2a3e5262b 100644 --- a/modules/document/tpl/js/document_admin.js +++ b/modules/document/tpl/js/document_admin.js @@ -37,6 +37,7 @@ function completeManageDocument(ret_obj) { /* 선택된 모듈의 카테고리 목록을 가져오는 함수 */ function doGetCategoryFromModule(obj) { + if(!obj) return; var module_srl = obj.options[obj.selectedIndex].value; var params = new Array(); diff --git a/modules/editor/components/quotation/tpl/popup.js b/modules/editor/components/quotation/tpl/popup.js index 74a77ac39..73c24bf22 100644 --- a/modules/editor/components/quotation/tpl/popup.js +++ b/modules/editor/components/quotation/tpl/popup.js @@ -15,6 +15,8 @@ function getQuotation() { var use_folder = node.getAttribute("use_folder"); var folder_opener = node.getAttribute("folder_opener"); var folder_closer = node.getAttribute("folder_closer"); + if(folder_opener) folder_opener = folder_opener.replace(/&/g,'&').replace(/>/g,'>').replace(/</,'<').replace(/"/,'"'); + if(folder_closer) folder_closer = folder_closer.replace(/&/g,'&').replace(/>/g,'>').replace(/</,'<').replace(/"/,'"'); var bold = node.getAttribute("bold"); var color = node.getAttribute("color"); var margin = node.getAttribute("margin"); @@ -84,6 +86,9 @@ function insertQuotation() { var folder_closer = xGetElementById("quotation_closer").value; if(!folder_opener||!folder_closer) use_folder = "N"; + folder_opener = folder_opener.replace(/&/g,'&').replace(/>/g,'>').replace(//g,'>').replace(/