From 5ba5ad347207aabb7f3f74d91c07bbcf4f83c6b3 Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Mon, 7 Mar 2022 15:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/install/config.cache.inc.php                          | 2 +-
 src/install/sql-dfdata.txt                                | 2 +-
 src/system/common.inc.php                                 | 2 +-
 src/theme/{muban => templets}/advancedsearch.htm          | 0
 src/theme/{muban => templets}/article_article.htm         | 0
 src/theme/{muban => templets}/article_default.htm         | 0
 src/theme/{muban => templets}/article_default_sg.htm      | 0
 src/theme/{muban => templets}/article_image.htm           | 0
 src/theme/{muban => templets}/article_infos.htm           | 0
 src/theme/{muban => templets}/article_shop.htm            | 0
 src/theme/{muban => templets}/article_soft.htm            | 0
 src/theme/{muban => templets}/article_spec.htm            | 0
 src/theme/{muban => templets}/footer.htm                  | 0
 src/theme/{muban => templets}/googlemap.htm               | 0
 src/theme/{muban => templets}/header.htm                  | 0
 src/theme/{muban => templets}/index.htm                   | 0
 src/theme/{muban => templets}/index_article.htm           | 0
 src/theme/{muban => templets}/index_default.htm           | 0
 src/theme/{muban => templets}/index_default_sg.htm        | 0
 src/theme/{muban => templets}/index_image.htm             | 0
 src/theme/{muban => templets}/index_infos.htm             | 0
 src/theme/{muban => templets}/index_shop.htm              | 0
 src/theme/{muban => templets}/index_soft.htm              | 0
 src/theme/{muban => templets}/list_article.htm            | 0
 src/theme/{muban => templets}/list_default.htm            | 0
 src/theme/{muban => templets}/list_default_sg.htm         | 0
 src/theme/{muban => templets}/list_free.htm               | 0
 src/theme/{muban => templets}/list_image.htm              | 0
 src/theme/{muban => templets}/list_infos.htm              | 0
 src/theme/{muban => templets}/list_shop.htm               | 0
 src/theme/{muban => templets}/list_soft.htm               | 0
 src/theme/{muban => templets}/list_spec.htm               | 0
 src/theme/{muban => templets}/navbar.htm                  | 0
 src/theme/{muban => templets}/search.htm                  | 0
 src/theme/{muban => templets}/singlepage.htm              | 0
 src/theme/{muban => templets}/tag.htm                     | 0
 src/theme/{muban => templets}/taglist.htm                 | 0
 src/theme/{muban => templets}/top.htm                     | 0
 src/theme/{muban => templets}/widget_article_digg.htm     | 0
 src/theme/{muban => templets}/widget_article_feedback.htm | 0
 src/theme/{muban => templets}/widget_channels.htm         | 0
 src/theme/{muban => templets}/widget_hot.htm              | 0
 src/theme/{muban => templets}/widget_hot_sg.htm           | 0
 src/theme/{muban => templets}/widget_qrcode.htm           | 0
 src/theme/{muban => templets}/widget_recommend.htm        | 0
 src/theme/{muban => templets}/widget_recommend_sg.htm     | 0
 src/theme/{muban => templets}/widget_vote.htm             | 0
 47 files changed, 3 insertions(+), 3 deletions(-)
 rename src/theme/{muban => templets}/advancedsearch.htm (100%)
 rename src/theme/{muban => templets}/article_article.htm (100%)
 rename src/theme/{muban => templets}/article_default.htm (100%)
 rename src/theme/{muban => templets}/article_default_sg.htm (100%)
 rename src/theme/{muban => templets}/article_image.htm (100%)
 rename src/theme/{muban => templets}/article_infos.htm (100%)
 rename src/theme/{muban => templets}/article_shop.htm (100%)
 rename src/theme/{muban => templets}/article_soft.htm (100%)
 rename src/theme/{muban => templets}/article_spec.htm (100%)
 rename src/theme/{muban => templets}/footer.htm (100%)
 rename src/theme/{muban => templets}/googlemap.htm (100%)
 rename src/theme/{muban => templets}/header.htm (100%)
 rename src/theme/{muban => templets}/index.htm (100%)
 rename src/theme/{muban => templets}/index_article.htm (100%)
 rename src/theme/{muban => templets}/index_default.htm (100%)
 rename src/theme/{muban => templets}/index_default_sg.htm (100%)
 rename src/theme/{muban => templets}/index_image.htm (100%)
 rename src/theme/{muban => templets}/index_infos.htm (100%)
 rename src/theme/{muban => templets}/index_shop.htm (100%)
 rename src/theme/{muban => templets}/index_soft.htm (100%)
 rename src/theme/{muban => templets}/list_article.htm (100%)
 rename src/theme/{muban => templets}/list_default.htm (100%)
 rename src/theme/{muban => templets}/list_default_sg.htm (100%)
 rename src/theme/{muban => templets}/list_free.htm (100%)
 rename src/theme/{muban => templets}/list_image.htm (100%)
 rename src/theme/{muban => templets}/list_infos.htm (100%)
 rename src/theme/{muban => templets}/list_shop.htm (100%)
 rename src/theme/{muban => templets}/list_soft.htm (100%)
 rename src/theme/{muban => templets}/list_spec.htm (100%)
 rename src/theme/{muban => templets}/navbar.htm (100%)
 rename src/theme/{muban => templets}/search.htm (100%)
 rename src/theme/{muban => templets}/singlepage.htm (100%)
 rename src/theme/{muban => templets}/tag.htm (100%)
 rename src/theme/{muban => templets}/taglist.htm (100%)
 rename src/theme/{muban => templets}/top.htm (100%)
 rename src/theme/{muban => templets}/widget_article_digg.htm (100%)
 rename src/theme/{muban => templets}/widget_article_feedback.htm (100%)
 rename src/theme/{muban => templets}/widget_channels.htm (100%)
 rename src/theme/{muban => templets}/widget_hot.htm (100%)
 rename src/theme/{muban => templets}/widget_hot_sg.htm (100%)
 rename src/theme/{muban => templets}/widget_qrcode.htm (100%)
 rename src/theme/{muban => templets}/widget_recommend.htm (100%)
 rename src/theme/{muban => templets}/widget_recommend_sg.htm (100%)
 rename src/theme/{muban => templets}/widget_vote.htm (100%)

