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

fixed theme layouts error

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9409 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-09-28 09:42:10 +00:00
parent 793f301d5e
commit 6429e35567
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/admin/admin.admin.model.php
View file

@ -157,7 +157,6 @@
$theme_info[$val] = $this->getThemeInfo($val); $theme_info[$val] = $this->getThemeInfo($val);
} }
} }
debugPrint($theme_info);
return $theme_info; return $theme_info;
} }

1
modules/admin/tpl/theme.html
View file

@ -6,7 +6,6 @@ jQuery(function($){
var themes = {}; var themes = {};
<!--@foreach($theme_list as $key=>$val)--> <!--@foreach($theme_list as $key=>$val)-->
// Example - default theme
{@$skins = array()} {@$skins = array()}
<!--@foreach($val->skin_infos as $module=>$skin_info)--> <!--@foreach($val->skin_infos as $module=>$skin_info)-->
{@$skins[] = "'".$module."' : '".$skin_info->name."'";} {@$skins[] = "'".$module."' : '".$skin_info->name."'";}

9
modules/layout/layout.model.php
View file

@ -85,13 +85,14 @@
* @brief Get a layout path * @brief Get a layout path
**/ **/
function getLayoutPath($layout_name, $layout_type = "P") { function getLayoutPath($layout_name, $layout_type = "P") {
if($layout_name == 'faceoff'){ $layout_parse = explode('.', $layout_name);
if (count($layout_parse) > 1){
$class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/';
}else if($layout_name == 'faceoff'){
$class_path = './modules/layout/faceoff/'; $class_path = './modules/layout/faceoff/';
}else if($layout_type == "M") { }else if($layout_type == "M") {
$class_path = sprintf("./m.layouts/%s/", $layout_name); $class_path = sprintf("./m.layouts/%s/", $layout_name);
} }else {
else
{
$class_path = sprintf('./layouts/%s/', $layout_name); $class_path = sprintf('./layouts/%s/', $layout_name);
} }
if(is_dir($class_path)) return $class_path; if(is_dir($class_path)) return $class_path;