diff --git a/public/style.css b/public/style.css index dbdc9a80..440d37bc 100644 --- a/public/style.css +++ b/public/style.css @@ -7164,6 +7164,7 @@ code { --color: #000; --link-color: #d12991; --timeline-media-background: #b4b4b466; + --unread-color: #9498ff; --border-color: var(--c4); --border-color-focused: #4e55ff; --border-color-error: #ff3a3a; @@ -8147,7 +8148,7 @@ input[type=submit]:not(.no-padding), display: inline-block; border-radius: 1000em; padding: 0 0.8em; - font-size: 0.9em; + font-size: 0.6em; line-height: 1.8em; font-weight: bold; } @@ -8924,6 +8925,14 @@ code .ss, max-height: calc(100vh - 2rem); } } +.timeline-unread { + --size: 0.5rem; + display: inline-block; + width: var(--size); + height: var(--size); + background-color: var(--unread-color); + border-radius: 999px; +} /* src/rawdata/scss/style.css */ /*! TACHYONS v4.12.0 | http://tachyons.io */ diff --git a/src/rawdata/scss/forum.css b/src/rawdata/scss/forum.css index 966dbfdb..d4928c66 100644 --- a/src/rawdata/scss/forum.css +++ b/src/rawdata/scss/forum.css @@ -41,7 +41,7 @@ display: inline-block; border-radius: 1000em; padding: 0 0.8em; - font-size: 0.9em; + font-size: 0.6em; line-height: 1.8em; font-weight: bold; diff --git a/src/rawdata/scss/timeline.css b/src/rawdata/scss/timeline.css index b9da7978..dd4bc2a2 100644 --- a/src/rawdata/scss/timeline.css +++ b/src/rawdata/scss/timeline.css @@ -69,4 +69,13 @@ max-height: calc(100vh - 2rem); } } +} + +.timeline-unread { + --size: 0.5rem; + display: inline-block; + width: var(--size); + height: var(--size); + background-color: var(--unread-color); + border-radius: 999px; } \ No newline at end of file diff --git a/src/rawdata/scss/vars.css b/src/rawdata/scss/vars.css index 312f84dc..de2badbf 100644 --- a/src/rawdata/scss/vars.css +++ b/src/rawdata/scss/vars.css @@ -39,6 +39,8 @@ $breakpoint-large: screen and (min-width: 60em) --timeline-media-background: #b4b4b466; + --unread-color: #9498ff; + --border-color: var(--c4); --border-color-focused: #4e55ff; --border-color-error: #ff3a3a; diff --git a/src/templates/img/close.svg b/src/templates/img/close.svg index 1b0f1e8c..e4d2734d 100755 --- a/src/templates/img/close.svg +++ b/src/templates/img/close.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/templates/src/blog_post.html b/src/templates/src/blog_post.html index f1c19688..6f1bb6ec 100644 --- a/src/templates/src/blog_post.html +++ b/src/templates/src/blog_post.html @@ -1,25 +1,64 @@ {{ template "base-2024.html" . }} {{ define "content" }} -
-
-
-

{{ .Thread.Title }}

- {{ with .MainPost }} -
-
-
-
- -
{{ timehtml (absoluteshortdate .PostDate) .PostDate }}
+
+

{{ .Thread.Title }}

+ {{ with .MainPost }} +
+ + + {{ .Author.Name }} + — {{ timehtml (absoluteshortdate .PostDate) .PostDate }} + {{ if and $.User (or (eq .Author.ID $.User.ID) $.User.IsStaff) }} + (Edit, Delete) + {{ end }} + +
+ {{ end }} +
+
+
+ {{ .MainPost.Content }} +
+ + {{ if not .IsProjectPage }} + {{ template "newsletter_signup.html" . }} + {{ end }} +
+ +
+ +
+
+

Comments

+ {{ if .Project.HasBlog }} + {{ svg "add" }}Leave a Comment + {{ end }} +
+
+ {{ range .Comments }} +
+
+ +
+
+ {{ .Author.Name }} + {{ if .Author.IsStaff }} +
+ {{ end }} +
+
+ {{ timehtml (absoluteshortdate .PostDate) .PostDate }} + {{- if .Editor -}} + . + Edited by {{ coalesce .Editor.Name .Editor.Username }} + on {{ timehtml (absolutedate .EditDate) .EditDate }} + {{ with .EditReason }} + Reason: {{ . }} + {{ end }} + + {{ end }}
-
-
- {{ if .Author.IsStaff }} -
- {{ end }}
@@ -35,97 +74,29 @@ {{ end }} ↪  {{ end }} + + #{{ .ID }} +
{{ end }}
- {{ end }} - - -
- {{ .MainPost.Content }} + {{ .Content }}
-
- - {{ if not .IsProjectPage }} - {{ template "newsletter_signup.html" . }} + {{ else }} +
+ No comments yet. +
{{ end }} - -
- - {{ range .Comments }} -
-
-
-
-
-
-
- -
- {{ timehtml (relativedate .PostDate) .PostDate }} - {{ if .Editor }} - - Edited by - {{ coalesce .Editor.Name .Editor.Username }} - on {{ timehtml (absolutedate .EditDate) .EditDate }} - {{ with .EditReason }} - Reason: {{ . }} - {{ end }} - - {{ end }} -
-
-
- {{ if .Author.IsStaff }} -
- {{ end }} -
-
-
- {{ if and $.User $.Project.HasBlog }} -
- {{ if or (eq .Author.ID $.User.ID) $.User.IsStaff }} - ✖  - ✎  - {{ end }} - {{ if or (not $.Thread.Locked) $.User.IsStaff }} - {{ if $.Thread.Locked }} - WARNING: locked thread - use power responsibly! - {{ end }} - ↪  - {{ end }} - - #{{ .ID }} - -
- {{ end }} -
-
-
-
- {{ .Content }} -
-
-
-
- {{ end }} - -
- -
- {{ if .Project.HasBlog }} - {{ if $.User }} - + Add Comment - {{ else }} - Log in to comment - {{ end }} - {{ end }} -
+ {{ if .Project.HasBlog }} + {{ if gt (len .Comments) 0 }} +
+ {{ svg "add" }}Leave a Comment +
+ {{ end }} + {{ end }}
{{ end }} diff --git a/src/templates/src/include/timeline_item.html b/src/templates/src/include/timeline_item.html index 24294495..b5db4b12 100644 --- a/src/templates/src/include/timeline_item.html +++ b/src/templates/src/include/timeline_item.html @@ -8,17 +8,17 @@ {{ end }} {{ if .ForumLayout }} -
+
{{ with .Breadcrumbs }} {{ template "breadcrumbs.html" . }} {{ end }} {{ if .Title }}
{{ with .TypeTitle }}{{ . }}:{{ end }} - {{ .Title }} + {{ .Title }}
{{ end }} -
+
{{ .OwnerName }} — {{ timehtml (absoluteshortdate .Date) .Date }}
@@ -80,10 +80,10 @@ {{ end }} {{ if .Description }} -
+
{{ trim .Description }}
{{ if .TruncateDescription }} -
+
{{ end }}
{{ if .TruncateDescription }} diff --git a/src/templates/src/landing.html b/src/templates/src/landing.html index 021ed763..d79445e7 100644 --- a/src/templates/src/landing.html +++ b/src/templates/src/landing.html @@ -141,6 +141,14 @@
+ {{ $latestNews := (index .NewsItems 0) }} +
{{ if .User }} @@ -148,7 +156,7 @@ {{ end }}
Featured
Recent
-
News
+
News {{ if $latestNews.Unread }}{{ end }}
{{ if .User }} @@ -206,6 +214,27 @@ selectTab(tab, { sendEvent: false }); } }); + + // Latest news + + const latestNews = document.querySelector("#latest_news"); + const latestNewsPostID = latestNews.getAttribute("data-id"); + const latestNewsClosedKey = "latest_news_closed"; + + function closeLatestNews(e) { + e.preventDefault(); + localStorage.setItem(latestNewsClosedKey, latestNewsPostID); + hideLatestNewsIfClosedOrRead(); + } + + function hideLatestNewsIfClosedOrRead() { + const isUnread = latestNews.hasAttribute("data-unread"); + const closedID = localStorage.getItem(latestNewsClosedKey); + if (!isUnread || closedID === latestNewsPostID) { + latestNews.hidden = true; + } + } + hideLatestNewsIfClosedOrRead(); {{ end }} diff --git a/src/templates/types.go b/src/templates/types.go index bbf67cf1..a67f7fc9 100644 --- a/src/templates/types.go +++ b/src/templates/types.go @@ -354,6 +354,8 @@ type TimelineItem struct { Media []TimelineItemMedia + Unread bool + ForumLayout bool AllowTitleWrap bool TruncateDescription bool diff --git a/src/website/landing.go b/src/website/landing.go index 80c3117f..4cfc0f38 100644 --- a/src/website/landing.go +++ b/src/website/landing.go @@ -99,6 +99,7 @@ func Index(c *RequestContext) ResponseData { item.Description = template.HTML(t.FirstPostCurrentVersion.TextParsed) item.AllowTitleWrap = true item.TruncateDescription = true + item.Unread = t.Unread newsItems = append(newsItems, item) } diff --git a/src/website/timeline_helper.go b/src/website/timeline_helper.go index c01d1a76..22c1fb61 100644 --- a/src/website/timeline_helper.go +++ b/src/website/timeline_helper.go @@ -167,6 +167,7 @@ func PostToTimelineItem( ownerTmpl := templates.UserToTemplate(owner) item := templates.TimelineItem{ + ID: strconv.Itoa(post.ID), Date: post.PostDate, Title: thread.Title, Breadcrumbs: GenericThreadBreadcrumbs(urlContext, lineageBuilder, thread),