diff --git a/src/install/config.cache.inc.php b/src/install/config.cache.inc.php
index 990bb5fe..019fa85a 100755
--- a/src/install/config.cache.inc.php
+++ b/src/install/config.cache.inc.php
@@ -23,7 +23,7 @@ $cfg_replacestr = '他妈的|TMD|傻逼|贱人';
 $cfg_feedbackcheck = 'N';
 $cfg_keyword_replace = 'Y';
 $cfg_fck_xhtml = 'N';
-$cfg_df_style = 'muban';
+$cfg_df_style = 'templets';
 $cfg_multi_site = 'N';
 $cfg_dede_log = 'N';
 $cfg_powerby = 'Copyright &copy; 2022 DedeBIZ 版权所有';
diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt
index 2b492be0..e440e8c6 100755
--- a/src/install/sql-dfdata.txt
+++ b/src/install/sql-dfdata.txt
@@ -3964,7 +3964,7 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点网址（http://域
 ('21','cfg_feedbackcheck','是否需审核评论及留言','5','bool','Y'),
 ('22','cfg_keyword_replace','是否使用关键字替换功能，开启影响文档生成速度','2','bool','Y'),
 ('23','cfg_fck_xhtml','是否使用富文本XHTML','1','bool','N'),
-('24','cfg_df_style','网站模板默认风格','1','string','muban'),
+('24','cfg_df_style','网站模板默认风格','1','string','templets'),
 ('25','cfg_multi_site','是否支持多站点，开启此项后附件栏目连接arclist内容启用绝对网址','2','bool','N'),
 ('58','cfg_rm_remote','远程图片本地化','7','bool','Y'),
 ('27','cfg_dede_log','是否开启管理日志','2','bool','N'),
diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index fd501400..05a4ff9f 100755
--- a/src/system/common.inc.php
+++ b/src/system/common.inc.php
@@ -161,7 +161,7 @@ if ($cfg_multi_site == 'Y') {
 //模板的存放目录
 $cfg_templets_dir = $cfg_cmspath.'/theme';
 $cfg_templeturl = $cfg_mainsite.$cfg_templets_dir;
-$cfg_templets_skin = empty($cfg_df_style) ? $cfg_mainsite.$cfg_templets_dir."/muban" : $cfg_mainsite.$cfg_templets_dir."/$cfg_df_style";
+$cfg_templets_skin = empty($cfg_df_style) ? $cfg_mainsite.$cfg_templets_dir."/templets" : $cfg_mainsite.$cfg_templets_dir."/$cfg_df_style";
 //cms安装目录的网址
 $cfg_cmsurl = $cfg_mainsite.$cfg_cmspath;
 //插件目录，这个目录是用于存放计数器、投票、评论等程序的必要动态程序
diff --git a/src/theme/muban/advancedsearch.htm b/src/theme/templets/advancedsearch.htm
similarity index 100%
rename from src/theme/muban/advancedsearch.htm
rename to src/theme/templets/advancedsearch.htm
diff --git a/src/theme/muban/article_article.htm b/src/theme/templets/article_article.htm
similarity index 100%
rename from src/theme/muban/article_article.htm
rename to src/theme/templets/article_article.htm
diff --git a/src/theme/muban/article_default.htm b/src/theme/templets/article_default.htm
similarity index 100%
rename from src/theme/muban/article_default.htm
rename to src/theme/templets/article_default.htm
diff --git a/src/theme/muban/article_default_sg.htm b/src/theme/templets/article_default_sg.htm
similarity index 100%
rename from src/theme/muban/article_default_sg.htm
rename to src/theme/templets/article_default_sg.htm
diff --git a/src/theme/muban/article_image.htm b/src/theme/templets/article_image.htm
similarity index 100%
rename from src/theme/muban/article_image.htm
rename to src/theme/templets/article_image.htm
diff --git a/src/theme/muban/article_infos.htm b/src/theme/templets/article_infos.htm
similarity index 100%
rename from src/theme/muban/article_infos.htm
rename to src/theme/templets/article_infos.htm
diff --git a/src/theme/muban/article_shop.htm b/src/theme/templets/article_shop.htm
similarity index 100%
rename from src/theme/muban/article_shop.htm
rename to src/theme/templets/article_shop.htm
diff --git a/src/theme/muban/article_soft.htm b/src/theme/templets/article_soft.htm
similarity index 100%
rename from src/theme/muban/article_soft.htm
rename to src/theme/templets/article_soft.htm
diff --git a/src/theme/muban/article_spec.htm b/src/theme/templets/article_spec.htm
similarity index 100%
rename from src/theme/muban/article_spec.htm
rename to src/theme/templets/article_spec.htm
diff --git a/src/theme/muban/footer.htm b/src/theme/templets/footer.htm
similarity index 100%
rename from src/theme/muban/footer.htm
rename to src/theme/templets/footer.htm
diff --git a/src/theme/muban/googlemap.htm b/src/theme/templets/googlemap.htm
similarity index 100%
rename from src/theme/muban/googlemap.htm
rename to src/theme/templets/googlemap.htm
diff --git a/src/theme/muban/header.htm b/src/theme/templets/header.htm
similarity index 100%
rename from src/theme/muban/header.htm
rename to src/theme/templets/header.htm
diff --git a/src/theme/muban/index.htm b/src/theme/templets/index.htm
similarity index 100%
rename from src/theme/muban/index.htm
rename to src/theme/templets/index.htm
diff --git a/src/theme/muban/index_article.htm b/src/theme/templets/index_article.htm
similarity index 100%
rename from src/theme/muban/index_article.htm
rename to src/theme/templets/index_article.htm
diff --git a/src/theme/muban/index_default.htm b/src/theme/templets/index_default.htm
similarity index 100%
rename from src/theme/muban/index_default.htm
rename to src/theme/templets/index_default.htm
diff --git a/src/theme/muban/index_default_sg.htm b/src/theme/templets/index_default_sg.htm
similarity index 100%
rename from src/theme/muban/index_default_sg.htm
rename to src/theme/templets/index_default_sg.htm
diff --git a/src/theme/muban/index_image.htm b/src/theme/templets/index_image.htm
similarity index 100%
rename from src/theme/muban/index_image.htm
rename to src/theme/templets/index_image.htm
diff --git a/src/theme/muban/index_infos.htm b/src/theme/templets/index_infos.htm
similarity index 100%
rename from src/theme/muban/index_infos.htm
rename to src/theme/templets/index_infos.htm
diff --git a/src/theme/muban/index_shop.htm b/src/theme/templets/index_shop.htm
similarity index 100%
rename from src/theme/muban/index_shop.htm
rename to src/theme/templets/index_shop.htm
diff --git a/src/theme/muban/index_soft.htm b/src/theme/templets/index_soft.htm
similarity index 100%
rename from src/theme/muban/index_soft.htm
rename to src/theme/templets/index_soft.htm
diff --git a/src/theme/muban/list_article.htm b/src/theme/templets/list_article.htm
similarity index 100%
rename from src/theme/muban/list_article.htm
rename to src/theme/templets/list_article.htm
diff --git a/src/theme/muban/list_default.htm b/src/theme/templets/list_default.htm
similarity index 100%
rename from src/theme/muban/list_default.htm
rename to src/theme/templets/list_default.htm
diff --git a/src/theme/muban/list_default_sg.htm b/src/theme/templets/list_default_sg.htm
similarity index 100%
rename from src/theme/muban/list_default_sg.htm
rename to src/theme/templets/list_default_sg.htm
diff --git a/src/theme/muban/list_free.htm b/src/theme/templets/list_free.htm
similarity index 100%
rename from src/theme/muban/list_free.htm
rename to src/theme/templets/list_free.htm
diff --git a/src/theme/muban/list_image.htm b/src/theme/templets/list_image.htm
similarity index 100%
rename from src/theme/muban/list_image.htm
rename to src/theme/templets/list_image.htm
diff --git a/src/theme/muban/list_infos.htm b/src/theme/templets/list_infos.htm
similarity index 100%
rename from src/theme/muban/list_infos.htm
rename to src/theme/templets/list_infos.htm
diff --git a/src/theme/muban/list_shop.htm b/src/theme/templets/list_shop.htm
similarity index 100%
rename from src/theme/muban/list_shop.htm
rename to src/theme/templets/list_shop.htm
diff --git a/src/theme/muban/list_soft.htm b/src/theme/templets/list_soft.htm
similarity index 100%
rename from src/theme/muban/list_soft.htm
rename to src/theme/templets/list_soft.htm
diff --git a/src/theme/muban/list_spec.htm b/src/theme/templets/list_spec.htm
similarity index 100%
rename from src/theme/muban/list_spec.htm
rename to src/theme/templets/list_spec.htm
diff --git a/src/theme/muban/navbar.htm b/src/theme/templets/navbar.htm
similarity index 100%
rename from src/theme/muban/navbar.htm
rename to src/theme/templets/navbar.htm
diff --git a/src/theme/muban/search.htm b/src/theme/templets/search.htm
similarity index 100%
rename from src/theme/muban/search.htm
rename to src/theme/templets/search.htm
diff --git a/src/theme/muban/singlepage.htm b/src/theme/templets/singlepage.htm
similarity index 100%
rename from src/theme/muban/singlepage.htm
rename to src/theme/templets/singlepage.htm
diff --git a/src/theme/muban/tag.htm b/src/theme/templets/tag.htm
similarity index 100%
rename from src/theme/muban/tag.htm
rename to src/theme/templets/tag.htm
diff --git a/src/theme/muban/taglist.htm b/src/theme/templets/taglist.htm
similarity index 100%
rename from src/theme/muban/taglist.htm
rename to src/theme/templets/taglist.htm
diff --git a/src/theme/muban/top.htm b/src/theme/templets/top.htm
similarity index 100%
rename from src/theme/muban/top.htm
rename to src/theme/templets/top.htm
diff --git a/src/theme/muban/widget_article_digg.htm b/src/theme/templets/widget_article_digg.htm
similarity index 100%
rename from src/theme/muban/widget_article_digg.htm
rename to src/theme/templets/widget_article_digg.htm
diff --git a/src/theme/muban/widget_article_feedback.htm b/src/theme/templets/widget_article_feedback.htm
similarity index 100%
rename from src/theme/muban/widget_article_feedback.htm
rename to src/theme/templets/widget_article_feedback.htm
diff --git a/src/theme/muban/widget_channels.htm b/src/theme/templets/widget_channels.htm
similarity index 100%
rename from src/theme/muban/widget_channels.htm
rename to src/theme/templets/widget_channels.htm
diff --git a/src/theme/muban/widget_hot.htm b/src/theme/templets/widget_hot.htm
similarity index 100%
rename from src/theme/muban/widget_hot.htm
rename to src/theme/templets/widget_hot.htm
diff --git a/src/theme/muban/widget_hot_sg.htm b/src/theme/templets/widget_hot_sg.htm
similarity index 100%
rename from src/theme/muban/widget_hot_sg.htm
rename to src/theme/templets/widget_hot_sg.htm
diff --git a/src/theme/muban/widget_qrcode.htm b/src/theme/templets/widget_qrcode.htm
similarity index 100%
rename from src/theme/muban/widget_qrcode.htm
rename to src/theme/templets/widget_qrcode.htm
diff --git a/src/theme/muban/widget_recommend.htm b/src/theme/templets/widget_recommend.htm
similarity index 100%
rename from src/theme/muban/widget_recommend.htm
rename to src/theme/templets/widget_recommend.htm
diff --git a/src/theme/muban/widget_recommend_sg.htm b/src/theme/templets/widget_recommend_sg.htm
similarity index 100%
rename from src/theme/muban/widget_recommend_sg.htm
rename to src/theme/templets/widget_recommend_sg.htm
diff --git a/src/theme/muban/widget_vote.htm b/src/theme/templets/widget_vote.htm
similarity index 100%
rename from src/theme/muban/widget_vote.htm
rename to src/theme/templets/widget_vote.htm