From d7500b363fee49307304fa623f74649cb408b532 Mon Sep 17 00:00:00 2001 From: Mantas <11616378+mistermantas@users.noreply.github.com> Date: Wed, 11 Jul 2018 14:45:50 +0300 Subject: v2-dev2 --- layouts/_default/single.html | 6 +- layouts/index.html | 40 ++++++-- layouts/issues/single.html | 10 +- layouts/partials/custom/above-footer.html | 8 ++ layouts/partials/custom/above-header.html | 8 ++ layouts/partials/custom/below-footer.html | 8 ++ layouts/partials/custom/below-header.html | 8 ++ layouts/partials/custom/meta.html | 8 ++ layouts/partials/footer.html | 1 + layouts/partials/header.html | 1 + layouts/partials/js.html | 152 +++++++++++++++++++++++++----- layouts/partials/meta.html | 40 ++++++-- layouts/uptime/single.html | 21 +++++ 13 files changed, 269 insertions(+), 42 deletions(-) create mode 100644 layouts/partials/custom/above-footer.html create mode 100644 layouts/partials/custom/above-header.html create mode 100644 layouts/partials/custom/below-footer.html create mode 100644 layouts/partials/custom/below-header.html create mode 100644 layouts/partials/custom/meta.html (limited to 'layouts') diff --git a/layouts/_default/single.html b/layouts/_default/single.html index c0a9070..8463204 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -7,4 +7,8 @@ {{ .Render "post" }} -{{ partial "footer" . }} + + {{ partial "js" . }} + {{ partial "footer" . }} + + diff --git a/layouts/index.html b/layouts/index.html index eedb08d..f80dfe0 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -7,7 +7,7 @@ {{ $isDisrupted := where $active "Params.severity" "=" "disrupted" }} {{ $isDown := where $active "Params.severity" "=" "down" }} - + {{ partial "header" . }} @@ -33,15 +33,16 @@ {{ end }}{{ end }}{{ end }} - - + + {{ if $active }}
{{ range $active }}

{{ .Title }}

- {{ .Content }} + {{ .Content | safeHTML | truncate 500 "…" }} +

Continue reading

{{ else }}{{ end }}
@@ -53,15 +54,26 @@
{{ $systems := .Site.Params.systems }} {{ range $index, $systems }} - {{ $activeComponentIssues := where $active "Params.affected" "intersect" (slice .) }} + {{ $activeComponentIssues := where $active "Params.affected" "intersect" (slice .name) }} {{ $thisIsNotice := where $activeComponentIssues "Params.severity" "=" "notice" }} {{ $thisIsDisrupted := where $activeComponentIssues "Params.severity" "=" "disrupted" }} {{ $thisIsDown := where $activeComponentIssues "Params.severity" "=" "down" }}
- {{ $this := . }} - {{ . }} + {{ $this := .name }} + {{ .name }} + + {{ with .description }} + +   (?) + + + {{ . }} + + + {{ end }} + {{ if $thisIsDown }} Down @@ -75,6 +87,12 @@ Operational {{ end }}{{ end }}{{ end }} + + {{ with .partial }} +
+ {{ partial . . }} +
+ {{ end }}
{{ end }}
@@ -88,9 +106,17 @@ Incidents + {{ if .Site.Params.showUptime }} Uptime + {{ end }} + + {{ range .Site.Params.customTabs }} + + {{ .name }} + + {{ end }} diff --git a/layouts/issues/single.html b/layouts/issues/single.html index bc48ed3..5076148 100644 --- a/layouts/issues/single.html +++ b/layouts/issues/single.html @@ -10,8 +10,16 @@ {{ partial "header" . }} +
+ ← Go back +
+
{{ .Render "issue" }}
-{{ partial "footer" . }} + + {{ partial "js" . }} + {{ partial "footer" . }} + + diff --git a/layouts/partials/custom/above-footer.html b/layouts/partials/custom/above-footer.html new file mode 100644 index 0000000..1dadab6 --- /dev/null +++ b/layouts/partials/custom/above-footer.html @@ -0,0 +1,8 @@ + diff --git a/layouts/partials/custom/above-header.html b/layouts/partials/custom/above-header.html new file mode 100644 index 0000000..1dadab6 --- /dev/null +++ b/layouts/partials/custom/above-header.html @@ -0,0 +1,8 @@ + diff --git a/layouts/partials/custom/below-footer.html b/layouts/partials/custom/below-footer.html new file mode 100644 index 0000000..1dadab6 --- /dev/null +++ b/layouts/partials/custom/below-footer.html @@ -0,0 +1,8 @@ + diff --git a/layouts/partials/custom/below-header.html b/layouts/partials/custom/below-header.html new file mode 100644 index 0000000..1dadab6 --- /dev/null +++ b/layouts/partials/custom/below-header.html @@ -0,0 +1,8 @@ + diff --git a/layouts/partials/custom/meta.html b/layouts/partials/custom/meta.html new file mode 100644 index 0000000..1dadab6 --- /dev/null +++ b/layouts/partials/custom/meta.html @@ -0,0 +1,8 @@ + diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 085b814..d6b5486 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,3 +1,4 @@ +

