diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/index.json | 16 | ||||
| -rw-r--r-- | layouts/issues/issue.html | 2 | ||||
| -rw-r--r-- | layouts/issues/single.html | 2 | ||||
| -rw-r--r-- | layouts/issues/single.json | 1 | ||||
| -rw-r--r-- | layouts/issues/small.html | 14 | ||||
| -rw-r--r-- | layouts/partials/index/announcements.html | 4 | ||||
| -rw-r--r-- | layouts/partials/js.html | 4 | ||||
| -rw-r--r-- | layouts/partials/meta.html | 2 |
8 files changed, 31 insertions, 14 deletions
diff --git a/layouts/index.json b/layouts/index.json index a7ce134..0067dc3 100644 --- a/layouts/index.json +++ b/layouts/index.json @@ -1,6 +1,6 @@ {{ $incidents := where .Site.RegularPages "Params.section" "issue" }}{{ $active := where $incidents "Params.resolved" "=" false }}{{ $isNotice := where $active "Params.severity" "=" "notice" }}{{ $isDisrupted := where $active "Params.severity" "=" "disrupted" }}{{ $isDown := where $active "Params.severity" "=" "down" }}{ "is": "index", - "cStateVersion": "5.5.2", + "cStateVersion": "5.6", "apiVersion": "2.0", "title": "{{ .Site.Title }}", "languageCodeHTML": "{{ .Site.LanguageCode }}", @@ -17,6 +17,20 @@ } {{ end }} ], + {{ $informationals := where $incidents "Params.informational" "=" true }}{{ $pinnedIssues := where $informationals "Params.pin" "=" true }} + {{ if not $pinnedIssues }} + "pinnedIssues": []{{ else }} + "pinnedIssues": [{{ range $i, $e := $pinnedIssues }}{{ if $i }},{{ end }} + { + "is": "issue", + "title": "{{ .Title }}", + "createdAt": "{{ .Date }}", + "lastMod": "{{ .Lastmod }}", + "permalink": "{{ .Permalink }}", + "affected": [{{ range $i, $e := .Params.Affected }}{{ if $i }}, {{ end }}"{{ . }}"{{ end }}], + "filename": "{{ .File.LogicalName }}" + }{{ end }} + ]{{ end }}, "systems": [ {{ range $i, $e := .Site.Params.systems }}{{ if $i }},{{ end }} { diff --git a/layouts/issues/issue.html b/layouts/issues/issue.html index c010502..513d884 100644 --- a/layouts/issues/issue.html +++ b/layouts/issues/issue.html @@ -12,7 +12,7 @@ <small class="date"> {{ if .Site.Params.dateFormat }} - {{ .Date.Format .Site.Params.dateFormat }} + {{ dateFormat .Site.Params.dateFormat .Params.date }} {{ else }} {{ .Date.Format "January 2, 2006 at 3:04 PM" }} {{ end }} diff --git a/layouts/issues/single.html b/layouts/issues/single.html index 0dd8052..9aa135b 100644 --- a/layouts/issues/single.html +++ b/layouts/issues/single.html @@ -21,7 +21,7 @@ <p>{{ T "lastChecked" }}: {{ if .Site.Params.dateFormat }} - {{ .Lastmod.Format .Site.Params.dateFormat }} + {{ dateFormat .Site.Params.dateFormat .Lastmod }} {{ else }} {{ .Lastmod.Format "January 2, 2006 at 3:04 PM" }} {{ end }} diff --git a/layouts/issues/single.json b/layouts/issues/single.json index fb78ee7..5795d09 100644 --- a/layouts/issues/single.json +++ b/layouts/issues/single.json @@ -1,6 +1,7 @@ { "is": "issue", "title": "{{ .Title }}", + "body": {{ jsonify .Content }}, "createdAt": "{{ .Date }}", "lastMod": "{{ .Lastmod }}", "permalink": "{{ .Permalink }}", diff --git a/layouts/issues/small.html b/layouts/issues/small.html index 97baec9..cac8109 100644 --- a/layouts/issues/small.html +++ b/layouts/issues/small.html @@ -8,9 +8,9 @@ <a href="{{ .Permalink }}" class="issue no-underline"> {{ if .Params.informational }} - <small class="date float-right {{ cond .Site.Params.useRelativeTime "relative-time" "" }}" title="{{ .Date.Format "Jan 2 15:04:05 2006 UTC" }}"> + <small class="date float-right {{ cond .Site.Params.useRelativeTime "relative-time" "" }}" title="{{ dateFormat .Site.Params.dateFormat .Params.date }}" data-date="{{ .Date.Format "Jan 2 15:04:05 2006 UTC" }}"> {{ if .Site.Params.dateFormat }} - {{ .Date.Format .Site.Params.dateFormat }} + {{ dateFormat .Site.Params.dateFormat .Params.date }} {{ else }} {{ .Date.Format "January 2, 2006 at 3:04 PM" }} {{ end }} @@ -23,9 +23,9 @@ </span> {{ else if .Params.Resolved }} - <small class="date float-right {{ cond .Site.Params.useRelativeTime "relative-time" "" }}" title="{{ .Date.Format "Jan 2 15:04:05 2006 UTC" }}"> + <small class="date float-right {{ cond .Site.Params.useRelativeTime "relative-time" "" }}" title="{{ dateFormat .Site.Params.dateFormat .Params.date }}" data-date="{{ .Date.Format "Jan 2 15:04:05 2006 UTC" }}"> {{ if .Site.Params.dateFormat }} - {{ .Date.Format .Site.Params.dateFormat }} + {{ dateFormat .Site.Params.dateFormat .Params.date }} {{ else }} {{ .Date.Format "January 2, 2006 at 3:04 PM" }} {{ end }} @@ -73,11 +73,11 @@ {{ else }} <!-- If not resolved --> - <small class="date float-right {{ cond .Site.Params.useRelativeTime "relative-time" "" }}" title="{{ .Date.Format "Jan 2 15:04:05 2006 UTC" }}"> + <small class="date float-right {{ cond .Site.Params.useRelativeTime "relative-time" "" }}" title="{{ dateFormat .Site.Params.dateFormat .Params.date }}" data-date="{{ .Date.Format "Jan 2 15:04:05 2006 UTC" }}"> {{ if .Date.Before now }} {{ if .Site.Params.dateFormat }} - {{ .Date.Format .Site.Params.dateFormat }} + {{ dateFormat .Site.Params.dateFormat .Params.date }} {{ else }} {{ .Date.Format "January 2, 2006 at 3:04 PM" }} {{ end }} @@ -99,7 +99,7 @@ {{ T "downtimeOngoing" }} {{ else }} {{ if .Site.Params.dateFormat }} - {{ .Date.Format .Site.Params.dateFormat }} + {{ dateFormat .Site.Params.dateFormat .Params.date }} {{ else }} {{ .Date.Format "January 2, 2006 at 3:04 PM" }} {{ end }} diff --git a/layouts/partials/index/announcements.html b/layouts/partials/index/announcements.html index 2bb7f08..389d673 100644 --- a/layouts/partials/index/announcements.html +++ b/layouts/partials/index/announcements.html @@ -1,5 +1,7 @@ {{ $allPosts := where .Site.RegularPages "Params.section" "issue" }} -{{ $active := where $allPosts "Params.resolved" "=" false }} +{{ $allActive := where $allPosts "Params.resolved" "=" false }} +{{ $active := where $allActive "Params.pin" "!=" false }} +{{/* this $active checks if pin is explicitely set to false */}} {{ $informationals := where $allPosts "Params.informational" "=" true }} {{ $pinned := where $informationals "Params.pin" "=" true }} diff --git a/layouts/partials/js.html b/layouts/partials/js.html index a5b974e..b7dad07 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -3,7 +3,7 @@ * Dev toolset */ - console.log('cState v5.5.2 - https://github.com/cstate/cstate'); + console.log('cState v5.6 - https://github.com/cstate/cstate'); document.getElementsByTagName('html')[0].className = 'js'; /** @@ -103,7 +103,7 @@ var elements = document.querySelectorAll('.relative-time'); for (var i = 0; i < elements.length; i++) { var element = elements[i]; - var time = Date.parse(element.getAttribute('title')); + var time = Date.parse(element.dataset.date); var html = element.getAttribute('data-time-prefix') || ''; diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html index da0ed46..eec0772 100644 --- a/layouts/partials/meta.html +++ b/layouts/partials/meta.html @@ -12,7 +12,7 @@ {{ range .AlternativeOutputFormats -}} {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} {{ end -}} - <meta name="generator" content="cState v5.5.2 - https://github.com/cstate/cstate"> + <meta name="generator" content="cState v5.6 - https://github.com/cstate/cstate"> <meta name="theme-color" content="{{ .Site.Params.brand }}"> <script> var themeBrandColor = '{{ .Site.Params.brand }}'; |