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

Merge branch 'release/1.7.8' into develop

Browse source
This commit is contained in:
bnu 2014-11-24 16:30:02 +09:00
commit d4e10dd338
16 changed files with 75 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/layout/layout.admin.controller.php
View file

@ -289,7 +289,7 @@ class layoutAdminController extends layout
{
$oLayoutModel = getModel('layout');
if(!$force)
if($force)
{
$layoutInfo = $oLayoutModel->getLayout($layout_srl);
if($layoutInfo)

25
modules/layout/layout.admin.model.php
View file

@ -111,23 +111,20 @@ class layoutAdminModel extends layout
}
// Get Layout Code
$oLayoutModel = getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
if(!file_exists($layout_file))
if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
{
// If faceoff
if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
{
$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
}
else
{
$layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
}
$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
$layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
}
else
{
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
}
$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
if(file_exists($layout_css_file))
{
$layout_code_css = FileHandler::readFile($layout_css_file);

24
modules/layout/layout.admin.view.php
View file

@ -237,22 +237,20 @@ class layoutAdminView extends layout
if(!$layout_info) return $this->dispLayoutAdminInstalledList();
// Get Layout Code
$oLayoutModel = getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
if(!file_exists($layout_file))
if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
{
// If faceoff
if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
{
$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
}
else
{
$layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
}
$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
$layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
}
else
{
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
}
$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
if(file_exists($layout_css_file))
{
$layout_code_css = FileHandler::readFile($layout_css_file);

8
modules/layout/tpl/layout_edit.html
View file

@ -67,9 +67,9 @@
<input type="hidden" name="xe_validator_id" value="modules/layouts/tpl/layout_edit/1" />
<section class="section">
<h1>HTML</h1>
<h1>HTML<small> - layout.html</small></h1>
<div style="margin-right:14px">
<textarea name="code" rows="8" cols="42" style="width:100%;height:300px;font:12px 'Courier New', Courier, monospace">{$layout_code}</textarea>
<textarea name="code" rows="8" cols="42" style="width:100%;height:300px;font:12px 'DejaVu Sans Mono', monospace;">{$layout_code}</textarea>
</div>
<div>
<block loop="$widget_list => $widget"> <i>|</i> <a href="{getUrl('','module','admin','act','dispWidgetAdminGenerateCode','selected_widget',$widget->widget)}" target="_blank">{$widget->title}</a></block>
@ -77,9 +77,9 @@
</section>
<section class="section">
<h1>CSS</h1>
<h1>CSS<small> - layout.css</small></h1>
<div style="margin-right:14px">
<textarea name="code_css" rows="8" cols="42" style="width:100%;height:300px;font:12px 'Courier New', Courier, monospace">{$layout_code_css}</textarea>
<textarea name="code_css" rows="8" cols="42" style="width:100%;height:300px;font:12px 'DejaVu Sans Mono', monospace;">{$layout_code_css}</textarea>
</div>
</section>

14
modules/layout/tpl/layout_html_css_view.html
View file

@ -55,12 +55,12 @@
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="act" value="procLayoutAdminCodeUpdate" />
<textarea name="code_css" rows="8" cols="42" style="display:none;width:100%;height:300px;font:12px 'Courier New', Courier, monospace">{$layout_code_css}</textarea>
<textarea name="code_css" rows="8" cols="42" style="display:none;">{$layout_code_css}</textarea>
<section class="section">
<h1>HTML</h1>
<h1>HTML<small> - layout.html</small></h1>
<div style="margin-right:14px">
<textarea name="code" rows="8" cols="42" style="width:100%;height:300px;font:12px 'Courier New', Courier, monospace">{$layout_code}</textarea>
<textarea name="code" rows="8" cols="42" style="width:100%; height:300px; font:12px 'DejaVu Sans Mono', monospace;">{$layout_code}</textarea>
</div>
<div>
<block loop="$widget_list => $widget"> <i class="vr">|</i> <a href="{getUrl('','module','admin','act','dispWidgetAdminGenerateCode','selected_widget',$widget->widget)}" target="_blank">{$widget->title}</a></block>
@ -79,12 +79,12 @@
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="act" value="procLayoutAdminCodeUpdate" />
<textarea name="code" rows="8" cols="42" style="display:none;width:100%;height:300px;font:12px 'Courier New', Courier, monospace">{$layout_code}</textarea>
<textarea name="code" rows="8" cols="42" style="display:none;">{$layout_code}</textarea>
<section class="section">
<h1>CSS</h1>
<h1>CSS<small> - layout.css</small></h1>
<div style="margin-right:14px">
<textarea name="code_css" rows="8" cols="42" style="width:100%;height:300px;font:12px 'Courier New', Courier, monospace">{$layout_code_css}</textarea>
<textarea name="code_css" rows="8" cols="42" style="width:100%; height:300px; font:12px 'DejaVu Sans Mono', monospace;">{$layout_code_css}</textarea>
</div>
</section>