From a07a3ccb6d76f3bacc85eddf0c132aa29a1a610c Mon Sep 17 00:00:00 2001 From: Mantas Vilčinskas Date: Fri, 4 Oct 2019 18:59:16 +0300 Subject: Added symbols for severity, informational posts, yearly layout default --- exampleSite/config.yml | 2 +- .../issues/2018-06-13-maintenance-window.md | 3 +- .../issues/2019-10-04-testing-cstate-functions.md | 11 +++++ .../issues/2019-10-08-testing-new-pipeline.md | 13 ++++++ layouts/issues/issue.html | 13 +++++- layouts/issues/small.html | 52 +++++++++++++++------- layouts/partials/index/incidents-yearly.html | 4 +- 7 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 exampleSite/content/issues/2019-10-04-testing-cstate-functions.md create mode 100644 exampleSite/content/issues/2019-10-08-testing-new-pipeline.md diff --git a/exampleSite/config.yml b/exampleSite/config.yml index f0a19cd..0a3afe1 100644 --- a/exampleSite/config.yml +++ b/exampleSite/config.yml @@ -170,7 +170,7 @@ params: # # Default: true # BOOLEAN; `true`, `false` - enableYearlyIncidentHistory: false + enableYearlyIncidentHistory: true # Should we show the logo or the title # of the status page? diff --git a/exampleSite/content/issues/2018-06-13-maintenance-window.md b/exampleSite/content/issues/2018-06-13-maintenance-window.md index 6b75810..dae3afb 100644 --- a/exampleSite/content/issues/2018-06-13-maintenance-window.md +++ b/exampleSite/content/issues/2018-06-13-maintenance-window.md @@ -1,7 +1,8 @@ --- title: Maintenance Window date: 2018-06-13 15:54:00 -resolved: false +resolved: true +resolvedWhen: 2018-06-13 16:54:00 # Possible severity levels: down, disrupted, notice severity: disrupted affected: diff --git a/exampleSite/content/issues/2019-10-04-testing-cstate-functions.md b/exampleSite/content/issues/2019-10-04-testing-cstate-functions.md new file mode 100644 index 0000000..e8e2250 --- /dev/null +++ b/exampleSite/content/issues/2019-10-04-testing-cstate-functions.md @@ -0,0 +1,11 @@ +--- +title: Testing New cState Features +date: 2019-10-04 18:05:00 +resolvedWhen: 2019-10-04 18:05:00 +informational: true +section: issue +--- + +There is a new feature in cState version 4 that lets you make what are called _informational_ posts. The main difference is that there will be no _Unresolved_ or _Resolved in under a minute_ text on the pages. + +This is essentially a page with a date and title. \ No newline at end of file diff --git a/exampleSite/content/issues/2019-10-08-testing-new-pipeline.md b/exampleSite/content/issues/2019-10-08-testing-new-pipeline.md new file mode 100644 index 0000000..c30358c --- /dev/null +++ b/exampleSite/content/issues/2019-10-08-testing-new-pipeline.md @@ -0,0 +1,13 @@ +--- +title: New Pipeline Rollout +date: 2019-10-05 16:24:00 +resolved: false +resolvedWhen: 2019-10-05 16:58:00 +# Possible severity levels: down, disrupted, notice +severity: disrupted +affected: + - API +section: issue +--- + +There may be disruptions in the rollout. \ No newline at end of file diff --git a/layouts/issues/issue.html b/layouts/issues/issue.html index c344f57..24cadd8 100644 --- a/layouts/issues/issue.html +++ b/layouts/issues/issue.html @@ -24,7 +24,8 @@ {{ end }}

- {{ if .Params.Resolved }} + {{ if .Params.informational }} + {{ else if .Params.Resolved }} {{ $t := (time .Params.ResolvedWhen) }} {{ $timeDiff := (sub $t.Unix .Date.Unix) }} {{ $diffInMin := (div $timeDiff 60) }} @@ -79,7 +80,15 @@ {{ end }} {{ end }} {{ else }} - {{ T "downtimeOngoing" }} + + {{ if eq .Params.severity "down" }} + ◼ + {{ else if eq .Params.severity "disrupted" }} + ▲ + {{ else }} + ◆ + {{ end }} + {{ T "downtimeOngoing" }} {{ end }}
diff --git a/layouts/issues/small.html b/layouts/issues/small.html index ef30b75..9349046 100644 --- a/layouts/issues/small.html +++ b/layouts/issues/small.html @@ -6,7 +6,23 @@ {{ $isDown := where $active "Params.severity" "=" "down" }} - {{ if .Params.Resolved }} + {{ if .Params.informational }} + + + {{ if .Site.Params.dateFormat }} + {{ .Date.Format .Site.Params.dateFormat }} + {{ else }} + {{ .Date.Format "January 2, 2006 at 3:04 PM" }} + {{ end }} + + +

+ {{ .Title }}  ℹ +

+ {{ .Summary | truncate 200 }} + + + {{ else if .Params.Resolved }} {{ if .Site.Params.dateFormat }} {{ .Date.Format .Site.Params.dateFormat }} @@ -49,24 +65,30 @@ {{ end }} {{ end }} - - {{ else }} - - {{ if .Site.Params.dateFormat }} - {{ .Date.Format .Site.Params.dateFormat }} - {{ else }} - {{ .Date.Format "January 2, 2006 at 3:04 PM" }} - {{ end }} - + + {{ if .Site.Params.dateFormat }} + {{ .Date.Format .Site.Params.dateFormat }} + {{ else }} + {{ .Date.Format "January 2, 2006 at 3:04 PM" }} + {{ end }} + -

- {{ .Title }} -

+

+ {{ .Title }} +

- -
{{ T "downtimeOngoing" }}
+ + + {{ if eq .Params.severity "down" }} + ◼ + {{ else if eq .Params.severity "disrupted" }} + ▲ + {{ else }} + ◆ + {{ end }} + {{ T "downtimeOngoing" }} {{ end }} diff --git a/layouts/partials/index/incidents-yearly.html b/layouts/partials/index/incidents-yearly.html index 36f6e44..5cc323a 100644 --- a/layouts/partials/index/incidents-yearly.html +++ b/layouts/partials/index/incidents-yearly.html @@ -1,7 +1,9 @@ {{ $incidents := where .Site.RegularPages "Params.section" "issue" }} {{ range ((where .Site.RegularPages "Params.section" "issue").GroupByDate "2006") }} -

{{ .Key }}

+

{{ .Key }} + ({{ len .Pages }}) +

{{ range .Pages }} {{ .Render "small" }} -- cgit v1.2.3-70-g09d2