{{ now.Year }} © {{ .Site.Title }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index c378998..94bef80 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,3 +1,4 @@ + {{ if .Site.Params.useLargeHeaderDesign }}

diff --git a/layouts/partials/js.html b/layouts/partials/js.html index d47cd5d..a26d36c 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -18,48 +18,150 @@ } else { document.querySelector('meta[name=theme-color]').setAttribute('content', themeNoticeColor); } + - + + +{{ if ne .Site.Params.googleAnalytics "UA-00000000-1" }} + + + {{ end }} diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html index 2bef153..7b45778 100644 --- a/layouts/partials/meta.html +++ b/layouts/partials/meta.html @@ -132,7 +132,7 @@ } .summary__date:hover { - color: #{{ .Site.Params.faded }}; + color: #ccc; } .summary__date:hover:after { @@ -141,21 +141,47 @@ } .components { - border: 2px solid #{{ .Site.Params.border }}; + border: 2px solid #ddd; border-bottom: 0; } .component { color: #000; padding: 16px; - border-bottom: 2px solid #{{ .Site.Params.border }}; + border-bottom: 2px solid #ddd; + } + + .description { cursor: pointer; position: relative; } + .description__text { display: none; } + .description:hover .description__text, + .description:active .description__text { + display: block; + position: absolute; + top: 0; + left: 32px; + background: #181818; + color: #fff; + z-index: 50; + padding: 8px; + border: 2px solid #242424; + font-size: 14px; + color: #ccc; + width: 1000%; + height: auto; + } + + @media (max-width: 640px) { + .description:hover .description__text, + .description:active .description__text { + width: 50vw; + } } .ok { color: #{{ .Site.Params.ok }}; } .error { color: #{{ .Site.Params.down }}; } .footer { - margin-top: 20px; + padding: 10px; background: #f5f5f5; } @@ -230,7 +256,7 @@ .status-down .announcement-box { border: 2px solid #{{ .Site.Params.down }}; } .status-notice .announcement-box { border: 2px solid #{{ .Site.Params.notice }}; } - .status .announcement-box { border-bottom-width: 1px; } + .status-homepage .announcement-box { border-bottom-width: 1px; } /** @@ -254,7 +280,5 @@ } } - {{ with .Site.Params.customCSS }} - - {{ end }} + diff --git a/layouts/uptime/single.html b/layouts/uptime/single.html index 957ca8f..cfad105 100644 --- a/layouts/uptime/single.html +++ b/layouts/uptime/single.html @@ -36,6 +36,7 @@ {{ $.Scratch.Add "rackedUpDowntime" $timeDiff }} {{ end }} {{ $scratchValue := $.Scratch.Get "rackedUpDowntime" }} + +

There have been {{ len $incidents }} incidents in total so far. In total, this added up to {{ $scratchValue }}s (or {{ div $scratchValue 60 }} min) of downtime. Please note that the uptime statistics only counts resolved incidents, ongoing incidents are not included in these calculations. -- cgit v1.2.3-70-g09d2