diff --git a/web/about.templ b/web/about.templ index 8548276..7eb87dd 100644 --- a/web/about.templ +++ b/web/about.templ @@ -3,7 +3,7 @@ package web import "git.arav.su/Arav/dwelling-home/pkg/servicestat" templ About(filesSrvc string, services servicestat.ServiceList) { - @base("About", "About me and my home servers.", "about, me, servcies", "/about", "About", aboutHead()) + @base("About", "About me and my home servers.", "about, me, servcies", "/about", aboutHead()) } templ aboutHead() { diff --git a/web/article.templ b/web/article.templ index ec4249e..3b75769 100644 --- a/web/article.templ +++ b/web/article.templ @@ -6,7 +6,7 @@ import "net/http" import "git.arav.su/Arav/dwelling-home/pkg/util" templ Article(title, description, body, urlName string, date time.Time, r *http.Request) { - @base(title + " - Articles", description, "", "/stuff/article/"+urlName, "Articles", articleHead()) { + @base(title + " - Article", description, "", "/stuff/article/"+urlName, articleHead()) {

{ title }

diff --git a/web/base.templ b/web/base.templ index 35cb25a..e639c5a 100644 --- a/web/base.templ +++ b/web/base.templ @@ -1,12 +1,12 @@ package web -// import "strings" +import "strings" -templ base(title, description, keywords, canonical, heading string, head templ.Component) { +templ base(title, description, keywords, canonical string, head templ.Component) { - if title != "" { + if title != "" && title != "Home" { { title } - Arav's dwelling } else { Arav's dwelling @@ -28,12 +28,12 @@ templ base(title, description, keywords, canonical, heading string, head templ.C } -
-
+ if heading != "Home" { + Home + } + Stuff + Mindflow + About + Guestbook +
if heading != "" && heading != "Home" { -

{ heading }

+ if strings.HasSuffix(heading, "Article") { +

Article

+ } else { +

{ heading }

+ } } } diff --git a/web/errorXXX.templ b/web/errorXXX.templ index f296b27..d946bc6 100644 --- a/web/errorXXX.templ +++ b/web/errorXXX.templ @@ -5,7 +5,7 @@ import "net/http" templ ErrorXXX(errCode int, reason, message, referer string) { {{ errText := http.StatusText(errCode) }} - @base(errText, errText, "", "", errText, errorXXXHead()) { + @base(errText, errText, "", "", errorXXXHead()) {

{ fmt.Sprint(errCode) }

{ errText } diff --git a/web/guestbook.templ b/web/guestbook.templ index 5cf0477..a302d4d 100644 --- a/web/guestbook.templ +++ b/web/guestbook.templ @@ -10,7 +10,7 @@ import "git.arav.su/Arav/justguestbook" import "git.arav.su/Arav/dwelling-home/pkg/util" templ Guestbook(captchaID, owner string, entries []*justguestbook.Entry, pageCount int64, r *http.Request) { - @base("Guestbook", "This is my guestbook. Welcome.", "guestbook, personal", "/guestbook", "Guestbook", guestbookHead()) { + @base("Guestbook", "This is my guestbook. Welcome.", "guestbook, personal", "/guestbook", guestbookHead()) {
diff --git a/web/guestbook_admin.templ b/web/guestbook_admin.templ index 12cb008..91d181b 100644 --- a/web/guestbook_admin.templ +++ b/web/guestbook_admin.templ @@ -5,5 +5,5 @@ import "net/http" import "git.arav.su/Arav/justguestbook" templ GuestbookAdmin(owner string, entries []*justguestbook.Entry, r *http.Request) { - @base("Guestbook Administration", "", "", "/guestbook/admin", "Guestbook Administration", nil) + @base("Guestbook Administration", "", "", "/guestbook/admin", nil) } diff --git a/web/index.templ b/web/index.templ index 70e3f62..d9112b2 100644 --- a/web/index.templ +++ b/web/index.templ @@ -1,9 +1,7 @@ package web templ Index() { - @base("", - "A homepage of a russian guy Alexander aka Arav. Not just homepage, but something more...", "/", - "homepage, personal, blog, services, self-hosting", "Home", indexHead()) { + @base("Home", "A homepage of a russian guy Alexander aka Arav. Not just homepage, but something more...", "/", "homepage, personal, blog, services, self-hosting", indexHead()) {
arav.su.onion.ygg.i2pah diff --git a/web/mindflow.templ b/web/mindflow.templ index a874848..88a7ded 100644 --- a/web/mindflow.templ +++ b/web/mindflow.templ @@ -8,7 +8,7 @@ import "git.arav.su/Arav/dwelling-home/pkg/mindflow" import "git.arav.su/Arav/dwelling-home/pkg/util" templ Mindflow(posts []mindflow.Post, categories []mindflow.Category, r *http.Request) { - @base("Mindflow", "Updates on my infrastructure, my very important opinions and thoughts.", "updates, thoughts, opinions, blog, diary", "/mindflow", "Mindflow", mindflowHead()) { + @base("Mindflow", "Updates on my infrastructure, my very important opinions and thoughts.", "updates, thoughts, opinions, blog, diary", "/mindflow", mindflowHead()) {

Here I post updates on websites and infrastructure, my very important opinions and thoughts no one asked for. If you'd like to subscribe to this bullshittery then RSS feed at your service. :)