From c41b6e2e98c899ccf327cfde68acce27a74c342b Mon Sep 17 00:00:00 2001 From: perennial Date: Thu, 26 Sep 2024 00:03:50 +1000 Subject: [PATCH] Rough draft for Artwork page --- assets/views/artwork.jet.html | 120 ++++++------- assets/views/fragments/artwork.jet.html | 178 +++++++++---------- assets/views/fragments/small-tn.jet.html | 37 ++-- assets/views/fragments/thumbnail-dt.jet.html | 54 +++--- 4 files changed, 196 insertions(+), 193 deletions(-) diff --git a/assets/views/artwork.jet.html b/assets/views/artwork.jet.html index 2c3229d..cf83e70 100644 --- a/assets/views/artwork.jet.html +++ b/assets/views/artwork.jet.html @@ -1,77 +1,75 @@ {{- extends "layout/default" }} {{- block body() }} -
- {{- include "fragments/artwork" .Illust }} - {{- if .Illust.SeriesNavData }} -
-
- Series: - {{- .Illust.SeriesNavData.Title }} - +
+
+
+ {{- include "fragments/artwork" .Illust }}
- {{- if .Illust.SeriesNavData.Next }} - - {{- end}} - {{- if .Illust.SeriesNavData.Prev }} - - {{- end}}
- {{- end}} -
-
- {{ .Illust.User.Name }} Other works by {{ .Illust.User.Name }} - » + +
+
+ + {{ .Illust.User.Name }} + Other works by {{ .Illust.User.Name }} {{- combinedUrl := "/artworks-multi/" + joinArtworkIds(.Illust.RecentWorks) }} -
View all
+ View all
-
- {{- range .Illust.RecentWorks }} -
- {{- include "fragments/thumbnail-dt" . }} +
+
+ {{- range .Illust.RecentWorks }} +
+
+ {{- include "fragments/thumbnail-dt" . }} +
+
+ {{- end }}
- {{- end }}
-
-
- Comments - {{- if .Illust.CommentDisabled == 1 }} -

The creator turned comments off

- {{- else if .Illust.Comments == 0 }} -

There are no comments yet

- {{- else }} {{ range .Illust.CommentsList }} -
- - {{ .AuthorName }} - -
- - {{- .AuthorName }} - -

- {{- if .Stamp }} - /proxy/s.pximg.net/common/images/stamp/generated-stamps/{{ .Stamp }}_s.jpg - {{- else }} {{ raw: parseEmojis(.Context) }} {{ end }} -

- {{ .Date }} +
+
+

+ +

+
+
+ {{- if .Illust.CommentDisabled == 1 }} +

The creator turned comments off

+ {{- else if .Illust.Comments == 0 }} +

There are no comments yet

+ {{- else }} + {{- range .Illust.CommentsList }} +
+ + {{ .AuthorName }} + +
+ {{ .AuthorName }} +

+ {{- if .Stamp }} + /proxy/s.pximg.net/common/images/stamp/generated-stamps/{{ .Stamp }}_s.jpg + {{- else }} + {{ raw: parseEmojis(.Context) }} + {{- end }} +

+ {{ .Date }} +
+
+ {{- end }} + {{- end }} +
- {{- end }} {{ end }} -
-
-
-

Related works

-
+
+ +

Related works

