diff --git a/assets/commissions.png b/assets/commissions.png new file mode 100644 index 0000000..44c6ee9 Binary files /dev/null and b/assets/commissions.png differ diff --git a/assets/stats.png b/assets/stats.png new file mode 100644 index 0000000..c301d8d Binary files /dev/null and b/assets/stats.png differ diff --git a/content/art/stats/_index.md b/content/art/stats/_index.md index 7a1de78..7597f19 100644 --- a/content/art/stats/_index.md +++ b/content/art/stats/_index.md @@ -1,5 +1,5 @@ --- -title: "Stats" +title: "Statistics" layout: "art-stats" show_detail_pane: false --- diff --git a/data/art-config.json b/data/art-config.json index 4cbc595..bbee4dd 100644 --- a/data/art-config.json +++ b/data/art-config.json @@ -1,5 +1,5 @@ { - "commissions": true, + "commissions": false, "featured": [ "altswimsuit", "commission-midnighto51", diff --git a/themes/red/assets/css/site.css b/themes/red/assets/css/site.css index 6366a8d..20b4771 100644 --- a/themes/red/assets/css/site.css +++ b/themes/red/assets/css/site.css @@ -819,10 +819,10 @@ model-viewer { margin: 5px; border: 1px solid var(--border-color); border-radius: 5px; - display: inline-grid; text-decoration: none; background-color: var(--background-tertiary); box-shadow: var(--shadow); + position: relative; p { margin: 0; @@ -874,3 +874,20 @@ model-viewer { #character-container { display: grid; } + +.commission-button-text { + position: absolute; + bottom: 0; + right: 0; + background-color: var(--background-primary); + padding: 10px; + font-weight: bold; +} + +#commission-open { + color: green; +} + +#commission-closed { + color: red; +} diff --git a/themes/red/layouts/_default/art-stats.html b/themes/red/layouts/_default/art-stats.html index 520f188..781c7de 100644 --- a/themes/red/layouts/_default/art-stats.html +++ b/themes/red/layouts/_default/art-stats.html @@ -8,13 +8,13 @@ {{ $.Scratch.Set "header-name" "Most Drawn Characters" }} {{ partial "fake-heading.html" $ }} -
    - {{ range first 10 (index site.Taxonomies "characters").ByCount }} +
    + {{ range first 4 (index site.Taxonomies "characters").ByCount }} {{ $year := .Page.Title }} {{ $num := .Count }} {{ $year }}
    ({{ $num }} artworks)
    {{ end }} -
+ {{ $.Scratch.Set "header-name" "# of Artworks by Year" }} {{ partial "fake-heading.html" $ }} diff --git a/themes/red/layouts/_default/art.html b/themes/red/layouts/_default/art.html index 50f0350..3b5d61b 100644 --- a/themes/red/layouts/_default/art.html +++ b/themes/red/layouts/_default/art.html @@ -62,6 +62,21 @@ {{ .Scratch.Set "link" .RelPermalink }} {{ partial "art-fancy-button" . }} {{ end }} + + {{ with $.Site.GetPage "/commission" }} + {{ .Scratch.Set "title" .Title }} + {{ .Scratch.Set "img" "commissions.png" }} + {{ .Scratch.Set "link" .RelPermalink }} + {{ .Scratch.Set "commissions" true }} + {{ partial "art-fancy-button" . }} + {{ end }} + + {{ with $.Site.GetPage "/art/stats" }} + {{ .Scratch.Set "title" .Title }} + {{ .Scratch.Set "img" "stats.png" }} + {{ .Scratch.Set "link" .RelPermalink }} + {{ partial "art-fancy-button" . }} + {{ end }} {{ end }} diff --git a/themes/red/layouts/partials/art-fancy-button.html b/themes/red/layouts/partials/art-fancy-button.html index 68346f0..5ca14b1 100644 --- a/themes/red/layouts/partials/art-fancy-button.html +++ b/themes/red/layouts/partials/art-fancy-button.html @@ -1,11 +1,23 @@ {{ $img := .Scratch.Get "img" }} {{ $title := .Scratch.Get "title" }} {{ $link := .Scratch.Get "link" }} +{{ $commissions := .Scratch.Get "commissions" }} {{ with resources.Get $img }} -

{{ $title }}

- +
+

{{ $title }}

+ +
+ + {{ if $commissions }} + {{ $art_config := index $.Site.Data "art-config" }} + {{ if $art_config.commissions }} + OPEN + {{ else }} + CLOSED + {{ end }} + {{ end }}
{{ else }} Could not find {{ $img }}! diff --git a/themes/red/layouts/partials/art-sidebar.html b/themes/red/layouts/partials/art-sidebar.html index 769f83a..9eb6281 100644 --- a/themes/red/layouts/partials/art-sidebar.html +++ b/themes/red/layouts/partials/art-sidebar.html @@ -1,2 +1,8 @@ Statistics -Commission Info + +{{ $art_config := index $.Site.Data "art-config" }} +{{ if $art_config.commissions }} +Commissions +{{ else }} +Commissions (CLOSED) +{{ end }}