From 02b6878aec171722c9153769ab88dbbb593e4a7e Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 24 Apr 2019 14:36:20 +0800
Subject: [PATCH] Change options.yaml to settings.yaml.

---
 .../admin/api/OptionController.java           |   2 +-
 .../content/api/ArchiveController.java        |   2 +-
 .../content/api/CommentController.java        |   2 +-
 .../content/api/LinkController.java           |   2 +-
 .../content/api/MenuController.java           |   2 +-
 .../content/api/OptionController.java         |   4 +-
 .../content/api/PostController.java           |   2 +-
 .../controller/content/api/TagController.java |   2 +-
 .../content/api/UserController.java           |   2 +-
 .../theme/FreemarkerConfigAwareListener.java  |   4 +-
 .../run/halo/app/model/entity/Gallery.java    |   2 +-
 .../run/halo/app/service/OptionService.java   |   2 +-
 .../run/halo/app/service/ThemeService.java    |   4 +-
 .../app/service/impl/OptionServiceImpl.java   |   2 +-
 .../app/service/impl/ThemeServiceImpl.java    |   4 +-
 .../templates/themes/anatole/gallery.ftl      |  10 +-
 .../templates/themes/anatole/module/macro.ftl |  10 +-
 .../themes/anatole/module/options.ftl         | 203 ------------------
 .../themes/anatole/module/page-top.ftl        |   2 +-
 .../themes/anatole/module/sidebar.ftl         |   2 +-
 .../templates/themes/anatole/post.ftl         |   4 +-
 .../anatole/{options.yaml => settings.yaml}   |   0
 .../templates/themes/anatole/sheet.ftl        |   4 +-
 23 files changed, 35 insertions(+), 238 deletions(-)
 delete mode 100644 src/main/resources/templates/themes/anatole/module/options.ftl
 rename src/main/resources/templates/themes/anatole/{options.yaml => settings.yaml} (100%)

