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

merge sandbox to trunk for 1.4.4.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-30 07:01:36 +00:00
parent 9139515e57
commit f59deeb270
131 changed files with 11605 additions and 4218 deletions
Download patch file Download diff file Expand all files Collapse all files

1512
widgets/content/conf/info.xml
View file

File diff suppressed because it is too large Load diff

1
widgets/content/content.class.php
View file

@ -255,6 +255,7 @@
$content_item = new contentItem( $args->module_srls_info[$module_srl]->browser_title );
$content_item->adds($oDocument->getObjectVars());
$content_item->add('original_content', $oDocument->get('content'));
$content_item->setTitle($oDocument->getTitle());
$content_item->setCategory( $category_lists[$module_srl][$category_srl]->title );
$content_item->setDomain( $args->module_srls_info[$module_srl]->domain );

2
widgets/content/queries/getNewestDocuments.xml
View file

@ -6,7 +6,7 @@
<column name="*" />
</columns>
<conditions>
<condition operation="not_in" column="documents.module_srl" default="0" pipe="and" />
<condition operation="notin" column="documents.module_srl" default="0" pipe="and" />
<condition operation="in" column="documents.module_srl" var="module_srl" filter="number" notnull="notnull" pipe="and" />
</conditions>
<navigation>

7
widgets/content/skins/default/skin.xml
View file

@ -50,5 +50,12 @@
<title xml:lang="vi">Nền tối</title>
<title xml:lang="zh-TW">黑色背景</title>
</color>
<color name="layout">
<title xml:lang="ko">레이아웃에 맞춤</title>
<title xml:lang="jp">レイアウトに合わせる</title>
<title xml:lang="zh-CN">随布局</title>
<title xml:lang="en">레이아웃에 맞춤</title>
<title xml:lang="zh-TW">隨版面</title>
</color>
</colorset>
</skin>

2
widgets/language_select/language_select.class.php
View file

@ -18,6 +18,8 @@
// 템플릿의 스킨 경로를 지정 (skin, colorset에 따른 값을 설정)
$tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
$tpl_file = 'language_select';
Context::set('colorset', $args->colorset);
// 템플릿 컴파일
$oTemplate = &TemplateHandler::getInstance();