From c5af7bfcc85f6fe91442b9e8a3ca567dd3291524 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 29 Aug 2018 11:39:21 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=9B=B4=E6=96=B0=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/admin/ThemeController.java | 10 +++-
 .../resources/templates/admin/admin_theme.ftl | 58 +------------------
 2 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
index 95c8f14612..4efc1de7af 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
@@ -6,6 +6,7 @@
 import cc.ryanc.halo.model.dto.LogsRecord;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.ResultCodeEnum;
+import cc.ryanc.halo.model.enums.TrueFalseEnum;
 import cc.ryanc.halo.service.LogsService;
 import cc.ryanc.halo.service.OptionsService;
 import cc.ryanc.halo.utils.HaloUtils;
@@ -224,8 +225,15 @@ public JsonResult pullFromRemote(@RequestParam(value = "themeName") String theme
      * @param theme theme名称
      */
     @GetMapping(value = "/options")
-    public String setting(Model model, @RequestParam("theme") String theme) {
+    public String setting(Model model,
+                          @RequestParam("theme") String theme,
+                          @RequestParam("hasUpdate") String hasUpdate) {
         model.addAttribute("themeDir", theme);
+        if (StringUtils.equals(hasUpdate, TrueFalseEnum.TRUE.getDesc())) {
+            model.addAttribute("hasUpdate", true);
+        } else {
+            model.addAttribute("hasUpdate", false);
+        }
         return "themes/" + theme + "/module/options";
     }
 
diff --git a/src/main/resources/templates/admin/admin_theme.ftl b/src/main/resources/templates/admin/admin_theme.ftl
index bd85ac7d2d..684853056d 100755
--- a/src/main/resources/templates/admin/admin_theme.ftl
+++ b/src/main/resources/templates/admin/admin_theme.ftl
@@ -81,10 +81,7 @@
                                 <div class="box-footer">
                                     <span class="theme-title">${theme.themeName?if_exists?upper_case}</span>
                                     <#if theme.hasOptions>
-                                        <button class="btn btn-primary btn-sm pull-right btn-theme-setting" onclick="openSetting('${theme.themeName?if_exists}')" style="display: none">设置</button>
-                                    </#if>
-                                    <#if theme.hasUpdate>
-                                        <button class="btn btn-warning btn-sm pull-right btn-theme-update" data-loading-text="更新中..." onclick="updateTheme('${theme.themeName?if_exists}',this)" style="display: none;margin-right: 3px">更新</button>
+                                        <button class="btn btn-primary btn-sm pull-right btn-theme-setting" onclick="openSetting('${theme.themeName?if_exists}','<#if theme.hasUpdate>true<#else>false</#if>')" style="display: none">设置</button>
                                     </#if>
                                     <#if activeTheme != "${theme.themeName}">
                                         <button class="btn btn-default btn-sm pull-right btn-theme-enable" onclick="setTheme('${theme.themeName?if_exists}')" style="display: none;margin-right: 3px">启用</button>
@@ -191,61 +188,12 @@
                 });
             }
 
-            /**
-             * 更新主题
-             */
-            function updateTheme(theme,e) {
-                $(e).button('loading');
-                $.ajax({
-                    type: 'get',
-                    url: '/admin/themes/pull',
-                    data: {
-                        'themeName': theme
-                    },
-                    success: function (data) {
-                        if(data.code==1){
-                            $.toast({
-                                text: data.msg,
-                                heading: '提示',
-                                icon: 'success',
-                                showHideTransition: 'fade',
-                                allowToastClose: true,
-                                hideAfter: 1000,
-                                stack: 1,
-                                position: 'top-center',
-                                textAlign: 'left',
-                                loader: true,
-                                loaderBg: '#ffffff',
-                                afterHidden: function () {
-                                    window.location.href="/admin/themes";
-                                }
-                            });
-                        }else{
-                            $.toast({
-                                text: data.msg,
-                                heading: '提示',
-                                icon: 'error',
-                                showHideTransition: 'fade',
-                                allowToastClose: true,
-                                hideAfter: 2000,
-                                stack: 1,
-                                position: 'top-center',
-                                textAlign: 'left',
-                                loader: true,
-                                loaderBg: '#ffffff'
-                            });
-                            $(e).button('reset');
-                        }
-                    }
-                });
-            }
-
             /**
              * 打开主题设置
              *
              * @param theme 主题名
              */
-            function openSetting(theme) {
+            function openSetting(theme,hasUpdate) {
                 layer.open({
                     type: 2,
                     title: theme+'主题设置',
@@ -253,7 +201,7 @@
                     shade: 0.5,
                     maxmin: true,
                     area: ['90%', '90%'],
-                    content: '/admin/themes/options?theme='+theme,
+                    content: '/admin/themes/options?theme='+theme+'&hasUpdate='+hasUpdate,
                     scrollbar: false
                 });
             }