diff --git a/src/main/java/run/halo/app/controller/admin/api/OptionController.java b/src/main/java/run/halo/app/controller/admin/api/OptionController.java
index 4c084e792..511460e08 100644
--- a/src/main/java/run/halo/app/controller/admin/api/OptionController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/OptionController.java
@@ -38,7 +38,7 @@ public class OptionController {
 
     @GetMapping("map_view")
     @ApiOperation("Lists all options with map view")
-    public Map<String, String> listAllWithMapView() {
+    public Map<String, Object> listAllWithMapView() {
         return optionService.listOptions();
     }
 
diff --git a/src/main/java/run/halo/app/controller/content/api/ArchiveController.java b/src/main/java/run/halo/app/controller/content/api/ArchiveController.java
index 264598639..a7365e627 100644
--- a/src/main/java/run/halo/app/controller/content/api/ArchiveController.java
+++ b/src/main/java/run/halo/app/controller/content/api/ArchiveController.java
@@ -15,7 +15,7 @@ import java.util.List;
  * @author johnniang
  * @date 4/2/19
  */
-@RestController("PortalArchiveController")
+@RestController("ApiContentArchiveController")
 @RequestMapping("/api/archives")
 public class ArchiveController {
 
diff --git a/src/main/java/run/halo/app/controller/content/api/CommentController.java b/src/main/java/run/halo/app/controller/content/api/CommentController.java
index 8b44dd657..712810453 100644
--- a/src/main/java/run/halo/app/controller/content/api/CommentController.java
+++ b/src/main/java/run/halo/app/controller/content/api/CommentController.java
@@ -15,7 +15,7 @@ import run.halo.app.service.CommentService;
  * @author johnniang
  * @date 4/3/19
  */
-@RestController("PortalCommentController")
+@RestController("ApiContentCommentController")
 @RequestMapping("/api/comments")
 public class CommentController {
 
diff --git a/src/main/java/run/halo/app/controller/content/api/LinkController.java b/src/main/java/run/halo/app/controller/content/api/LinkController.java
index e8ba1c072..823929948 100644
--- a/src/main/java/run/halo/app/controller/content/api/LinkController.java
+++ b/src/main/java/run/halo/app/controller/content/api/LinkController.java
@@ -17,7 +17,7 @@ import java.util.List;
  * @author johnniang
  * @date 4/3/19
  */
-@RestController("PortalLinkController")
+@RestController("ApiContentLinkController")
 @RequestMapping("/api/links")
 public class LinkController {
 
diff --git a/src/main/java/run/halo/app/controller/content/api/MenuController.java b/src/main/java/run/halo/app/controller/content/api/MenuController.java
index dff456f9a..320a2f342 100644
--- a/src/main/java/run/halo/app/controller/content/api/MenuController.java
+++ b/src/main/java/run/halo/app/controller/content/api/MenuController.java
@@ -19,7 +19,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
  * @author johnniang
  * @date 4/3/19
  */
-@RestController("PortalMenuController")
+@RestController("ApiContentMenuController")
 @RequestMapping("/api/menus")
 public class MenuController {
 
diff --git a/src/main/java/run/halo/app/controller/content/api/OptionController.java b/src/main/java/run/halo/app/controller/content/api/OptionController.java
index ee8c53053..a4867808c 100644
--- a/src/main/java/run/halo/app/controller/content/api/OptionController.java
+++ b/src/main/java/run/halo/app/controller/content/api/OptionController.java
@@ -19,7 +19,7 @@ import java.util.Map;
  * @author johnniang
  * @date 4/3/19
  */
-@RestController("PortalOptionController")
+@RestController("ApiContentOptionController")
 @RequestMapping("/api/options")
 public class OptionController {
 
@@ -37,7 +37,7 @@ public class OptionController {
 
     @GetMapping("map_view")
     @ApiOperation("Lists all options with map view")
-    public Map<String, String> listAllWithMapView() {
+    public Map<String, Object> listAllWithMapView() {
         return optionService.listOptions();
     }
 
diff --git a/src/main/java/run/halo/app/controller/content/api/PostController.java b/src/main/java/run/halo/app/controller/content/api/PostController.java
index 2d0b330a2..a8f357e10 100644
--- a/src/main/java/run/halo/app/controller/content/api/PostController.java
+++ b/src/main/java/run/halo/app/controller/content/api/PostController.java
@@ -33,7 +33,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
  * @author johnniang
  * @date 4/2/19
  */
-@RestController("PortalPostController")
+@RestController("ApiContentPostController")
 @RequestMapping("/api/posts")
 public class PostController {
 
diff --git a/src/main/java/run/halo/app/controller/content/api/TagController.java b/src/main/java/run/halo/app/controller/content/api/TagController.java
index fe4db9ecf..be53c04ad 100644
--- a/src/main/java/run/halo/app/controller/content/api/TagController.java
+++ b/src/main/java/run/halo/app/controller/content/api/TagController.java
@@ -24,7 +24,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
  * @author johnniang
  * @date 4/2/19
  */
-@RestController("PortalTagController")
+@RestController("ApiContentTagController")
 @RequestMapping("/api/tags")
 public class TagController {
 
diff --git a/src/main/java/run/halo/app/controller/content/api/UserController.java b/src/main/java/run/halo/app/controller/content/api/UserController.java
index a51b478a9..a97c36408 100644
--- a/src/main/java/run/halo/app/controller/content/api/UserController.java
+++ b/src/main/java/run/halo/app/controller/content/api/UserController.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author johnniang
  * @date 4/3/19
  */
-@RestController("PortalUserController")
+@RestController("ApiContentUserController")
 @RequestMapping("/api/users")
 public class UserController {
 
diff --git a/src/main/java/run/halo/app/event/theme/FreemarkerConfigAwareListener.java b/src/main/java/run/halo/app/event/theme/FreemarkerConfigAwareListener.java
index 855085b07..5fc706806 100644
--- a/src/main/java/run/halo/app/event/theme/FreemarkerConfigAwareListener.java
+++ b/src/main/java/run/halo/app/event/theme/FreemarkerConfigAwareListener.java
@@ -61,11 +61,11 @@ public class FreemarkerConfigAwareListener {
             ThemeProperty activatedTheme = themeActivatedEvent.getThemeProperty();
             log.debug("Set shared variable theme: [{}]", activatedTheme);
             configuration.setSharedVariable("theme", activatedTheme);
-            Map<String, String> options = optionService.listOptions();
+            Map<String, Object> options = optionService.listOptions();
             log.debug("Set shared variable options: [{}]", options);
             configuration.setSharedVariable("options", options);
             log.debug("Set shared variable theme settings: [{}]", options);
-            configuration.setSharedVariable("setting",themeSettingService.listAsMapBy(themeService.getActivatedThemeId()));
+            configuration.setSharedVariable("settings",themeSettingService.listAsMapBy(themeService.getActivatedThemeId()));
         } catch (TemplateModelException e) {
             log.warn("Failed to configure freemarker", e);
         }
diff --git a/src/main/java/run/halo/app/model/entity/Gallery.java b/src/main/java/run/halo/app/model/entity/Gallery.java
index 1cca462a9..145522736 100644
--- a/src/main/java/run/halo/app/model/entity/Gallery.java
+++ b/src/main/java/run/halo/app/model/entity/Gallery.java
@@ -44,7 +44,7 @@ public class Gallery extends BaseEntity {
     /**
      * Shooting time / creation time.
      */
-    @Column(name = "take_time", columnDefinition = "timestamp not null")
+    @Column(name = "take_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date takeTime;
 
diff --git a/src/main/java/run/halo/app/service/OptionService.java b/src/main/java/run/halo/app/service/OptionService.java
index 83a003a1a..c2bee620d 100755
--- a/src/main/java/run/halo/app/service/OptionService.java
+++ b/src/main/java/run/halo/app/service/OptionService.java
@@ -78,7 +78,7 @@ public interface OptionService extends CrudService<Option, Integer> {
      * @return Map
      */
     @NonNull
-    Map<String, String> listOptions();
+    Map<String, Object> listOptions();
 
     /**
      * Lists all option dtos.
diff --git a/src/main/java/run/halo/app/service/ThemeService.java b/src/main/java/run/halo/app/service/ThemeService.java
index 161d040d2..269933e5e 100644
--- a/src/main/java/run/halo/app/service/ThemeService.java
+++ b/src/main/java/run/halo/app/service/ThemeService.java
@@ -33,7 +33,7 @@ public interface ThemeService {
     /**
      * Configuration file name.
      */
-    String[] OPTIONS_NAMES = {"options.yaml", "options.yml"};
+    String[] SETTINGS_NAMES = {"settings.yaml", "settings.yml"};
 
     /**
      * The type of file that can be modified.
@@ -43,7 +43,7 @@ public interface ThemeService {
     /**
      * These file names cannot be displayed.
      */
-    String[] FILTER_FILES = {".git", ".DS_Store", "theme.yaml", "theme.yml", "options.yaml", "option.yml"};
+    String[] FILTER_FILES = {".git", ".DS_Store", "theme.yaml", "theme.yml", "settings.yaml", "settings.yml"};
 
     /**
      * Theme folder location.
diff --git a/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java b/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java
index 33257a48c..4f00d77e6 100644
--- a/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java
@@ -124,7 +124,7 @@ public class OptionServiceImpl extends AbstractCrudService<Option, Integer> impl
     }
 
     @Override
-    public Map<String, String> listOptions() {
+    public Map<String, Object> listOptions() {
         return ServiceUtils.convertToMap(listAll(), Option::getKey, Option::getValue);
     }
 
diff --git a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
index 9d81eb3d3..cf2350d99 100644
--- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
@@ -258,7 +258,7 @@ public class ThemeServiceImpl implements ThemeService {
         }
 
         try {
-            for (String optionsName : OPTIONS_NAMES) {
+            for (String optionsName : SETTINGS_NAMES) {
                 // Resolve the options path
                 Path optionsPath = Paths.get(themeProperty.getThemePath(), optionsName);
 
@@ -707,7 +707,7 @@ public class ThemeServiceImpl implements ThemeService {
     private boolean hasOptions(@NonNull Path themePath) {
         Assert.notNull(themePath, "Path must not be null");
 
-        for (String optionsName : OPTIONS_NAMES) {
+        for (String optionsName : SETTINGS_NAMES) {
             // Resolve the options path
             Path optionsPath = themePath.resolve(optionsName);
 
diff --git a/src/main/resources/templates/themes/anatole/gallery.ftl b/src/main/resources/templates/themes/anatole/gallery.ftl
index dc7314262..8506c2a1b 100644
--- a/src/main/resources/templates/themes/anatole/gallery.ftl
+++ b/src/main/resources/templates/themes/anatole/gallery.ftl
@@ -5,8 +5,8 @@
     <title>图库 · ${options.blog_title!}</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="stylesheet" href="anatole/source/plugins/gallery/css/main.css" />
-    <noscript><link rel="stylesheet" href="/source/plugins/gallery/css/noscript.css" /></noscript>
+    <link rel="stylesheet" href="${theme.folderName}/source/plugins/gallery/css/main.css" />
+    <noscript><link rel="stylesheet" href="/${theme.folderName}/plugins/gallery/css/noscript.css" /></noscript>
 </head>
 <body class="is-loading-0 is-loading-1 is-loading-2">
 <div id="main">
@@ -41,9 +41,9 @@
         </ul>
     </footer>
 </div>
-<script src="anatole/source/plugins/gallery/js/jquery.min.js"></script>
-<script src="anatole/source/plugins/gallery/js/skel.min.js"></script>
-<script src="anatole/source/plugins/gallery/js/main.js"></script>
+<script src="${theme.folderName}/source/plugins/gallery/js/jquery.min.js"></script>
+<script src="${theme.folderName}/source/plugins/gallery/js/skel.min.js"></script>
+<script src="${theme.folderName}/source/plugins/gallery/js/main.js"></script>
 <@statistics></@statistics>
 </body>
 </html>
diff --git a/src/main/resources/templates/themes/anatole/module/macro.ftl b/src/main/resources/templates/themes/anatole/module/macro.ftl
index fc36e63ac..565530fea 100644
--- a/src/main/resources/templates/themes/anatole/module/macro.ftl
+++ b/src/main/resources/templates/themes/anatole/module/macro.ftl
@@ -10,15 +10,15 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta name="format-detection" content="telephone=no" />
     <meta name="renderer" content="webkit">
-    <meta name="theme-color" content="${options.anatole_style_google_color!'#fff'}">
+    <meta name="theme-color" content="${settings.google_color!'#fff'}">
     <meta name="author" content="${user.nickName!}" />
     <meta name="keywords" content="${keywords!}"/>
     <meta name="description" content="${description!}" />
     <@verification></@verification>
     <@favicon></@favicon>
-    <link href="/anatole/source/css/font-awesome.min.css" type="text/css" rel="stylesheet"/>
-    <link rel="stylesheet" href="/anatole/source/css/blog_basic.min.css?version=88107691fe">
-    <link href="/anatole/source/css/style.min.css" type="text/css" rel="stylesheet" />
+    <link href="/${theme.folderName}/source/css/font-awesome.min.css" type="text/css" rel="stylesheet"/>
+    <link rel="stylesheet" href="/${theme.folderName}/source/css/blog_basic.min.css?version=88107691fe">
+    <link href="/${theme.folderName}/source/css/style.min.css" type="text/css" rel="stylesheet" />
     <link rel="alternate" type="application/rss+xml" title="atom 1.0" href="/feed.xml">
     <style>
         <#if !(settings.post_title_uppper!true)>
@@ -48,7 +48,7 @@
 <body>
 </#macro>
 <#macro footer>
-<script type="text/javascript" src="/anatole/source/js/jquery.min.js"></script>
+<script type="text/javascript" src="/${theme.folderName}/source/js/jquery.min.js"></script>
 <script type="text/javascript">
     var url = location.href;
     var urlstatus = false;
diff --git a/src/main/resources/templates/themes/anatole/module/options.ftl b/src/main/resources/templates/themes/anatole/module/options.ftl
deleted file mode 100644
index a56e45bc8..000000000
--- a/src/main/resources/templates/themes/anatole/module/options.ftl
+++ /dev/null
@@ -1,203 +0,0 @@
-<#import "/common/macro/theme_option_marco.ftl" as option>
-<@option.head />
-<div class="container-fluid">
-    <div class="row">
-        <div class="col-lg-6 themeImg">
-            <img src="/${themeDir}/screenshot.png" style="width: 100%;">
-        </div>
-        <div class="col-md-6 themeSetting">
-            <div class="nav-tabs-custom">
-                <ul class="nav nav-tabs">
-                    <li class="active">
-                        <a href="#sns" data-toggle="tab">社交资料</a>
-                    </li>
-                    <li>
-                        <a href="#style" data-toggle="tab">样式设置</a>
-                    </li>
-                    <li>
-                        <a href="#about" data-toggle="tab">关于</a>
-                    </li>
-                </ul>
-                <div class="tab-content">
-                    <!-- 社交资料 -->
-                    <div class="tab-pane active" id="sns">
-                        <form method="post" class="form-horizontal" id="anatoleSnsOptions">
-                            <div class="box-body">
-                                <div class="form-group">
-                                    <label for="anatoleSnsRss" class="col-sm-4 control-label">RSS：</label>
-                                    <div class="col-sm-8">
-                                        <label class="radio-inline">
-                                            <input type="radio" name="theme_anatole_sns_rss" id="anatoleSnsRss" value="true" ${((options.theme_anatole_sns_rss!'true')=='true')?string('checked','')}> 显示
-                                        </label>
-                                        <label class="radio-inline">
-                                            <input type="radio" name="theme_anatole_sns_rss" id="anatoleSnsRss" value="false" ${((options.theme_anatole_sns_rss!)=='false')?string('checked','')}> 隐藏
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsTwitter" class="col-sm-4 control-label">Twitter：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsTwitter" name="theme_anatole_sns_twitter" value="${options.theme_anatole_sns_twitter!}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsFacebook" class="col-sm-4 control-label">Facebook：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsFacebook" name="theme_anatole_sns_facebook" value="${options.theme_anatole_sns_facebook!}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsInstagram" class="col-sm-4 control-label">Instagram：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsInstagram" name="theme_anatole_sns_instagram" value="${options.theme_anatole_sns_instagram!}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsDribbble" class="col-sm-4 control-label">Dribbble：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsDribbble" name="theme_anatole_sns_dribbble" value="${options.theme_anatole_sns_dribbble!}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsWeibo" class="col-sm-4 control-label">Weibo：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsWeibo" name="theme_anatole_sns_weibo" value="${options.theme_anatole_sns_weibo!}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsEmail" class="col-sm-4 control-label">Email：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsEmail" name="theme_anatole_sns_email" value="${options.theme_anatole_sns_email!}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsGithub" class="col-sm-4 control-label">Github：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsGithub" name="theme_anatole_sns_github" value="${options.theme_anatole_sns_github!}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsQQ" class="col-sm-4 control-label">QQ：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsQQ" name="theme_anatole_sns_qq" value="${options.theme_anatole_sns_qq!}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleSnsTelegram" class="col-sm-4 control-label">Telegram：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleSnsTelegram" name="theme_anatole_sns_telegram" value="${options.theme_anatole_sns_telegram!}" >
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="box-footer">
-                                <button type="button" class="btn btn-primary btn-sm pull-right" onclick="saveThemeOptions('anatoleSnsOptions')">保存设置</button>
-                            </div>
-                        </form>
-                    </div>
-                    <!--样式设置-->
-                    <div class="tab-pane" id="style">
-                        <form method="post" class="form-horizontal" id="anatoleStyleOptions">
-                            <div class="box-body">
-                                <div class="form-group">
-                                    <label for="anatoleStyleRightIcon" class="col-sm-4 control-label">右上角图标：</label>
-                                    <div class="col-sm-8">
-                                        <div class="input-group">
-                                            <input type="text" class="form-control" id="anatoleStyleRightIcon" name="anatole_style_right_icon" value="${options.anatole_style_right_icon!'/anatole/source/images/logo.png'}" >
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-default btn-flat" type="button" onclick="openAttach('anatoleStyleRightIcon')">选择</button>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleStylePostTitleLower" class="col-sm-4 control-label">文章标题大写：</label>
-                                    <div class="col-sm-8">
-                                        <label class="radio-inline">
-                                            <input type="radio" name="anatole_style_post_title_lower" id="anatoleStylePostTitleLower" value="true" ${((options.anatole_style_post_title_lower!'true')=='true')?string('checked','')}> 开启
-                                        </label>
-                                        <label class="radio-inline">
-                                            <input type="radio" name="anatole_style_post_title_lower" id="anatoleStylePostTitleLower" value="false" ${((options.anatole_style_post_title_lower!)=='false')?string('checked','')}> 关闭
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleStyleBlogTitleLower" class="col-sm-4 control-label">博客标题大写：</label>
-                                    <div class="col-sm-8">
-                                        <label class="radio-inline">
-                                            <input type="radio" name="anatole_style_blog_title_lower" id="anatoleStyleBlogTitleLower" value="true" ${((options.anatole_style_blog_title_lower!'true')=='true')?string('checked','')}> 开启
-                                        </label>
-                                        <label class="radio-inline">
-                                            <input type="radio" name="anatole_style_blog_title_lower" id="anatoleStyleBlogTitleLower" value="false" ${((options.anatole_style_blog_title_lower!)=='false')?string('checked','')}> 关闭
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleStyleAvatarCircle" class="col-sm-4 control-label">圆形头像：</label>
-                                    <div class="col-sm-8">
-                                        <label class="radio-inline">
-                                            <input type="radio" name="anatole_style_avatar_circle" id="anatoleStyleAvatarCircle" value="true" ${((options.anatole_style_avatar_circle!)=='true')?string('checked','')}> 开启
-                                        </label>
-                                        <label class="radio-inline">
-                                            <input type="radio" name="anatole_style_avatar_circle" id="anatoleStyleAvatarCircle" value="false" ${((options.anatole_style_avatar_circle!'false')=='false')?string('checked','')}> 关闭
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleStyleHitokoto" class="col-sm-4 control-label">博客描述开启一言：</label>
-                                    <div class="col-sm-8">
-                                        <label class="radio-inline">
-                                            <input type="radio" name="anatole_style_hitokoto" id="anatoleStyleHitokoto" value="true" ${((options.anatole_style_hitokoto!)=='true')?string('checked','')}> 开启
-                                        </label>
-                                        <label class="radio-inline">
-                                            <input type="radio" name="anatole_style_hitokoto" id="anatoleStyleHitokoto" value="false" ${((options.anatole_style_hitokoto!'false')=='false')?string('checked','')}> 关闭
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleStyleGoogleColor" class="col-sm-4 control-label">浏览器沉浸颜色：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleStyleGoogleColor" name="anatole_style_google_color" value="${options.anatole_style_google_color!'#fff'}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleStyleScrollbar" class="col-sm-4 control-label">全局滚动条颜色：</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="anatoleStyleScrollbar" name="anatole_style_scrollbar" value="${options.anatole_style_scrollbar!'#3798e8'}" >
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="anatoleStyleSelf" class="col-sm-4 control-label">自定义样式：</label>
-                                    <div class="col-sm-8">
-                                        <textarea class="form-control" rows="3" id="anatoleStyleSelf" name="anatole_style_self" style="resize: none">${options.anatole_style_self!}</textarea>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="box-footer">
-                                <button type="button" class="btn btn-primary btn-sm pull-right" onclick="saveThemeOptions('anatoleStyleOptions')">保存设置</button>
-                            </div>
-                        </form>
-                    </div>
-                    <!-- 关于该主题 -->
-                    <div class="tab-pane" id="about">
-                        <div class="box box-widget widget-user-2">
-                            <div class="widget-user-header bg-blue">
-                                <div class="widget-user-image">
-                                    <img class="img-circle" src="/anatole/source/images/logo@2x.png" alt="User Avatar">
-                                </div>
-                                <h3 class="widget-user-username">CAICAI</h3>
-                                <h5 class="widget-user-desc">A other farbox theme</h5>
-                            </div>
-                            <div class="box-footer no-padding">
-                                <ul class="nav nav-stacked">
-                                    <li><a target="_blank" href="https://www.caicai.me/">作者主页</a></li>
-                                    <li><a target="_blank" href="https://github.com/hi-caicai/farbox-theme-Anatole">原主题地址</a></li>
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<@option.import_js />
diff --git a/src/main/resources/templates/themes/anatole/module/page-top.ftl b/src/main/resources/templates/themes/anatole/module/page-top.ftl
index ac4858870..18850a8a2 100644
--- a/src/main/resources/templates/themes/anatole/module/page-top.ftl
+++ b/src/main/resources/templates/themes/anatole/module/page-top.ftl
@@ -15,7 +15,7 @@
             </li>
         </div>
         <div class="avatar">
-            <img src="${settings.icon!'/anatole/source/images/logo.png'}" />
+            <img src="${settings.icon!'/${theme.folderName}/source/images/logo.png'}" />
         </div>
     </div>
 </div>
diff --git a/src/main/resources/templates/themes/anatole/module/sidebar.ftl b/src/main/resources/templates/themes/anatole/module/sidebar.ftl
index d04b1cb55..a6a258d05 100644
--- a/src/main/resources/templates/themes/anatole/module/sidebar.ftl
+++ b/src/main/resources/templates/themes/anatole/module/sidebar.ftl
@@ -1,7 +1,7 @@
 <div class="sidebar animated fadeInDown">
     <div class="logo-title">
         <div class="title">
-            <img src="${options.blog_logo!'/anatole/source/images/logo@2x.png'}" style="width:127px;<#if settings.avatar_circle!false>border-radius:50%</#if>" />
+            <img src="${options.blog_logo!'/${theme.folderName}/source/images/logo@2x.png'}" style="width:127px;<#if settings.avatar_circle!false>border-radius:50%</#if>" />
             <h3 title="">
                 <a href="${options.blog_url!}">${options.blog_title!'Anatole'}</a>
             </h3>
diff --git a/src/main/resources/templates/themes/anatole/post.ftl b/src/main/resources/templates/themes/anatole/post.ftl
index e7b595fd4..cb6156491 100644
--- a/src/main/resources/templates/themes/anatole/post.ftl
+++ b/src/main/resources/templates/themes/anatole/post.ftl
@@ -2,7 +2,7 @@
 <@head title="${post.title!} · ${options.blog_title!'Halo'}" keywords="${post.title!},${options.seo_keywords!'Halo'},${tagWords!}" description="${post.summary!'Halo'}"></@head>
 <#include "module/sidebar.ftl">
 <div class="main">
-    <link href="/anatole/source/plugins/prism/prism.css" type="text/css" rel="stylesheet" />
+    <link href="/${theme.folderName}/source/plugins/prism/prism.css" type="text/css" rel="stylesheet" />
     <style>
         code, tt {
             font-size: 1.2em;
@@ -98,5 +98,5 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="/anatole/source/plugins/prism/prism.js"></script>
+<script type="text/javascript" src="/${theme.folderName}/source/plugins/prism/prism.js"></script>
 <@footer></@footer>
diff --git a/src/main/resources/templates/themes/anatole/options.yaml b/src/main/resources/templates/themes/anatole/settings.yaml
similarity index 100%
rename from src/main/resources/templates/themes/anatole/options.yaml
rename to src/main/resources/templates/themes/anatole/settings.yaml
diff --git a/src/main/resources/templates/themes/anatole/sheet.ftl b/src/main/resources/templates/themes/anatole/sheet.ftl
index 2ad51beaa..2cf1f651c 100644
--- a/src/main/resources/templates/themes/anatole/sheet.ftl
+++ b/src/main/resources/templates/themes/anatole/sheet.ftl
@@ -2,7 +2,7 @@
 <@head title="${post.title!} · ${options.blog_title!'Halo'}" keywords="${post.title!},${options.seo_keywords!'Halo'}" description="${post.summary!'Halo'}"></@head>
 <#include "module/sidebar.ftl">
 <div class="main">
-    <link href="/anatole/source/plugins/prism/prism.css" type="text/css" rel="stylesheet" />
+    <link href="/${theme.folderName}/source/plugins/prism/prism.css" type="text/css" rel="stylesheet" />
     <style>
         code, tt {
             font-size: 1.2em;
@@ -78,5 +78,5 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="/anatole/source/plugins/prism/prism.js"></script>
+<script type="text/javascript" src="/${theme.folderName}/source/plugins/prism/prism.js"></script>
 <@footer></@footer>