Merge pull request #253 from libsgh/dev

v3.0.3

boot/boot.go

@@ -231,21 +231,20 @@ func InitStaticBox(r *gin.Engine, fs embed.FS) {
 }
 
 func Templates(fs embed.FS) *template.Template {
-	themes := [6]string{"mdui", "mdui-light", "mdui-dark", "classic", "bootstrap", "materialdesign"}
+	themes := [3]string{"mdui", "classic", "bootstrap"}
 	tmpl := template.New("")
 	templatesFileNames := []string{"base", "appearance", "common", "disk", "hide", "login", "pwd", "safety", "view", "bypass", "cache", "webdav"}
 	addTemplatesFromFolder("admin", tmpl, fs, templatesFileNames)
 	for _, theme := range themes {
-		tmpName := strings.Join([]string{"templates/pan/", "/index.html"}, theme)
-		tmpFile := strings.ReplaceAll(tmpName, "-dark", "")
-		tmpFile = strings.ReplaceAll(tmpFile, "-light", "")
+		theme = util.GetCurrentTheme(theme)
+		tmpFile := strings.Join([]string{"templates/pan/", "/index.html"}, theme)
 		dataBuf, _ := fs.ReadFile(tmpFile)
 		data := string(dataBuf)
 		if util.FileExist("./templates/" + tmpFile) {
 			s, _ := ioutil.ReadFile("./templates/" + tmpFile)
 			data = string(s)
 		}
-		tmpl.New(tmpName).Funcs(template.FuncMap{
+		tmpl.New(tmpFile).Funcs(template.FuncMap{
 			"unescaped":   unescaped,
 			"contains":    strings.Contains,
 			"iconclass":   iconclass,

control/admin.go

@@ -20,7 +20,7 @@ func AdminIndex(c *gin.Context) {
 
 //admin config managent
 func ConfigManagent(c *gin.Context) {
-	middleware.ThemeCheck(c)
+	middleware.AdminThemeCheck(c)
 	theme := c.GetString("theme")
 	fullPath := c.Request.URL.Path
 	adminModule := strings.Split(fullPath, "/")[2]

control/index.go

@@ -16,7 +16,8 @@ import (
 func index(c *gin.Context) {
 	var fns []module.FileNode
 	var isFile bool
-	tmpFile := strings.Join([]string{"templates/pan/", "/index.html"}, module.GloablConfig.Theme)
+	tmpFile := strings.Join([]string{"templates/pan/", "/index.html"}, util.GetCurrentTheme(module.GloablConfig.Theme))
+	fmt.Println(tmpFile)
 	account, _ := c.Get("account")
 	sortColumn := c.GetString("sort_column")
 	sortOrder := c.GetString("sort_order")
@@ -150,9 +151,7 @@ func DataRroxy(ac module.Account, downUrl, fileName string, c *gin.Context) {
 }
 
 func view(tmpFile *string, viewType string) {
-	theme := strings.ReplaceAll(module.GloablConfig.Theme, "-dark", "")
-	theme = strings.ReplaceAll(theme, "-light", "")
-	*tmpFile = fmt.Sprintf("templates/pan/%s/view-%s.html", theme, viewType)
+	*tmpFile = fmt.Sprintf("templates/pan/%s/view-%s.html", util.GetCurrentTheme(module.GloablConfig.Theme), viewType)
 }
 
 func ShortRedirect(c *gin.Context) {

control/middleware/pwd.go

@@ -81,12 +81,29 @@ func VerifyPwd(pwd, path, cookiepwd string) (bool, string) {
 func ThemeCheck(c *gin.Context) {
 	theme, err := c.Request.Cookie("theme")
 	if err != nil {
-		c.Set("theme", "mdui")
+		c.Set("theme", module.GloablConfig.Theme)
 	} else {
 		c.Set("theme", theme.Value)
 	}
 }
 
+func AdminThemeCheck(c *gin.Context) {
+	theme, err := c.Request.Cookie("theme")
+	if err != nil {
+		if strings.HasPrefix(module.GloablConfig.Theme, "mdui") {
+			c.Set("theme", module.GloablConfig.Theme)
+		} else {
+			c.Set("theme", "mdui")
+		}
+	} else {
+		if strings.HasPrefix(theme.Value, "mdui") {
+			c.Set("theme", theme.Value)
+		} else {
+			c.Set("theme", "mdui")
+		}
+	}
+}
+
 func LayoutCheck(c *gin.Context) {
 	layout, err := c.Request.Cookie("layout")
 	if err != nil {

util/common.go

@@ -195,7 +195,7 @@ func GetIcon(isFolder bool, fileType string) string {
 			fileKey = "exe"
 		}
 	}
-	return iconMap[config.Theme].(KV)[fileKey].(string)
+	return iconMap[GetCurrentTheme(config.Theme)].(KV)[fileKey].(string)
 }
 func GetBetweenStr(str, start, end string) string {
 	n := strings.Index(str, start)
@@ -734,3 +734,9 @@ func Md5Params(params map[string]string) string {
 	h.Write([]byte(signStr))
 	return hex.EncodeToString(h.Sum(nil))
 }
+func GetCurrentTheme(theme string) string {
+	if strings.HasPrefix(theme, "mdui") {
+		return "mdui"
+	}
+	return theme
+}