From c516295bb8f6d72312eae4a67d14e904ec1fa4f2 Mon Sep 17 00:00:00 2001 From: Pascal Breuer Date: Mon, 11 May 2020 17:51:10 +0200 Subject: Add config option to disable incident history --- exampleSite/config.yml | 6 ++++ layouts/index.html | 22 +++++++------- layouts/index.xml | 62 +++++++++++++++++++++------------------- layouts/partials/footer.html | 34 +++++++++++----------- layouts/partials/index/tabs.html | 10 ++++--- static/admin/config.yml | 6 ++++ 6 files changed, 80 insertions(+), 60 deletions(-) diff --git a/exampleSite/config.yml b/exampleSite/config.yml index afb644b..6ebd147 100644 --- a/exampleSite/config.yml +++ b/exampleSite/config.yml @@ -172,6 +172,12 @@ params: # STRING; `monthly`, `yearly`, `none` incidentHistoryFormat: "yearly" + # Should incident history be enabled? + # + # Default: `true` + # BOOLEAN; `true`, `false` + enableHistory: true + # Disable dark mode # # If your OS and browser support the diff --git a/layouts/index.html b/layouts/index.html index c02224a..cb1c759 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -37,16 +37,18 @@ {{ partial "index/tabs" . }} -
- {{ if eq .Site.Params.incidentHistoryFormat "yearly" }} - {{ partial "index/incidents-yearly" . }} - {{ else if eq .Site.Params.incidentHistoryFormat "monthly" }} - {{ partial "index/incidents-monthly" . }} - {{ else }} - {{ partial "index/incidents" . }} - {{ end }} -
-
+ {{ if .Site.Params.enableHistory }} +
+ {{ if eq .Site.Params.incidentHistoryFormat "yearly" }} + {{ partial "index/incidents-yearly" . }} + {{ else if eq .Site.Params.incidentHistoryFormat "monthly" }} + {{ partial "index/incidents-monthly" . }} + {{ else }} + {{ partial "index/incidents" . }} + {{ end }} +
+
+ {{ end }} {{ partial "js" . }} {{ partial "footer" . }} diff --git a/layouts/index.xml b/layouts/index.xml index e9ae53d..c0a9cf5 100644 --- a/layouts/index.xml +++ b/layouts/index.xml @@ -1,30 +1,32 @@ - - - - {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} - {{ .Permalink }} - {{ T "incidentHistory" }} - github.com/cstate - {{ with .Site.LanguageCode }}{{.}}{{end}} - {{ if not .Date.IsZero }} - {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ end }} - {{ with .Site.Copyright }} - {{.}}{{end}} - {{ with .OutputFormats.Get "RSS" }} - {{ printf "" .Permalink .MediaType | safeHTML }} - {{ end }} - {{ $incidents := where .Site.RegularPages "Params.section" "issue" }} - {{ range $incidents }} - - {{ if .Params.resolved }}[{{ T "resolved" }}] {{ end }}{{ .Title }} - {{ .Permalink }} - {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ .Permalink }} - {{ .Params.resolvedWhen }} - {{ .Content | html }} - - {{ end }} - - +{{ if .Site.Params.enableHistory }} + + + + {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} + {{ .Permalink }} + {{ T "incidentHistory" }} + github.com/cstate + {{ with .Site.LanguageCode }}{{.}}{{end}} + {{ if not .Date.IsZero }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ end }} + {{ with .Site.Copyright }} + {{.}}{{end}} + {{ with .OutputFormats.Get "RSS" }} + {{ printf "" .Permalink .MediaType | safeHTML }} + {{ end }} + {{ $incidents := where .Site.RegularPages "Params.section" "issue" }} + {{ range $incidents }} + + {{ if .Params.resolved }}[{{ T "resolved" }}] {{ end }}{{ .Title }} + {{ .Permalink }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ .Permalink }} + {{ .Params.resolvedWhen }} + {{ .Content | html }} + + {{ end }} + + +{{ end }} \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 5faf5c6..1be7f97 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -13,22 +13,24 @@ {{ T "poweredBy" }} cState -
- -

- - ⚡ - {{ T "rss" }} — - {{ with $.Site.Home.OutputFormats.Get "rss" }} - {{ T "toAllUpdates" }} - {{ end }} - {{ if not .IsHome }} - {{ with .OutputFormats.Get "rss" }} - {{ T "or" }} {{ T "onlyThisFeed" }} ({{ $.Title }}) - {{ end }} - {{ end }} - -

+ {{ if .Site.Params.enableHistory }} +
+ +

+ + ⚡ + {{ T "rss" }} — + {{ with $.Site.Home.OutputFormats.Get "rss" }} + {{ T "toAllUpdates" }} + {{ end }} + {{ if not .IsHome }} + {{ with .OutputFormats.Get "rss" }} + {{ T "or" }} {{ T "onlyThisFeed" }} ({{ $.Title }}) + {{ end }} + {{ end }} + +

+ {{ end }} diff --git a/layouts/partials/index/tabs.html b/layouts/partials/index/tabs.html index e1fc986..015eb36 100644 --- a/layouts/partials/index/tabs.html +++ b/layouts/partials/index/tabs.html @@ -13,8 +13,10 @@ {{ else }} -
-

{{ T "incidentHistory" }}

-
-
+ {{ if .Site.Params.enableHistory }} +
+

{{ T "incidentHistory" }}

+
+
+ {{ end }} {{ end }} \ No newline at end of file diff --git a/static/admin/config.yml b/static/admin/config.yml index 98a6059..2d35ab3 100644 --- a/static/admin/config.yml +++ b/static/admin/config.yml @@ -193,6 +193,12 @@ collections: min: 1 max: 100 default: 10 + # Incidents history + - label: 'Should the incident history be enabled?' + name: 'incidentHistoryFormat' + hint: 'This also disables the RSS feed.' + widget: 'boolean' + default: true # Incidents view format - label: 'Should the incident history be sorted by year or month?' name: 'incidentHistoryFormat' -- cgit v1.2.3-70-g09d2