molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

主题目录结构变更，把目录结构精简一层

Browse Source
This commit is contained in:
molong
2016-11-29 20:16:55 +08:00
parent cca25f560b
commit 9d41fbd5e9
39 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/common/controller/Fornt.php
View File

@@ -36,9 +36,9 @@ class Fornt extends Base {
protected function setThemes() {
//网站主题设置
$themes['mobile'] = config('mobile_themes') ? config('mobile_themes') : 'default';
$themes['mobile'] = config('mobile_themes') ? config('mobile_themes') : 'mobile';
$themes['pc'] = config('pc_themes') ? config('pc_themes') : 'default';
$view_path = $this->isMobile() ? 'template/mobile/' . $themes['mobile'] . '/' : 'template/pc/' . $themes['pc'] . '/';
$view_path = $this->isMobile() ? 'template/' . $themes['mobile'] . '/' : 'template/' . $themes['pc'] . '/';
$module = $this->request->module();
if (!in_array($module, array('index', 'install'))) {
$view_path_pre = $module . '/';

12
application/common/model/Config.php
View File

@@ -80,16 +80,20 @@ class Config extends Base{
}
protected function getList($type){
$path = ROOT_PATH . 'template/' . $type . '/';
$path = ROOT_PATH . 'template/';
$file = opendir($path);
while (false !== ($filename = readdir($file))) {
if (!in_array($filename, array('.', '..'))) {
$files = $path . $filename . '/info.php';
if (is_file($files)) {
$info = include($files);
$info['id'] = $filename;
$info['img'] = '/template/' . $type . '/' . $filename . '/' . $info['img'];
$list[] = $info;
if ($info['type'] == $type) {
$info['id'] = $filename;
$info['img'] = '/template/' . $filename . '/' . $info['img'];
$list[] = $info;
}else{
continue;
}
}
}
}