diff options
| author | Mantas <11616378+mistermantas@users.noreply.github.com> | 2019-01-25 16:53:51 +0200 |
|---|---|---|
| committer | Mantas <11616378+mistermantas@users.noreply.github.com> | 2019-01-25 16:53:51 +0200 |
| commit | 290aa0df0204038b8c7b23c28d716755e468f169 (patch) | |
| tree | f550e674805b3cc42b4b0c74ea7d78a8c59aca77 | |
| parent | 6a1fbad426c29b4f3fe4f6fa4d240735d5432b50 (diff) | |
fix #42, #51; v4-dev1 begins
| -rw-r--r-- | i18n/en.yaml | 11 | ||||
| -rw-r--r-- | i18n/lt.yaml | 8 | ||||
| -rw-r--r-- | layouts/affected/404.html | 21 | ||||
| -rw-r--r-- | layouts/index.html | 185 | ||||
| -rw-r--r-- | layouts/partials/index/announcements.html | 14 | ||||
| -rw-r--r-- | layouts/partials/index/autorefresh.html | 8 | ||||
| -rw-r--r-- | layouts/partials/index/components.html | 53 | ||||
| -rw-r--r-- | layouts/partials/index/incidents.html | 61 | ||||
| -rw-r--r-- | layouts/partials/index/noscript.html | 4 | ||||
| -rw-r--r-- | layouts/partials/index/summary.html | 24 | ||||
| -rw-r--r-- | layouts/partials/index/tabs.html | 20 |
11 files changed, 240 insertions, 169 deletions
diff --git a/i18n/en.yaml b/i18n/en.yaml index 3eafd19..6e3a60a 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -113,7 +113,7 @@ - id: notFound translation: There is nothing here. - id: notFoundText - translation: This could be a problem on our part. Perhaps we moved a certain resource and now it is gone. It is also possible that the resource you are trying to view is empty (for example, if a system has never been down, we have nothing to show). But do you also mind to double check the link? + translation: This could be a problem on our part. Perhaps we moved a certain resource and now it is gone. It is also possible that the resource you are trying to view is empty. But do you also mind to double check the link? - id: rss translation: Subscribe via RSS @@ -131,3 +131,12 @@ translation: entries - id: newestToOldest translation: newest to oldest + +## +## v4 +## +## +## v4 +## +- id: notFoundAffected + translation: It looks like this system either does not exist or has never had any recorded downtime.
\ No newline at end of file diff --git a/i18n/lt.yaml b/i18n/lt.yaml index 6721e8e..bee5e28 100644 --- a/i18n/lt.yaml +++ b/i18n/lt.yaml @@ -113,7 +113,7 @@ - id: notFound translation: Čia nieko nėra. - id: notFoundText - translation: Tai gali būti mūsų problema — galbūt puslapis, kurį bandote peržiūrėti, buvo kitur perkeltas arba buvo ištrintas. Taip pat yra galimybė, jog puslapis yra tuščias (pvz. jeigu vienas komponentas mūsų sistemoje nėra turėjęs problemų, nėra ko rodyti). Rekomenduoje dar kartą patikrinti, ar nuoroda, kurią naudojate, nėra neteisinga. + translation: Tai gali būti mūsų problema — galbūt puslapis, kurį bandote peržiūrėti, buvo kitur perkeltas arba buvo ištrintas. Rekomenduoje dar kartą patikrinti, ar nuoroda, kurią naudojate, nėra neteisinga. - id: rss translation: Gaukite atnaujinimus naudojant RSS @@ -131,3 +131,9 @@ translation: įrašai - id: newestToOldest translation: naujiausi rodomi pirmi + +## +## v4 +## +- id: notFoundAffected + translation: Ši sistema neturi nė vieno įrašo. Arba neegzistuoja, arba nė vieną kartą nebuvo sutrukdyta jos veikla.
\ No newline at end of file diff --git a/layouts/affected/404.html b/layouts/affected/404.html new file mode 100644 index 0000000..527c280 --- /dev/null +++ b/layouts/affected/404.html @@ -0,0 +1,21 @@ +{{ partial "meta" . }} + +{{ $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" }} + + <body class="status-homepage status-{{ if $isDown }}down{{ else }}{{ if $isDisrupted}}disrupted{{ else }}{{ if $isNotice }}notice{{ else }}ok{{ end }}{{ end }}{{ end }} {{ if not .Site.Params.alwaysKeepBrandColor }}change-header-color{{ end }}"> + {{ partial "header" . }} + + <div class="contain center"> + <h1 class="bold">{{ T "notFoundAffected" }}</h1> + <p>{{ T "notFoundText" }}</p> + </div> + + {{ partial "js" . }} + {{ partial "footer" . }} + </body> +</html> diff --git a/layouts/index.html b/layouts/index.html index 2802ce1..be887c8 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -12,185 +12,36 @@ <!-- Main --> <div class="contain"> - <noscript> - <p class="error">{{ T "noScriptingIntro" }} <a href="//enable-javascript.com">{{ T "noScriptingLink" }}</a> {{ T "noScriptingOutro" }}</p> - <div class="padding"></div> - </noscript> + <!-- Enable JavaScript banner --> + {{ partial "index/noscript" . }} - <!-- Main info --> - <div class="summary"> - <strong> - {{ if $isDown }} - {{ T "isDown" }} - {{ else }} - {{ if $isDisrupted }} - {{ T "isDisrupted" }} - {{ else }} - {{ if $isNotice }} - {{ T "isNotice" }} - {{ else }} - {{ T "isOk" }} - {{ end }}{{ end }}{{ end }} - </strong> + <!-- "All systems operational" (or not) banner --> + {{ partial "index/summary" . }} - <span class="summary__date float-right" onclick="location.reload()"></span> - </div> + <!-- Announcement box (title and short summary) --> + {{ partial "index/announcements" . }} - {{ if $active }} - <div class="announcement-box"> - {{ range $active }} - <div class="padding"> - <p><strong class="bold">{{ .Title }}</strong></p> - {{ .Content | safeHTML | truncate 500 "…" }} - <p><a href="{{ .Permalink }}">{{ T "continueReading" }}</a></p> - </div> - {{ else }}{{ end }} - </div> - {{ end }} - - {{ if .Site.Params.autoRefresh }} - <div class="faded right"> - <small><em>{{ T "autoRefreshNotice" }}</em></small> - </div> - <div class="padding-s"></div> - {{ else }} - <div class="padding"></div> - {{ end }} - - <!-- Individual info --> - <div class="components"> - {{ $systems := .Site.Params.systems }} - {{ range $systems }} - {{ $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" }} - - <div class="component" data-status="{{ if $thisIsDown }}down{{ else }}{{ if $thisIsDisrupted }}disrupted{{ else }}{{ if $thisIsNotice }}notice{{ else }}ok{{ end }}{{ end }}{{ end }}"> - <a href="/affected/{{ .name | urlize }}" class="no-underline"> - {{ .name }} - </a> - - {{ with .description }} - <span class="tooltip tooltip--small"> - <span class="faded">(?)</span> + <!-- Auto refresh --> + {{ partial "index/autorefresh" . }} - <span class="tooltip__text"> - {{ . }} - </span> - </span> - {{ end }} + <!-- Individual component info --> + {{ partial "index/components" . }} - <span class="component-status"> - {{ if $thisIsDown }} - {{ T "thisIsDown" }} - {{ else }} - {{ if $thisIsDisrupted }} - {{ T "thisIsDisrupted" }} - {{ else }} - {{ if $thisIsNotice }} - {{ T "thisIsNotice" }} - {{ else }} - {{ T "thisIsOk" }} - {{ end }}{{ end }}{{ end }} - </span> - - {{ with .partial }} - <div> - {{ partial . . }} - </div> - {{ end }} - </div> - {{ end }} - </div> - - {{ if .Site.Params.enableCustomHTML }} - {{ partial "custom/homepage-summary" . }} - {{ end }} - <!-- End main --> - </div> - - {{ if .Site.Params.customTabs }} - <div class="tabs"> - <div class="contain tabs--inner"> - <a href="/#incidents" class="tab tab--current"> - {{ T "incidents" }} - </a> - - {{ range .Site.Params.customTabs }} - <a href="{{ .link }}" class="tab tab--other"> - {{ .name }} - </a> - {{ end }} + {{ if .Site.Params.enableCustomHTML }} + {{ partial "custom/homepage-summary" . }} + {{ end }} + <!-- End main --> </div> - </div> - {{ else }} - <div class="contain contain--more"> - <h2 class="center">{{ T "incidentHistory" }}</h2> - <hr class="clean"> - </div> - {{ end }} + <!-- Custom tabs --> + {{ partial "index/tabs" . }} + <!-- All incidents + pagination --> <div class="contain contain--more" id="incidents"> - {{ if not $incidents }} - <div class="padding"></div> - <h3>{{ T "calmBeforeTheStorm" }}</h3> - <p>{{ T "noIncidentsDesc" }}</p> - <div class="padding"></div> - <div class="padding"></div> - <div class="padding"></div> - {{ else }} - {{ $paginator := .Paginate $incidents .Site.Params.incidentPostsPerPage }} - {{ range $paginator.Pages }} - {{ .Render "small" }} - {{ end }} - - <!-- If there are more than 2 pages, show pagination --> - {{ if gt $paginator.TotalPages 1 }} - <hr> - - <div class="center"> - {{ if $paginator.HasPrev }} - <a href="{{ $paginator.Prev.URL }}#incidents"> - ⭠ - {{ T "prev" }} - </a> - {{ else }} - <span class="faded"> - ⭠ - {{ T "prev" }} - </span> - {{ end }} - - - - {{ $paginator.PageNumber }} - / - {{ $paginator.TotalPages }} - - - - {{ if $paginator.HasNext }} - <a href="{{ $paginator.Next.URL }}#incidents"> - {{ T "next" }} - ⭢ - </a> - {{ else }} - <span class="faded"> - {{ T "next" }} - ⭢ - </span> - {{ end }} - </div> - {{ end }} - {{ end }} + {{ partial "index/incidents" . }} <div class="padding"></div> </div> - - {{ partial "js" . }} {{ partial "footer" . }} </body> diff --git a/layouts/partials/index/announcements.html b/layouts/partials/index/announcements.html new file mode 100644 index 0000000..a02045e --- /dev/null +++ b/layouts/partials/index/announcements.html @@ -0,0 +1,14 @@ +{{ $incidents := where .Site.RegularPages "Params.section" "issue" }} +{{ $active := where $incidents "Params.resolved" "=" false }} + +{{ if $active }} + <div class="announcement-box"> + {{ range $active }} + <div class="padding"> + <p><strong class="bold">{{ .Title }}</strong></p> + {{ .Content | safeHTML | truncate 500 "…" }} + <p><a href="{{ .Permalink }}">{{ T "continueReading" }}</a></p> + </div> + {{ else }}{{ end }} + </div> +{{ end }}
\ No newline at end of file diff --git a/layouts/partials/index/autorefresh.html b/layouts/partials/index/autorefresh.html new file mode 100644 index 0000000..b419e2f --- /dev/null +++ b/layouts/partials/index/autorefresh.html @@ -0,0 +1,8 @@ +{{ if .Site.Params.autoRefresh }} + <div class="faded right"> + <small><em>{{ T "autoRefreshNotice" }}</em></small> + </div> + <div class="padding-s"></div> + {{ else }} + <div class="padding"></div> +{{ end }}
\ No newline at end of file diff --git a/layouts/partials/index/components.html b/layouts/partials/index/components.html new file mode 100644 index 0000000..9424cd0 --- /dev/null +++ b/layouts/partials/index/components.html @@ -0,0 +1,53 @@ +{{ $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" }} + +<div class="components"> + {{ $systems := .Site.Params.systems }} + {{ range $systems }} + {{ $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" }} + + <div class="component" data-status="{{ if $thisIsDown }}down{{ else }}{{ if $thisIsDisrupted }}disrupted{{ else }}{{ if $thisIsNotice }}notice{{ else }}ok{{ end }}{{ end }}{{ end }}"> + <a href="/affected/{{ .name | urlize }}" class="no-underline"> + {{ .name }} + </a> + + {{ with .description }} + <span class="tooltip tooltip--small"> + <span class="faded">(?)</span> + + <span class="tooltip__text"> + {{ . }} + </span> + </span> + {{ end }} + + <span class="component-status"> + {{ if $thisIsDown }} + {{ T "thisIsDown" }} + {{ else }} + {{ if $thisIsDisrupted }} + {{ T "thisIsDisrupted" }} + {{ else }} + {{ if $thisIsNotice }} + {{ T "thisIsNotice" }} + {{ else }} + {{ T "thisIsOk" }} + {{ end }}{{ end }}{{ end }} + </span> + + {{ with .partial }} + <div> + {{ partial . . }} + </div> + {{ end }} + </div> + {{ end }} + </div>
\ No newline at end of file diff --git a/layouts/partials/index/incidents.html b/layouts/partials/index/incidents.html new file mode 100644 index 0000000..bf312e9 --- /dev/null +++ b/layouts/partials/index/incidents.html @@ -0,0 +1,61 @@ +{{ $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" }} + +<!-- Pagination is also included with incidents --> + +{{ if not $incidents }} + <div class="padding"></div> + <h3>{{ T "calmBeforeTheStorm" }}</h3> + <p>{{ T "noIncidentsDesc" }}</p> + <div class="padding"></div> + <div class="padding"></div> + <div class="padding"></div> +{{ else }} + {{ $paginator := .Paginate $incidents .Site.Params.incidentPostsPerPage }} + {{ range $paginator.Pages }} + {{ .Render "small" }} + {{ end }} + + <!-- If there are more than 2 pages, show pagination --> + {{ if gt $paginator.TotalPages 1 }} + <hr> + + <div class="center"> + {{ if $paginator.HasPrev }} + <a href="{{ $paginator.Prev.URL }}#incidents"> + ⭠ + {{ T "prev" }} + </a> + {{ else }} + <span class="faded"> + ⭠ + {{ T "prev" }} + </span> + {{ end }} + + + + {{ $paginator.PageNumber }} + / + {{ $paginator.TotalPages }} + + + + {{ if $paginator.HasNext }} + <a href="{{ $paginator.Next.URL }}#incidents"> + {{ T "next" }} + ⭢ + </a> + {{ else }} + <span class="faded"> + {{ T "next" }} + ⭢ + </span> + {{ end }} + </div> + {{ end }} +{{ end }}
\ No newline at end of file diff --git a/layouts/partials/index/noscript.html b/layouts/partials/index/noscript.html new file mode 100644 index 0000000..ebebe8c --- /dev/null +++ b/layouts/partials/index/noscript.html @@ -0,0 +1,4 @@ +<noscript> + <p class="error">{{ T "noScriptingIntro" }} <a href="//enable-javascript.com">{{ T "noScriptingLink" }}</a> {{ T "noScriptingOutro" }}</p> + <div class="padding"></div> +</noscript>
\ No newline at end of file diff --git a/layouts/partials/index/summary.html b/layouts/partials/index/summary.html new file mode 100644 index 0000000..d8e3108 --- /dev/null +++ b/layouts/partials/index/summary.html @@ -0,0 +1,24 @@ +{{ $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" }} + +<div class="summary"> + <strong> + {{ if $isDown }} + {{ T "isDown" }} + {{ else }} + {{ if $isDisrupted }} + {{ T "isDisrupted" }} + {{ else }} + {{ if $isNotice }} + {{ T "isNotice" }} + {{ else }} + {{ T "isOk" }} + {{ end }}{{ end }}{{ end }} + </strong> + + <span class="summary__date float-right" onclick="location.reload()"></span> +</div>
\ No newline at end of file diff --git a/layouts/partials/index/tabs.html b/layouts/partials/index/tabs.html new file mode 100644 index 0000000..e1fc986 --- /dev/null +++ b/layouts/partials/index/tabs.html @@ -0,0 +1,20 @@ +{{ if .Site.Params.customTabs }} + <div class="tabs"> + <div class="contain tabs--inner"> + <a href="/#incidents" class="tab tab--current"> + {{ T "incidents" }} + </a> + + {{ range .Site.Params.customTabs }} + <a href="{{ .link }}" class="tab tab--other"> + {{ .name }} + </a> + {{ end }} + </div> + </div> +{{ else }} + <div class="contain contain--more"> + <h2 class="center">{{ T "incidentHistory" }}</h2> + <hr class="clean"> + </div> +{{ end }}
\ No newline at end of file |