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 --- layouts/index.html | 22 +++++++------- layouts/index.xml | 62 +++++++++++++++++++++------------------- layouts/partials/footer.html | 34 +++++++++++----------- layouts/partials/index/tabs.html | 10 ++++--- 4 files changed, 68 insertions(+), 60 deletions(-) (limited to 'layouts') 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 -- cgit v1.2.3-70-g09d2 From 75b462973ee153b3a461700b12870c7add9f78bd Mon Sep 17 00:00:00 2001 From: Mantas Vilčinskas <11616378+mistermantas@users.noreply.github.com> Date: Tue, 19 May 2020 11:55:35 +0300 Subject: Update footer.html --- layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'layouts') diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 1be7f97..fb1bb50 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -13,7 +13,7 @@ {{ T "poweredBy" }} cState - {{ if .Site.Params.enableHistory }} + {{ if not .Site.Params.disableIncidentHistory }}

-- cgit v1.2.3-70-g09d2 From 56d9f7ada5016f62f35a1a20609f0881f4f11ed6 Mon Sep 17 00:00:00 2001 From: Mantas Vilčinskas <11616378+mistermantas@users.noreply.github.com> Date: Tue, 19 May 2020 11:55:48 +0300 Subject: Update tabs.html --- layouts/partials/index/tabs.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layouts') diff --git a/layouts/partials/index/tabs.html b/layouts/partials/index/tabs.html index 015eb36..9544890 100644 --- a/layouts/partials/index/tabs.html +++ b/layouts/partials/index/tabs.html @@ -13,10 +13,10 @@ {{ else }} - {{ if .Site.Params.enableHistory }} + {{ if not .Site.Params.disableIncidentHistory }}

{{ T "incidentHistory" }}

{{ end }} -{{ end }} \ No newline at end of file +{{ end }} -- cgit v1.2.3-70-g09d2 From 44f1a08801ba8acf655071637ad7aa9a67981403 Mon Sep 17 00:00:00 2001 From: Mantas Vilčinskas <11616378+mistermantas@users.noreply.github.com> Date: Tue, 19 May 2020 11:58:00 +0300 Subject: Update index.html --- layouts/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'layouts') diff --git a/layouts/index.html b/layouts/index.html index cb1c759..2faafaa 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -37,7 +37,7 @@ {{ partial "index/tabs" . }} - {{ if .Site.Params.enableHistory }} + {{ if not .Site.Params.disableIncidentHistory }}
{{ if eq .Site.Params.incidentHistoryFormat "yearly" }} {{ partial "index/incidents-yearly" . }} -- cgit v1.2.3-70-g09d2 From 55e85c9249159184a752078cc33b796e0a2c007e Mon Sep 17 00:00:00 2001 From: Mantas Vilčinskas <11616378+mistermantas@users.noreply.github.com> Date: Tue, 19 May 2020 11:58:22 +0300 Subject: Update index.xml --- layouts/index.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layouts') diff --git a/layouts/index.xml b/layouts/index.xml index c0a9cf5..c8bce41 100644 --- a/layouts/index.xml +++ b/layouts/index.xml @@ -1,4 +1,4 @@ -{{ if .Site.Params.enableHistory }} +{{ if not .Site.Params.disableIncidentHistory }}