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

issue 2367 remove outside page, widget page preview.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11904 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-26 02:51:22 +00:00
parent f87451e50f
commit 2783f921df
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
classes/module/ModuleObject.class.php
View file

@ -341,7 +341,8 @@
// integrate skin information of the module(change to sync skin info with the target module only by seperating its table) // integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
$is_default_skin = ((!Mobile::isFromMobilePhone() && $this->module_info->is_skin_fix == 'N') || (Mobile::isFromMobilePhone() && $this->module_info->is_mskin_fix == 'N')); $is_default_skin = ((!Mobile::isFromMobilePhone() && $this->module_info->is_skin_fix == 'N') || (Mobile::isFromMobilePhone() && $this->module_info->is_mskin_fix == 'N'));
if($is_default_skin && $this->module != 'admin' && strpos($this->act, 'Admin') === false) $usedSkinModule = !($this->module == 'page' && ($this->module_info->page_type == 'OUTSIDE' || $this->module_info->page_type == 'WIDGET'));
if($usedSkinModule && $is_default_skin && $this->module != 'admin' && strpos($this->act, 'Admin') === false)
{ {
$dir = (Mobile::isFromMobilePhone()) ? 'm.skins' : 'skins'; $dir = (Mobile::isFromMobilePhone()) ? 'm.skins' : 'skins';
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');

4
modules/menu/menu.admin.model.php
View file

@ -322,9 +322,13 @@
$moduleInfo->title = $pageTypeName['ARTICLE']; $moduleInfo->title = $pageTypeName['ARTICLE'];
$moduleInfoList['ARTICLE'] = $moduleInfo; $moduleInfoList['ARTICLE'] = $moduleInfo;
$wModuleInfo = clone $moduleInfo; $wModuleInfo = clone $moduleInfo;
unset($wModuleInfo->default_skin);
unset($wModuleInfo->default_mskin);
$wModuleInfo->title = $pageTypeName['WIDGET']; $wModuleInfo->title = $pageTypeName['WIDGET'];
$moduleInfoList['WIDGET'] = $wModuleInfo; $moduleInfoList['WIDGET'] = $wModuleInfo;
$oModuleInfo = clone $moduleInfo; $oModuleInfo = clone $moduleInfo;
unset($oModuleInfo->default_skin);
unset($oModuleInfo->default_mskin);
$oModuleInfo->title = $pageTypeName['OUTSIDE']; $oModuleInfo->title = $pageTypeName['OUTSIDE'];
$moduleInfoList['OUTSIDE'] = $oModuleInfo; $moduleInfoList['OUTSIDE'] = $oModuleInfo;
} }

4
modules/page/lang/lang.xml
View file

@ -11,6 +11,10 @@
<value xml:lang="tr"><![CDATA[Sayfa]]></value> <value xml:lang="tr"><![CDATA[Sayfa]]></value>
<value xml:lang="vi"><![CDATA[Trang]]></value> <value xml:lang="vi"><![CDATA[Trang]]></value>
</item> </item>
<item name="none_content">
<value xml:lang="ko"><![CDATA[내용이 없습니다.]]></value>
<value xml:lang="en"><![CDATA[This is empty page.]]></value>
</item>
<item name="about_page"> <item name="about_page">
<value xml:lang="ko"><![CDATA[하나의 완성된 페이지를 제작할 수 있는 페이지 모듈입니다. <value xml:lang="ko"><![CDATA[하나의 완성된 페이지를 제작할 수 있는 페이지 모듈입니다.
최근게시물이나 기타 위젯을 이용해서 동적인 페이지 생성이 가능하고 에디터 컴포넌트를 통해서 다양한 모습으로 꾸밀 수 있습니다. 최근게시물이나 기타 위젯을 이용해서 동적인 페이지 생성이 가능하고 에디터 컴포넌트를 통해서 다양한 모습으로 꾸밀 수 있습니다.

5
modules/page/skins/default/content.html
View file

@ -1,2 +1,7 @@
<block cond="$oDocument">
<h1 cond="$module_info->display_title != 'hide'">{$oDocument->getTitle()}</h1> <h1 cond="$module_info->display_title != 'hide'">{$oDocument->getTitle()}</h1>
{$oDocument->getContent($module_info->display_popupmenu != 'hide')} {$oDocument->getContent($module_info->display_popupmenu != 'hide')}
</block>
<block cond="!$oDocument">
{$lang->none_content}
</block>