From d52654bb4ae6acfb69c96861f23c20b93300b125 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Wed, 8 Nov 2023 07:06:18 +0600 Subject: [PATCH] :lipstick: Updated page domain usage by templates --- web/template/baseof.qtpl | 4 +- web/template/baseof.qtpl.go | 4 +- web/template/page.qtpl | 22 +++--- web/template/page.qtpl.go | 146 ++++++++++++++++++------------------ 4 files changed, 86 insertions(+), 90 deletions(-) diff --git a/web/template/baseof.qtpl b/web/template/baseof.qtpl index af3ff4f..5325ce7 100644 --- a/web/template/baseof.qtpl +++ b/web/template/baseof.qtpl @@ -15,10 +15,10 @@ {% code type BaseOf struct { printer *message.Printer - site domain.Site + site *domain.Site } -func NewBaseOf(site domain.Site) BaseOf { +func NewBaseOf(site *domain.Site) BaseOf { return BaseOf{ site: site, printer: message.NewPrinter(site.Language), diff --git a/web/template/baseof.qtpl.go b/web/template/baseof.qtpl.go index 6436e98..75c5073 100644 --- a/web/template/baseof.qtpl.go +++ b/web/template/baseof.qtpl.go @@ -57,10 +57,10 @@ type Pager interface { //line web/template/baseof.qtpl:16 type BaseOf struct { printer *message.Printer - site domain.Site + site *domain.Site } -func NewBaseOf(site domain.Site) BaseOf { +func NewBaseOf(site *domain.Site) BaseOf { return BaseOf{ site: site, printer: message.NewPrinter(site.Language), diff --git a/web/template/page.qtpl b/web/template/page.qtpl index 0a7a1b1..1ffd661 100644 --- a/web/template/page.qtpl +++ b/web/template/page.qtpl @@ -1,43 +1,41 @@ {% import ( "golang.org/x/text/language" + + "source.toby3d.me/toby3d/home/internal/domain" ) %} {% code type Page struct { BaseOf - language language.Tag - title string - content []byte + page *domain.Page } -func NewPage(base BaseOf, lang language.Tag, content []byte, title string) Page { +func NewPage(base BaseOf, page *domain.Page) Page { return Page{ BaseOf: base, - language: lang, - title: title, - content: content, + page: page, } } %} {% stripspace %} {% func (p Page) Title() %} - {% if p.title != "" %} - {%s p.title %}{% space %}—{% space %}{%= p.BaseOf.Title() %} + {% if p.page.Title != "" %} + {%s p.page.Title %}{% space %}—{% space %}{%= p.BaseOf.Title() %} {% else %} {%= p.BaseOf.Title() %} {% endif %} {% endfunc %} {% func (p Page) Lang() %} - {% if p.language != language.Und %} - {%s p.language.String() %} + {% if p.page.Language != language.Und %} + {%s p.page.Language.String() %} {% else %} {%= p.BaseOf.Lang() %} {% endif %} {% endfunc %} {% func (p Page) Body() %} -

{%z p.content %}

+

{%z p.page.Content %}

{% endfunc %} {% endstripspace %} diff --git a/web/template/page.qtpl.go b/web/template/page.qtpl.go index 69d7db6..a005e31 100644 --- a/web/template/page.qtpl.go +++ b/web/template/page.qtpl.go @@ -7,161 +7,159 @@ package template //line web/template/page.qtpl:1 import ( "golang.org/x/text/language" + + "source.toby3d.me/toby3d/home/internal/domain" ) -//line web/template/page.qtpl:5 +//line web/template/page.qtpl:7 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line web/template/page.qtpl:5 +//line web/template/page.qtpl:7 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line web/template/page.qtpl:6 +//line web/template/page.qtpl:8 type Page struct { BaseOf - language language.Tag - title string - content []byte + page *domain.Page } -func NewPage(base BaseOf, lang language.Tag, content []byte, title string) Page { +func NewPage(base BaseOf, page *domain.Page) Page { return Page{ - BaseOf: base, - language: lang, - title: title, - content: content, + BaseOf: base, + page: page, } } -//line web/template/page.qtpl:24 +//line web/template/page.qtpl:22 func (p Page) StreamTitle(qw422016 *qt422016.Writer) { -//line web/template/page.qtpl:25 - if p.title != "" { -//line web/template/page.qtpl:26 - qw422016.E().S(p.title) -//line web/template/page.qtpl:26 +//line web/template/page.qtpl:23 + if p.page.Title != "" { +//line web/template/page.qtpl:24 + qw422016.E().S(p.page.Title) +//line web/template/page.qtpl:24 qw422016.N().S(` `) -//line web/template/page.qtpl:26 +//line web/template/page.qtpl:24 qw422016.N().S(`—`) -//line web/template/page.qtpl:26 +//line web/template/page.qtpl:24 qw422016.N().S(` `) +//line web/template/page.qtpl:24 + p.BaseOf.StreamTitle(qw422016) +//line web/template/page.qtpl:25 + } else { //line web/template/page.qtpl:26 p.BaseOf.StreamTitle(qw422016) //line web/template/page.qtpl:27 - } else { + } //line web/template/page.qtpl:28 - p.BaseOf.StreamTitle(qw422016) -//line web/template/page.qtpl:29 - } -//line web/template/page.qtpl:30 } -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 func (p Page) WriteTitle(qq422016 qtio422016.Writer) { -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 qw422016 := qt422016.AcquireWriter(qq422016) -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 p.StreamTitle(qw422016) -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 qt422016.ReleaseWriter(qw422016) -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 } -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 func (p Page) Title() string { -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 qb422016 := qt422016.AcquireByteBuffer() -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 p.WriteTitle(qb422016) -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 qs422016 := string(qb422016.B) -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 qt422016.ReleaseByteBuffer(qb422016) -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 return qs422016 -//line web/template/page.qtpl:30 +//line web/template/page.qtpl:28 } -//line web/template/page.qtpl:32 +//line web/template/page.qtpl:30 func (p Page) StreamLang(qw422016 *qt422016.Writer) { +//line web/template/page.qtpl:31 + if p.page.Language != language.Und { +//line web/template/page.qtpl:32 + qw422016.E().S(p.page.Language.String()) //line web/template/page.qtpl:33 - if p.language != language.Und { -//line web/template/page.qtpl:34 - qw422016.E().S(p.language.String()) -//line web/template/page.qtpl:35 } else { -//line web/template/page.qtpl:36 +//line web/template/page.qtpl:34 p.BaseOf.StreamLang(qw422016) -//line web/template/page.qtpl:37 +//line web/template/page.qtpl:35 } -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 } -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 func (p Page) WriteLang(qq422016 qtio422016.Writer) { -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 qw422016 := qt422016.AcquireWriter(qq422016) -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 p.StreamLang(qw422016) -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 qt422016.ReleaseWriter(qw422016) -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 } -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 func (p Page) Lang() string { -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 qb422016 := qt422016.AcquireByteBuffer() -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 p.WriteLang(qb422016) -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 qs422016 := string(qb422016.B) -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 qt422016.ReleaseByteBuffer(qb422016) -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 return qs422016 -//line web/template/page.qtpl:38 +//line web/template/page.qtpl:36 } -//line web/template/page.qtpl:40 +//line web/template/page.qtpl:38 func (p Page) StreamBody(qw422016 *qt422016.Writer) { -//line web/template/page.qtpl:40 +//line web/template/page.qtpl:38 qw422016.N().S(`

`) -//line web/template/page.qtpl:41 - qw422016.E().Z(p.content) -//line web/template/page.qtpl:41 +//line web/template/page.qtpl:39 + qw422016.E().Z(p.page.Content) +//line web/template/page.qtpl:39 qw422016.N().S(`

`) -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 } -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 func (p Page) WriteBody(qq422016 qtio422016.Writer) { -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 qw422016 := qt422016.AcquireWriter(qq422016) -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 p.StreamBody(qw422016) -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 qt422016.ReleaseWriter(qw422016) -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 } -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 func (p Page) Body() string { -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 qb422016 := qt422016.AcquireByteBuffer() -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 p.WriteBody(qb422016) -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 qs422016 := string(qb422016.B) -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 qt422016.ReleaseByteBuffer(qb422016) -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 return qs422016 -//line web/template/page.qtpl:42 +//line web/template/page.qtpl:40 }