From 12a6b548a4dd9c8de0079eba43ecad74230f7bcd Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Sun, 10 Mar 2019 10:42:39 +0800
Subject: [PATCH] =?UTF-8?q?:rewind:=20=E5=8E=BB=E9=99=A4=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../halo/web/controller/core/BaseController.java  | 15 ---------------
 .../controller/front/FrontIndexController.java    | 10 ++--------
 .../resources/templates/admin/admin_theme.ftl     |  5 +----
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java b/src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java
index 42c28864d..43240e43d 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java
@@ -33,21 +33,6 @@ public abstract class BaseController {
         return themeStr.toString();
     }
 
-    /**
-     * 根据主题以及模板名渲染页面
-     *
-     * @param theme    主题
-     * @param pageName 模板名
-     * @return String
-     */
-    public String render(String theme, String pageName) {
-        final StrBuilder themeStr = new StrBuilder("themes/");
-        themeStr.append(theme);
-        themeStr.append("/");
-        themeStr.append(pageName);
-        return themeStr.toString();
-    }
-
     /**
      * 渲染404页面
      *
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
index 3a79ddefa..071dab368 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
@@ -17,7 +17,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 import static org.springframework.data.domain.Sort.Direction.DESC;
@@ -45,9 +44,8 @@ public class FrontIndexController extends BaseController {
      * @return 模板路径
      */
     @GetMapping
-    public String index(@RequestParam(value = "theme", defaultValue = "") String theme,
-                        Model model) {
-        return this.index(model, theme, 1, Sort.by(DESC, "postPriority").and(Sort.by(DESC, "postDate")));
+    public String index(Model model) {
+        return this.index(model, 1, Sort.by(DESC, "postPriority").and(Sort.by(DESC, "postDate")));
     }
 
     /**
@@ -59,7 +57,6 @@ public class FrontIndexController extends BaseController {
      */
     @GetMapping(value = "page/{page}")
     public String index(Model model,
-                        @RequestParam(value = "theme", defaultValue = "") String theme,
                         @PathVariable(value = "page") Integer page,
                         @SortDefault.SortDefaults({
                                 @SortDefault(sort = "postPriority", direction = DESC),
@@ -82,9 +79,6 @@ public class FrontIndexController extends BaseController {
         model.addAttribute("is_index", true);
         model.addAttribute("posts", posts);
         model.addAttribute("rainbow", rainbow);
-        if (StrUtil.isNotEmpty(theme)) {
-            return this.render(theme, "index");
-        }
         return this.render("index");
     }
 }
diff --git a/src/main/resources/templates/admin/admin_theme.ftl b/src/main/resources/templates/admin/admin_theme.ftl
index 364939c14..207387a95 100755
--- a/src/main/resources/templates/admin/admin_theme.ftl
+++ b/src/main/resources/templates/admin/admin_theme.ftl
@@ -27,9 +27,6 @@
             font-size: 18px;
             line-height: 30px;
         }
-        .theme-title a{
-            color: #000;
-        }
         .btn-delete:hover{
             color: red;
         }
@@ -56,7 +53,7 @@
                             </div>
                             <div class="box-footer">
                                 <span class="theme-title">
-                                    <a href="${options.blog_url!}?theme=${theme.themeName!}" target="_blank" title="点击预览该主题">${theme.themeName!?cap_first}</a>
+                                    ${theme.themeName!?cap_first}
                                 </span>
                                 <#if theme.hasOptions>
                                     <button class="btn btn-primary btn-sm pull-right btn-theme-setting" onclick="halo.layerModal('/admin/themes/options?theme=${theme.themeName!}&hasUpdate=<#if theme.hasUpdate>true<#else>false</#if>','${theme.themeName!} <@spring.message code="admin.themes.js.theme-setting" />')" style="display: none"><@spring.message code='admin.themes.btn.setting' /></button>