fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-25 14:19:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

beta.0.2.1을 trunk로 copy

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@2756 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2007-10-12 06:02:31 +00:00
commit f8a3d33c18
15 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/context/Context.class.php
View file

@ -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");
}
/**

2
config/config.inc.php
View file

@ -14,7 +14,7 @@
* 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며
* config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/
define('__ZBXE_VERSION__', '0.2.0');
define('__ZBXE_VERSION__', '0.2.1');
/**
* @brief 디버깅 메세지 출력

14
modules/board/board.view.php
View file

@ -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);

5
modules/board/skins/xe_gallery/css/common.css
View file

@ -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;}

2
modules/board/skins/xe_gallery/header.html
View file

@ -16,7 +16,7 @@
<!--@end-->
<!-- 스킨 설정중 새글의 시간 설정 값이 없으면 임의로 지정 -->
<!--@if(!$module_info->duration_new || !is_int($module_info->duration_new))-->
<!--@if(!$module_info->duration_new = (int)$module_info->duration_new)-->
{@ $module_info->duration_new = 12 }
<!--@end-->

1
modules/board/skins/xe_gallery/list.html
View file

@ -94,6 +94,7 @@
</table>
{@ $height = $module_info->thumbnail_height + 40; }
<!--@if($module_info->use_category=='Y')-->{@ $height += 20 }<!--@end-->
<!--@if($module_info->display_author!='N' || $module_info->display_regdate!='N')-->{@ $height += 25 }<!--@end-->
<!--@if($module_info->display_readed_count !='N' || $module_info->display_voted_count!='N')-->{@ $height += 25 }<!--@end-->

5
modules/board/skins/xe_list/css/common.css
View file

@ -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;}

2
modules/board/skins/xe_list/header.html
View file

@ -16,7 +16,7 @@
<!--@end-->
<!-- 스킨 설정중 새글의 시간 설정 값이 없으면 임의로 지정 -->
<!--@if(!$module_info->duration_new || !is_int($module_info->duration_new))-->
<!--@if(!$module_info->duration_new = (int)$module_info->duration_new)-->
{@ $module_info->duration_new = 12 }
<!--@end-->

7
modules/board/skins/xe_webzine/css/common.css
View file

@ -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;}

2
modules/board/skins/xe_webzine/header.html
View file

@ -16,7 +16,7 @@
<!--@end-->
<!-- 스킨 설정중 새글의 시간 설정 값이 없으면 임의로 지정 -->
<!--@if(!$module_info->duration_new || !is_int($module_info->duration_new))-->
<!--@if(!$module_info->duration_new = (int)$module_info->duration_new)-->
{@ $module_info->duration_new = 12 }
<!--@end-->

21
modules/board/skins/xe_webzine/list.html
View file

@ -16,9 +16,9 @@
<col width="{$module_info->thumbnail_width+20}" />
<col />
<!--@if($module_info->display_author!='N')--><col width="120" /><!--@end-->
<!--@if($module_info->display_readed_count!='N')--><col width="70" /><!--@end-->
<!--@if($module_info->display_voted_count!='N')--><col width="70" /><!--@end-->
<!--@if($module_info->display_regdate != 'N')--><col width="90" /><!--@end-->
<!--@if($module_info->display_readed_count!='N')--><col width="60" /><!--@end-->
<!--@if($module_info->display_voted_count!='N')--><col width="60" /><!--@end-->
<!--@if($module_info->display_regdate != 'N')--><col width="80" /><!--@end-->
<!--@if($module_info->display_last_update == 'Y')--><col width="90" /><!--@end-->
<thead>
<tr>
@ -141,17 +141,16 @@
<!--@if($module_info->display_last_update=='Y')--><td class="date">{zdate($document->get('last_update'),'Y-m-d H:i')}</td><!--@end-->
</tr>
<!--@if($document->thumbnailExists(100))-->
{@ $_col_count = 7}
{@ $_col_count = 1}
<!--@else-->
{@ $_col_count = 8}
{@ $_col_count = 2}
<!--@end-->
<!--@if($module_info->display_number=='N')-->{@ $_col_count --; }<!--@end-->
<!--@if($module_info->display_author=='N')-->{@ $_col_count --; }<!--@end-->
<!--@if($module_info->display_readed_count=='N')-->{@ $_col_count --; }<!--@end-->
<!--@if($module_info->display_voted_count=='N')-->{@ $_col_count --; }<!--@end-->
<!--@if($module_info->display_regdate=='N')-->{@ $_col_count --; }<!--@end-->
<!--@if($module_info->display_last_update=='N')-->{@ $_col_count --; }<!--@end-->
<!--@if($module_info->display_author!='N')-->{@ $_col_count ++; }<!--@end-->
<!--@if($module_info->display_readed_count!='N')-->{@ $_col_count ++; }<!--@end-->
<!--@if($module_info->display_voted_count!='N')-->{@ $_col_count ++; }<!--@end-->
<!--@if($module_info->display_regdate!='N')-->{@ $_col_count ++; }<!--@end-->
<!--@if($module_info->display_last_update=='Y')-->{@ $_col_count ++; }<!--@end-->
<tr class="bg{($no+1)%2+1}">
<td colspan="{$_col_count}" class="summary"><a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getSummary(120)}</a>&nbsp;</td>
</tr>

5
modules/document/document.admin.controller.php
View file

@ -135,7 +135,7 @@
$oDB = &DB::getInstance();
$oDB->begin();
for($i=0;$i<count($document_srl_list);$i++) {
for($i=count($document_srl_list)-1;$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<count($document_srl_list);$i++) {
for($i=count($document_srl_list)-1;$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;

2
modules/document/document.item.php
View file

@ -29,7 +29,7 @@
}
function setAttribute($attribute) {
if(!$attribute->document_srl || !$attribute->content) {
if(!$attribute->document_srl) {
$this->document_srl = null;
return;
}

1
modules/document/tpl/js/document_admin.js
View file

@ -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();

5
modules/editor/components/quotation/tpl/popup.js
View file

@ -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(/&amp;/g,'&').replace(/&gt;/g,'>').replace(/&lt;/,'<').replace(/&quot;/,'"');
if(folder_closer) folder_closer = folder_closer.replace(/&amp;/g,'&').replace(/&gt;/g,'>').replace(/&lt;/,'<').replace(/&quot;/,'"');
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,'&amp;').replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
folder_closer = folder_closer.replace(/&/g,'&amp;').replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
var bold = "N";
if(xGetElementById("quotation_bold").checked) bold = "Y";
var color = "blue";