跳至内容
diff --git a/internal/theme/twentyseventeen/layout/head.gohtml b/internal/theme/twentyseventeen/layout/head.gohtml
index d5d874a..d8718e9 100644
--- a/internal/theme/twentyseventeen/layout/head.gohtml
+++ b/internal/theme/twentyseventeen/layout/head.gohtml
@@ -1,4 +1,5 @@
{{define "layout/head"}}
+
@@ -64,7 +65,8 @@
-
+ {{block "head" .}}
+ {{end}}
{{template "common/head" .}}
-
+
{{end}}
\ No newline at end of file
diff --git a/internal/theme/twentyseventeen/twentyseventeen.go b/internal/theme/twentyseventeen/twentyseventeen.go
index 205b81f..3cfc8d6 100644
--- a/internal/theme/twentyseventeen/twentyseventeen.go
+++ b/internal/theme/twentyseventeen/twentyseventeen.go
@@ -4,6 +4,7 @@ import (
"fmt"
"github.com/fthvgb1/wp-go/helper"
"github.com/fthvgb1/wp-go/helper/maps"
+ str "github.com/fthvgb1/wp-go/helper/strings"
"github.com/fthvgb1/wp-go/internal/cmd/reload"
"github.com/fthvgb1/wp-go/internal/pkg/constraints"
"github.com/fthvgb1/wp-go/internal/pkg/models"
@@ -37,6 +38,7 @@ func dispatch(next common.HandleFn[*common.Handle], h *common.Handle) {
h.WidgetAreaData()
h.GetPassword()
h.PushHandleFn(calClass)
+ h.PushHeadScript(constraints.HeadScript, colorScheme)
h.GinH["HeaderImage"] = getHeaderImage(h)
switch h.Scene {
case constraints.Detail:
@@ -121,26 +123,23 @@ var header = reload.Vars(models.PostThumbnail{})
func getHeaderImage(h *common.Handle) (r models.PostThumbnail) {
img := header.Load()
- r.Sizes = "100vw"
- if img.Path == "" {
- image, rand := h.GetCustomHeader()
- if !rand {
- if image.Path == "" {
- r.Path = helper.CutUrlHost(h.ThemeMods.ThemeSupport.CustomHeader.DefaultImage)
- r.Width = 2000
- r.Height = 1200
- header.Store(r)
- return
- }
- r = image
- r.Sizes = "100vw"
- header.Store(r)
- return
- }
- img = image
+ if img.Path != "" {
+ return r
}
- r = img
+ image, rand := h.GetCustomHeader()
+ if image.Path != "" {
+ r = image
+ r.Sizes = "100vw"
+ if !rand {
+ header.Store(r)
+ }
+ return
+ }
+ r.Path = helper.CutUrlHost(h.ThemeMods.ThemeSupport.CustomHeader.DefaultImage)
+ r.Width = 2000
+ r.Height = 1200
r.Sizes = "100vw"
+ header.Store(r)
return
}
@@ -149,6 +148,14 @@ func calClass(h *common.Handle) {
if u != "" && u != "remove-header" {
h.Class = append(h.Class, "has-header-image")
}
+ if len(h.ThemeMods.SidebarsWidgets.Data.Sidebar1) > 0 {
+ h.Class = append(h.Class, "has-sidebar")
+ }
+ if h.ThemeMods.HeaderTextcolor == "blank" {
+ h.Class = append(h.Class, "title-tagline-hidden")
+ }
+ h.Class = append(h.Class, "hfeed")
+ h.Class = append(h.Class, str.Join("colors-", wpconfig.GetThemeModsVal(h.Theme, "colorscheme", "light")))
if h.Scene == constraints.Archive {
if "one-column" == wpconfig.GetThemeModsVal(h.Theme, "page_layout", "") {
h.Class = append(h.Class, "page-one-column")
diff --git a/model/sqxquery.go b/model/sqxquery.go
index 22c6784..08cf450 100644
--- a/model/sqxquery.go
+++ b/model/sqxquery.go
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"github.com/fthvgb1/wp-go/helper/slice"
+ str "github.com/fthvgb1/wp-go/helper/strings"
"github.com/jmoiron/sqlx"
"strconv"
"strings"
@@ -150,5 +151,5 @@ func FormatSql(sql string, params ...any) string {
sql = strings.Replace(sql, "?", fmt.Sprintf("%f", param.(float64)), 1)
}
}
- return sql
+ return str.CutSpecialDuplicate(sql, " ")
}