diff --git a/assets/css/base/_typography.scss b/assets/css/base/_typography.scss index d8430b3..aaeb637 100644 --- a/assets/css/base/_typography.scss +++ b/assets/css/base/_typography.scss @@ -140,7 +140,9 @@ cite.article--shortcite::after { content: none; } -.episode-number { +.episode-number, +.authors--addtional, +.year--original { font-size: 0.75em; opacity: 0.8; } diff --git a/layouts/partials/books/table-body.html b/layouts/partials/books/table-body.html index ae8cc3e..d39a9b4 100644 --- a/layouts/partials/books/table-body.html +++ b/layouts/partials/books/table-body.html @@ -1,8 +1,8 @@ {{ if ( eq ( .Scratch.Get "listMode" ) "current" ) }} - {{ .Scratch.Set "filterCol" "Started At" }} + {{ .Scratch.Set "filterCol" "Date Started" }} {{ .Scratch.Set "filterDir" "asc" }} {{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }} - {{ .Scratch.Set "filterCol" "Finished At" }} + {{ .Scratch.Set "filterCol" "Date Finished" }} {{ .Scratch.Set "filterDir" "desc" }} {{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }} {{ .Scratch.Set "filterCol" "Title" }} @@ -11,26 +11,42 @@ {{ range ( sort ( sort ( index $.Site.Data.books ( .Scratch.Get "listMode" ) ) "Title" "asc" ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }} - {{ index . "Date Added" }} + {{ if index . "Date Added" }}{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}{{ else }}n/a{{end }} +

{{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}} {{ range . }} {{ end }} {{- end -}} - {{ .Title }} + {{ .Title }}{{ if .Edition }} ({{ .Edition }}){{ end }} {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}} {{- end -}} +

- {{ .Author }} - {{ index . "Year Published" }} - {{- if ( index . "Finished At" ) -}} - {{- index . "Finshed At" -}} - {{- else -}} - n/a - {{- end -}} +

{{ .Author }}

+ {{- if ( index . "Additional Authors" ) -}} +

Additional: {{ index . "Additional Authors" }}

+ {{- end -}} + + +

{{- index . "Year Published" -}} + {{- if ( index . "Original Publication Year" ) -}} + (orig. {{ index . "Orginal Publication Year" }}) + {{- end -}} + + + {{- if index . "Date Started" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}} + {{- else -}} + Unknown + {{- end -}}–{{- if index . "Date Finished" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Finished" ) -}} + {{- else -}} + Unknown + {{- end -}} {{ end }} diff --git a/layouts/partials/books/table-header.html b/layouts/partials/books/table-header.html index 4be603d..341406a 100644 --- a/layouts/partials/books/table-header.html +++ b/layouts/partials/books/table-header.html @@ -2,4 +2,4 @@ Title Author(s) Publication Date -Read Date +Dates Read diff --git a/layouts/partials/films/table-body.html b/layouts/partials/films/table-body.html index b3d55dc..3e62e6c 100644 --- a/layouts/partials/films/table-body.html +++ b/layouts/partials/films/table-body.html @@ -1,36 +1,30 @@ {{ if ( eq ( .Scratch.Get "listMode" ) "log" ) }} - {{ .Scratch.Set "filterCol" "Watched Date" }} + {{ .Scratch.Set "filterCol" "Date Watched" }} {{ .Scratch.Set "filterDir" "desc" }} {{ else }} - {{ .Scratch.Set "filterCol" "Name" }} + {{ .Scratch.Set "filterCol" "Title" }} {{ .Scratch.Set "filterDir" "asc" }} {{ end }} -{{ range ( sort ( sort ( index $.Site.Data.films ( .Scratch.Get "listMode" ) ) "Name" "asc" ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }} +{{ range ( sort ( sort ( index $.Site.Data.films ( .Scratch.Get "listMode" ) ) "Title" "asc" ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }} - {{ .Date }} + {{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }} - {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Name ) -}} + {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Title ) -}} {{ range . }} {{ end }} {{- end -}} - {{ .Name }} - {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Name ) -}} + {{ .Title }} + {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Title ) -}} {{- end -}} - {{ .Year }} + {{ index . "Release Year" }} - {{- if ( index . "Watched Date" ) -}} - {{- index . "Watched Date" -}} - {{- else -}} - n/a - {{- end -}} - - - {{- if ( index . "Watched Date" ) -}} - {{- if .Rewatch }}↻{{ end -}} + {{- if ( index . "Date Watched" ) -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Watched" ) -}} + {{- if .Rewatch }} ↻{{ end -}} {{- else -}} n/a {{- end -}} diff --git a/layouts/partials/films/table-header.html b/layouts/partials/films/table-header.html index 568f54f..6f769b1 100644 --- a/layouts/partials/films/table-header.html +++ b/layouts/partials/films/table-header.html @@ -1,5 +1,4 @@ Date Added Title -Year -Watch Date -Rewatch? +Release Year +Date Watched diff --git a/layouts/partials/games/table-body.html b/layouts/partials/games/table-body.html index 63fa879..296688d 100644 --- a/layouts/partials/games/table-body.html +++ b/layouts/partials/games/table-body.html @@ -1,27 +1,40 @@ {{ if ( eq ( .Scratch.Get "listMode" ) "current" ) }} - {{ .Scratch.Set "filterCol" "name" }} + {{ .Scratch.Set "filterCol" "Title" }} {{ .Scratch.Set "filterDir" "asc" }} {{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }} - {{ .Scratch.Set "filterCol" "name" }} + {{ .Scratch.Set "filterCol" "Title" }} {{ .Scratch.Set "filterDir" "asc" }} {{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }} - {{ .Scratch.Set "filterCol" "name" }} + {{ .Scratch.Set "filterCol" "Title" }} {{ .Scratch.Set "filterDir" "asc" }} {{ end }} {{ range ( sort ( index $.Site.Data.games ( .Scratch.Get "listMode" ) ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }} - {{- with ( where ( where $.Site.Pages "Section" "games" ) "Title" .Name ) -}} + {{- with ( where ( where $.Site.Pages "Section" "games" ) "Title" .Title ) -}} {{ range . }} {{ end }} {{- end -}} - {{ .name }} - {{- with ( where ( where $.Site.Pages "Section" "games" ) "Title" .Name ) -}} + {{ .Title }} + {{- with ( where ( where $.Site.Pages "Section" "games" ) "Title" .Title ) -}} {{- end -}} - {{ .release_date }} + {{ index . "Date Released" }} + {{ .Platforms }} + + {{- if index . "Date Started" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}} + {{- else -}} + Unknown + {{- end -}}–{{- if index . "Date Finished" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Finished" ) -}} + {{- else -}} + Unknown + {{- end -}} + {{- if index . "Level of Completion" }} ({{ index . "Level of Completion" }}){{- end -}} + {{ end }} diff --git a/layouts/partials/games/table-header.html b/layouts/partials/games/table-header.html index e826492..04613f6 100644 --- a/layouts/partials/games/table-header.html +++ b/layouts/partials/games/table-header.html @@ -1,2 +1,4 @@ Title -Release Date +Release Year +Platform(s) Played +Date Played diff --git a/layouts/partials/tv/table-body.html b/layouts/partials/tv/table-body.html index 7130631..7a824be 100644 --- a/layouts/partials/tv/table-body.html +++ b/layouts/partials/tv/table-body.html @@ -1,6 +1,6 @@ {{ if ( eq ( .Scratch.Get "listMode" ) "log" ) }} {{ if ( eq ( .Scratch.Get "listMode" ) "log" ) }} - {{ .Scratch.Set "filterCol" "Watch Date" }} + {{ .Scratch.Set "filterCol" "Date Watched" }} {{ .Scratch.Set "filterDir" "desc" }} {{ end }} @@ -22,8 +22,8 @@ {{- end -}} - {{- if ( index . "Watch Date" ) -}} - {{- time.Format "Jan 2, 2006" ( index . "Watch Date" ) -}} + {{- if ( index . "Date Watched" ) -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Watched" ) -}} {{- else -}} n/a {{- end -}}