+
{{- include "fragments/small-tn" .Illust.RelatedWorks }}
diff --git a/assets/views/fragments/artwork.jet.html b/assets/views/fragments/artwork.jet.html index deba968..40c45d6 100644 --- a/assets/views/fragments/artwork.jet.html +++ b/assets/views/fragments/artwork.jet.html @@ -1,102 +1,94 @@ -{{- if !.IsUgoira }} -
- {{- range index := .Images }} - - {{- if .Width != 0 && .Height != 0 }} - {* todo: do not reflow the page because of loading image *} - Page {{ index + 1 }} +
+
+ {{- if !.IsUgoira }} +
+ {{- range index := .Images }} + + {{- if .Width != 0 && .Height != 0 }} + Page {{ index + 1 }} + {{- else }} + Page {{ index + 1 }} + {{- end }} + + {{- end }} +
{{- else }} - Page {{ index + 1 }} +
+ +
+
+ Download + Go to ugoira.com for more options +
{{- end }} - - {{- end }} -
-{{- else }} -
- -
-Download -
-Go to ugoira.com for more options -{{- end }} -
-
- {{ .User.Name }} - -
-
{{ .Title }}
-
- {{ .User.Name }} +
+
+ + {{ .User.Name }} + +
+
{{ .Title }}
+ {{ .User.Name }} +
+
+
+ {{- if isset(.BookmarkData) && LoggedIn }} + + Bookmarked + + {{- else }} + + Bookmark + + {{- end }} + + {{- if .Liked && LoggedIn}} + + {{- else }} + + Like + + {{- end }}
-
-
- {{- if isset(.BookmarkData) && LoggedIn }} - - Bookmarked - - {{- else }} - - Bookmark - - {{- end }} - {{- if .Liked && LoggedIn}} - Liked +
+ pixiv.net/i/{{ .ID }} +
- {{- else }} - - Like - - {{- end }} +
+ {{- .Views }} + {{- .Bookmarks }} + {{- .Likes }} + {{- parseTime: .Date }} +
+ +
+ {{- if .AiType == 2 }} + AI-generated + {{- end }} + {{- range .Tags }} + {{- if isEmphasize(.Name) }} + {{ .Name }} + {{- else }} + + #{{ .Name }} + {{- if .TranslatedName }} + ({{ .TranslatedName }}) + {{- end }} + + {{- end }} + {{- end }} +
+ +
+ {{- raw: parsePixivRedirect(.Description) }} +
- - -
- - Views - {{- .Views }} - - - Bookmarks - {{- .Bookmarks }} - - - Likes - {{- .Likes }} - - - Date - {{- parseTime: .Date }} - -
- -
- {{- if .AiType == 2 }} - - AI-generated - - {{- end }} {{ range .Tags }} {{ if isEmphasize(.Name) }} - - {{ .Name }} - - {{- else }} - - #{{ .Name }}{{ .TranslatedName }} - - {{- end }} {{ end }} -
-
-
- {{- raw: parsePixivRedirect(.Description) }} -
-
\ No newline at end of file diff --git a/assets/views/fragments/small-tn.jet.html b/assets/views/fragments/small-tn.jet.html index a7800fa..bf38568 100644 --- a/assets/views/fragments/small-tn.jet.html +++ b/assets/views/fragments/small-tn.jet.html @@ -1,17 +1,26 @@ -{{- range . }} {{ if .ID == "#" }} -
- {{ .Title }} -
- {{ .Title }} +{{- range . }} +
+ {{- if .ID == "#" }} +
+ {{ .Title }} +
+
{{ .Title }}
+
+ {{ .ArtistName }} + {{ .ArtistName }} +
+
-
- {{ .ArtistName }} - {{ .ArtistName }} + {{- else if .ID }} +
+
+ {{ include "thumbnail-dt" . }} +
+
+ {{ include "thumbnail-tt" . }} + {{ include "thumbnail-at" . }} +
+ {{- end }}
-{{- else if .ID }} -
- {{ include "thumbnail-dt" . }} {{ include "thumbnail-tt" . }} {{ include - "thumbnail-at" . }} -
-{{- end }} {{ end }} +{{- end }} diff --git a/assets/views/fragments/thumbnail-dt.jet.html b/assets/views/fragments/thumbnail-dt.jet.html index ade0fb2..bdfb352 100644 --- a/assets/views/fragments/thumbnail-dt.jet.html +++ b/assets/views/fragments/thumbnail-dt.jet.html @@ -2,31 +2,35 @@ {{- hideR18 := CookieList["pixivfe-HideArtR18"] }} {{- hideR18G := CookieList["pixivfe-HideArtR18G"] }} {{- hideAi := CookieList["pixivfe-HideArtAI"] }} -
-
- {{- if isset(.Rank) }} -
{{ .Rank }}
- {{- end }} - {{- if .XRestrict != 0 }} -
- {{ if .XRestrict == 1 }}R-18{{ else }}R-18G{{ end }} +
+
+
+ {{- if isset(.Rank) }} + {{ .Rank }} + {{- end }} + {{- if .XRestrict != 0 }} + + {{ if .XRestrict == 1 }}R-18{{ else }}R-18G{{ end }} + + {{- end }}
- {{- end }} - {{- if .Pages > 1 }} -
⧉ {{ .Pages }}
- {{- end }} - {{- if .IllustType == 2 }} -
▶
- {{- end }} +
+ {{- if .Pages > 1 }} + ⧉ {{ .Pages }} + {{- end }} + {{- if .IllustType == 2 }} + ▶ + {{- end }} +
+ {{- AiType := isset(.AiType) ? .AiType : 0}} + + {{- if (.XRestrict > 0 && hideR18 != "" && hideR18G != "") || (.XRestrict == 2 && hideR18G != "") }} + {{ .Title }} + {{- else if AiType == 2 && hideAi }} + {{ .Title }} + {{- else }} + {{ .Title }} + {{- end }} +
- {{- AiType := isset(.AiType) ? .AiType : 0}} - - {{- if (.XRestrict > 0 && hideR18 != "" && hideR18G != "") || (.XRestrict == 2 && hideR18G != "") }} - {{ .Title }} - {{- else if AiType == 2 && hideAi }} - {{ .Title }} - {{- else }} - {{ .Title }} - {{- end }} -