diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/list.html | 11 | ||||
| -rw-r--r-- | layouts/index.json | 2 | ||||
| -rw-r--r-- | layouts/partials/index/announcements.html | 16 | ||||
| -rw-r--r-- | layouts/partials/index/components.html | 16 | ||||
| -rw-r--r-- | layouts/partials/js.html | 2 | ||||
| -rw-r--r-- | layouts/partials/meta.html | 2 |
6 files changed, 21 insertions, 28 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index ac8b704..46142eb 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -13,16 +13,7 @@ {{ range .Site.Params.systems }} {{ if eq .name $title }} {{ with .description }} - <p class="bold">{{ . }} - - {{ with .link }} - <span class="span-icon"> - <a href="{{ . }}"> - 🔗 - </a> - </span> - {{ end }} - </p> + <p class="bold">{{ . }}</p> {{ end }} {{ end }} {{ end }} diff --git a/layouts/index.json b/layouts/index.json index 207f0ac..c770bad 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.3", + "cStateVersion": "5.4", "apiVersion": "2.0", "title": "{{ .Site.Title }}", "languageCodeHTML": "{{ .Site.LanguageCode }}", diff --git a/layouts/partials/index/announcements.html b/layouts/partials/index/announcements.html index e33c262..f8f7471 100644 --- a/layouts/partials/index/announcements.html +++ b/layouts/partials/index/announcements.html @@ -1,11 +1,13 @@ -{{ $incidents := where .Site.RegularPages "Params.section" "issue" }} -{{ $active := where $incidents "Params.resolved" "=" false }} -{{ $activeIncidents := where $incidents "Params.informational" "=" false }} -{{ $pinned := where $incidents "Params.pin" "=" true }} +{{ $allPosts := where .Site.RegularPages "Params.section" "issue" }} +{{ $active := where $allPosts "Params.resolved" "=" false }} -{{ if or ($activeIncidents) ($pinned) }} +{{ $informationals := where $allPosts "Params.informational" "=" true }} +{{ $pinned := where $informationals "Params.pin" "=" true }} + + +{{ if or ($active) ($pinned) }} <div class="announcement-box" style="border-bottom: 0"> - {{ range $activeIncidents }} + {{ range $active }} <div class="padding"> <p> <a href="{{ .RelPermalink }}"><strong class="bold">{{ .Title }} →</strong></a> @@ -19,7 +21,7 @@ {{ end }} </small></p> - {{ .Content | safeHTML | truncate 500 "…" }} <a href="{{ .RelPermalink }}"><b>→</b></a> + {{ .Content | safeHTML | truncate 500 "…" }} <p></p> </div> <hr class="clean announcement-box"> diff --git a/layouts/partials/index/components.html b/layouts/partials/index/components.html index 835c523..9b9b082 100644 --- a/layouts/partials/index/components.html +++ b/layouts/partials/index/components.html @@ -43,19 +43,19 @@ {{ $categorySystems := where $systems "category" "=" .name }} <div class="components"> - {{ range $categorySystems }} - {{ $activeComponentIssues := where $active "Params.affected" "intersect" (slice .name) }} + {{ range $system := $categorySystems }} + {{ $activeComponentIssues := where $active "Params.affected" "intersect" (slice $system.name) }} {{ $thisIsNotice := where $activeComponentIssues "Params.severity" "=" "notice" }} {{ $thisIsDisrupted := where $activeComponentIssues "Params.severity" "=" "disrupted" }} {{ $thisIsDown := where $activeComponentIssues "Params.severity" "=" "down" }} <div class="component" data-status="{{ if $thisIsDown }}down{{ else }}{{ if $thisIsDisrupted }}disrupted{{ else }}{{ if $thisIsNotice }}notice{{ else }}ok{{ end }}{{ end }}{{ end }}"> - <a href="{{ printf "/affected/%s/" (.name | urlize) | relURL }}" class="no-underline"> - {{ default .name .displayName }} + <a href="{{ printf "/affected/%s/" ($system.name | urlize) | relURL }}" class="no-underline"> + {{ default $system.name $system.displayName }} </a> - {{ with .description }} + {{ with $system.description }} <span class="tooltip tooltip--small"> <span class="faded">(?)</span> @@ -65,7 +65,7 @@ </span> {{ end }} - {{ with .link }} + {{ with $system.link }} <span class="span-icon"> <a href="{{ . }}" class="link-style"> 🔗 @@ -87,9 +87,9 @@ {{ end }}{{ end }}{{ end }} </span> - {{ with .partial }} + {{ with $system.partial }} <div> - {{ partial . . }} + {{ partial . (dict "system" $system "incidents" $incidents) }} </div> {{ end }} </div> diff --git a/layouts/partials/js.html b/layouts/partials/js.html index 1b9c554..46ee732 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -3,7 +3,7 @@ * Dev toolset */ - console.log('cState v5.3 - https://github.com/cstate/cstate'); + console.log('cState v5.4 - https://github.com/cstate/cstate'); document.getElementsByTagName('html')[0].className = 'js'; /** diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html index 85a235a..fe8a1a4 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.3 - https://github.com/cstate/cstate"> + <meta name="generator" content="cState v5.4 - https://github.com/cstate/cstate"> <meta name="theme-color" content="{{ .Site.Params.brand }}"> <script> var themeBrandColor = '{{ .Site.Params.brand }}'; |