diff --git a/internal/theme/common/bodyclass.go b/internal/theme/common/bodyclass.go index 0751ccf..c911eb0 100644 --- a/internal/theme/common/bodyclass.go +++ b/internal/theme/common/bodyclass.go @@ -12,11 +12,11 @@ import ( ) var commonClass = map[int]string{ - constraints.Home: "home blog", - constraints.Archive: "archive date", + constraints.Home: "home blog ", + constraints.Archive: "archive date ", constraints.Category: "archive category ", constraints.Tag: "archive category ", - constraints.Search: "search", + constraints.Search: "search ", constraints.Detail: "post-template-default single single-post ", } diff --git a/internal/theme/common/common.go b/internal/theme/common/common.go index e0acc30..e9e2073 100644 --- a/internal/theme/common/common.go +++ b/internal/theme/common/common.go @@ -69,13 +69,14 @@ func (h *Handle) Render() { h.Templ = str.Join(h.Theme, "/posts/detail.gohtml") } } + for _, fn := range h.HandleFns { + fn(h) + } h.AutoCal("siteIcon", h.CalSiteIcon) h.AutoCal("customLogo", h.CalCustomLogo) h.AutoCal("customCss", h.CalCustomCss) h.CalBodyClass() - for _, fn := range h.HandleFns { - fn(h) - } + h.C.HTML(h.Code, h.Templ, h.GinH) } diff --git a/internal/theme/common/detail.go b/internal/theme/common/detail.go index 0052ac2..918b20a 100644 --- a/internal/theme/common/detail.go +++ b/internal/theme/common/detail.go @@ -17,20 +17,25 @@ type DetailHandle struct { CommentRender plugins.CommentHtml Comments []models.Comments Post models.Posts + Pipes []HandlePipeFn[*DetailHandle] } func NewDetailHandle(handle *Handle) *DetailHandle { return &DetailHandle{Handle: handle} } +func (d *DetailHandle) Pipe(calls ...HandlePipeFn[*DetailHandle]) { + HandlePipe[*DetailHandle](append(calls, d.Pipes...), func(d *DetailHandle) { + d.Render() + })(d) +} + func (d *DetailHandle) BuildDetailData() (err error) { d.GinH["title"] = wpconfig.GetOption("blogname") err = d.CheckAndGetPost() if err != nil { return } - d.WidgetAreaData() - d.GetPassword() d.Comment() d.ContextPost() return @@ -73,6 +78,9 @@ func (d *DetailHandle) Comment() { } func (d *DetailHandle) RenderComment() { + if d.CommentRender == nil { + d.CommentRender = plugins.CommentRender() + } ableComment := true if d.Post.CommentStatus != "open" || (d.Post.PostPassword != "" && d.Password != d.Post.PostPassword) { @@ -94,19 +102,8 @@ func (d *DetailHandle) ContextPost() { func (d *DetailHandle) Render() { d.PasswordProject() - if d.CommentRender == nil { - d.CommentRender = plugins.CommentRender() - } - d.CalBodyClass() - d.AutoCal("siteIcon", d.CalSiteIcon) - d.AutoCal("customLogo", d.CalCustomLogo) - d.AutoCal("customCss", d.CalCustomCss) d.RenderComment() - d.CalBodyClass() - if d.Templ == "" { - d.Templ = fmt.Sprintf("%s/posts/detail.gohtml", d.Theme) - } - d.C.HTML(d.Code, d.Templ, d.GinH) + d.Handle.Render() } func (d *DetailHandle) Details() { @@ -117,6 +114,5 @@ func (d *DetailHandle) Details() { d.C.HTML(d.Code, d.Templ, d.GinH) return } - d.ExecHandlePlugin() d.Render() } diff --git a/internal/theme/twentyseventeen/layout/base.gohtml b/internal/theme/twentyseventeen/layout/base.gohtml index 6fd5deb..c698b8f 100644 --- a/internal/theme/twentyseventeen/layout/base.gohtml +++ b/internal/theme/twentyseventeen/layout/base.gohtml @@ -6,7 +6,7 @@ {{block "head" .}} {{end}} - + {{template "svg"}}
diff --git a/internal/theme/twentyseventeen/posts/detail.gohtml b/internal/theme/twentyseventeen/posts/detail.gohtml index 7eb8a97..fa2d5b1 100644 --- a/internal/theme/twentyseventeen/posts/detail.gohtml +++ b/internal/theme/twentyseventeen/posts/detail.gohtml @@ -1,7 +1,7 @@ {{template "layout/base" .}} {{define "content"}} - {{ if .post.PostContent}} + {{ if gt .post.Id 0}} {{if .post.Thumbnail.Path}}
{{.post.PostTitle}} diff --git a/internal/theme/twentyseventeen/twentyseventeen.go b/internal/theme/twentyseventeen/twentyseventeen.go index bd2fac4..e837b5b 100644 --- a/internal/theme/twentyseventeen/twentyseventeen.go +++ b/internal/theme/twentyseventeen/twentyseventeen.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/fthvgb1/wp-go/helper/maps" "github.com/fthvgb1/wp-go/helper/slice" - str "github.com/fthvgb1/wp-go/helper/strings" "github.com/fthvgb1/wp-go/internal/pkg/cache" "github.com/fthvgb1/wp-go/internal/pkg/constraints" "github.com/fthvgb1/wp-go/internal/pkg/logs" @@ -29,29 +28,13 @@ var paginate = func() plugins.PageEle { return p }() -type handle struct { - *common.Handle -} - -func newHandle(h *common.Handle) *handle { - return &handle{Handle: h} -} - -type detailHandle struct { - *common.DetailHandle - h *handle -} - -func newDetailHandle(dHandle *common.DetailHandle) *detailHandle { - return &detailHandle{DetailHandle: dHandle, h: newHandle(dHandle.Handle)} -} - func Hook(h *common.Handle) { h.WidgetAreaData() h.GetPassword() + h.HandleFns = append(h.HandleFns, calClass) h.GinH["HeaderImage"] = getHeaderImage(h.C) if h.Scene == constraints.Detail { - newDetailHandle(common.NewDetailHandle(h)).Detail() + common.NewDetailHandle(h).Pipe(detail) return } common.NewIndexHandle(h).Pipe(index) @@ -77,16 +60,15 @@ func index(next common.HandleFn[*common.IndexHandle], i *common.IndexHandle) { next(i) } -func (d *detailHandle) Detail() { +func detail(next common.HandleFn[*common.DetailHandle], d *common.DetailHandle) { err := d.BuildDetailData() if err != nil { d.Code = http.StatusNotFound d.Stats = constraints.Error404 - d.GinH["bodyClass"] = d.h.bodyClass() + d.GinH["bodyClass"] = d.BodyClass() d.C.HTML(d.Code, d.Templ, d.GinH) return } - d.GinH["bodyClass"] = d.h.bodyClass() img := wpconfig.Thumbnail(d.Post.Thumbnail.OriginAttachmentData, "thumbnail", "", "thumbnail", "post-thumbnail") img.Width = img.OriginAttachmentData.Width img.Height = img.OriginAttachmentData.Height @@ -95,8 +77,8 @@ func (d *detailHandle) Detail() { d.Post.Thumbnail = img d.CommentRender = commentFormat d.GinH["post"] = d.Post - d.Render() + next(d) } var commentFormat = comment{} @@ -138,46 +120,21 @@ func getHeaderImage(c *gin.Context) (r models.PostThumbnail) { logs.ErrPrintln(err, "获取页眉背景图失败") } else if len(hs) > 0 && err == nil { _, r = slice.Rand(hs) - } r.Sizes = "100vw" return } -func (i *handle) bodyClass() string { - s := "" - if constraints.Ok != i.Stats { - return "error404" +func calClass(h *common.Handle) { + u := wpconfig.GetThemeModsVal(h.Theme, "header_image", h.ThemeMods.ThemeSupport.CustomHeader.DefaultImage) + if u != "" && u != "remove-header" { + h.Class = append(h.Class, "has-header-image") } - switch i.Scene { - case constraints.Search: - s = "search-no-results" - if len(i.GinH["posts"].([]models.Posts)) > 0 { - s = "search-results" + if h.Scene == constraints.Archive { + if "one-column" == wpconfig.GetThemeModsVal(h.Theme, "page_layout", "") { + h.Class = append(h.Class, "page-one-column") + } else { + h.Class = append(h.Class, "page-two-column") } - case constraints.Category, constraints.Tag: - cat := i.C.Param("category") - if cat == "" { - cat = i.C.Param("tag") - } - _, cate := slice.SearchFirst(cache.CategoriesTags(i.C, i.Scene), func(my models.TermsMy) bool { - return my.Name == cat - }) - if cate.Slug[0] != '%' { - s = cate.Slug - } - s = fmt.Sprintf("category-%d %v", cate.Terms.TermId, s) - case constraints.Detail: - s = fmt.Sprintf("postid-%d", i.GinH["post"].(models.Posts).Id) } - return str.Join(class[i.Scene], s) -} - -var class = map[int]string{ - constraints.Home: "home blog ", - constraints.Archive: "archive date page-two-column", - constraints.Category: "archive category page-two-column", - constraints.Tag: "archive category page-two-column ", - constraints.Search: "search ", - constraints.Detail: "post-template-default single single-post single-format-standard ", }