diff options
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 2 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | docker/entrypoint.sh | 4 | ||||
| -rw-r--r-- | exampleSite/config.yml | 6 | ||||
| -rw-r--r-- | exampleSite/content/issues/2023-04-16-formatting-testing.md | 21 | ||||
| -rw-r--r-- | layouts/index.json | 2 | ||||
| -rw-r--r-- | layouts/issues/issue.html | 11 | ||||
| -rw-r--r-- | layouts/issues/small.html | 7 | ||||
| -rw-r--r-- | layouts/partials/index/components.html | 26 | ||||
| -rw-r--r-- | layouts/partials/js.html | 2 | ||||
| -rw-r--r-- | layouts/partials/meta.html | 6 | ||||
| -rw-r--r-- | static/admin/config.yml | 4 |
13 files changed, 65 insertions, 30 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9828a36..df17d06 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -15,7 +15,7 @@ Explain the **details** for making this change. What existing problem does the p Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes UI. <!-- Run some tests to make sure the code doesn't throw any errors, is valid, and works on IE8+. --> -<!-- Also, maake sure that the code formatting is in line with the rest of the project. --> +<!-- Also, make sure that the code formatting is in line with the rest of the project. --> **Closing issues** @@ -13,5 +13,5 @@ COPY exampleSite /cstate RUN mkdir -p /cstate/themes/cstate COPY . /cstate/themes/cstate -# Copy entrypoint script into the container image, this runs everytime the container cold-starts. +# Copy entrypoint script into the container image, this runs every time the container cold-starts. COPY ./docker/entrypoint.sh /docker-entrypoint.d/10-build-hugo.sh @@ -171,7 +171,7 @@ hugo And the folder `public` can now be hosted. -As you can imagine, manual building is a little bit tedious but a great option to have available programatically. +As you can imagine, manual building is a little bit tedious but a great option to have available programmatically. ### Docker diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index a90e37d..9ac6c2c 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,7 +1,7 @@ WORK_DIR="/app" SRC_DIR="/cstate" -echo "[CSTATE-DOCKER] Initalising container..." +echo "[CSTATE-DOCKER] Initialising container..." # Check if the working dir is empty, if it is we'll need to copy # the files in from src directory (usually /cstate) @@ -20,4 +20,4 @@ hugo # Copy built files into NGINX directory cp -r /$WORK_DIR/public/* /usr/share/nginx/html -echo "[CSTATE-DOCKER] Initalisation complete."
\ No newline at end of file +echo "[CSTATE-DOCKER] Initialisation complete."
\ No newline at end of file diff --git a/exampleSite/config.yml b/exampleSite/config.yml index a3401c0..4dd3795 100644 --- a/exampleSite/config.yml +++ b/exampleSite/config.yml @@ -76,7 +76,7 @@ languageCode: en # For enableMissingTranslationPlaceholders— # do not set it to true for languages other # than English! When tested with Lithuanian, -# it would add unnecesary placeholders to +# it would add unnecessary placeholders to # values that were intentionally empty. defaultContentLanguage: en @@ -133,7 +133,7 @@ params: # and the user can expand by clicking on the category # (Requires JavaScript.) # - untitled boolean `untitled: true` - # This would complerely hide the name of the category. + # This would completely hide the name of the category. # This is useful, if you do not want to use categories # because you need to set an 'Uncategorized' category. # Or it can be used alongside other categories. @@ -188,7 +188,7 @@ params: # Should relative time (x min ago) be used? # # IMPORTANT: In the frontmatter, the dates MUST be in - # the UTC time zone for this to work preperly. If you + # the UTC time zone for this to work properly. If you # use Netlify CMS, all good — the CMS picks UTC time # by default. Otherwise, there may be very inaccurate # times if multiple time zones are in your issue files. diff --git a/exampleSite/content/issues/2023-04-16-formatting-testing.md b/exampleSite/content/issues/2023-04-16-formatting-testing.md new file mode 100644 index 0000000..7d23d8a --- /dev/null +++ b/exampleSite/content/issues/2023-04-16-formatting-testing.md @@ -0,0 +1,21 @@ +--- +title: Formatting testing +date: 2023-04-16T18:34:00Z +section: issue +informational: true +--- + +This page includes *some* markdown formatting, such as **bold**, *italics*, ***bold and italics***, and other things as follows: + +`This is just code, not much else. It shouldn't overflow outside the boundries, and it's not a code block either.` + +--- + +``` +This is a code block. It's long, and text will overflow. +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb +qwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiopqwertyuiop +fastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfastfast +v a r i b l e s p a c i n g fillerfillerfillerfillerfillerfillerfillerfillerfillerfillerfill +``` diff --git a/layouts/index.json b/layouts/index.json index e2e7b7f..a7ce134 100644 --- a/layouts/index.json +++ b/layouts/index.json @@ -1,6 +1,6 @@ {{ $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" }}{ "is": "index", - "cStateVersion": "5.5.1", + "cStateVersion": "5.5.2", "apiVersion": "2.0", "title": "{{ .Site.Title }}", "languageCodeHTML": "{{ .Site.LanguageCode }}", diff --git a/layouts/issues/issue.html b/layouts/issues/issue.html index 71bb30a..c010502 100644 --- a/layouts/issues/issue.html +++ b/layouts/issues/issue.html @@ -47,7 +47,10 @@ {{ $minutesForCalc := (mod $diffInMin 60) }} {{ div (sub $diffInMin $minutesForCalc) 60 }}h - {{ $minutesForCalc }}m {{ T "ofDowntime" }}. + {{ $minutesForCalc }}m + {{ if eq .Params.severity "down" }} + {{ T "ofDowntime" }} + {{ end }} </strong> <span class="tooltip__text"> @@ -66,7 +69,9 @@ {{ $secsForCalc := (mod $timeDiff 60) }} {{ div (sub $timeDiff $secsForCalc) 60 }}m - {{ T "ofDowntime" }}. + {{ if eq .Params.severity "down" }} + {{ T "ofDowntime" }} + {{ end }} </strong> <span class="tooltip__text"> @@ -92,6 +97,6 @@ {{ end }} <hr> - {{ .Content }} + <div class="markdown">{{ .Content }}</div> </div> <div class="padding"></div> diff --git a/layouts/issues/small.html b/layouts/issues/small.html index 5eb3a2d..97baec9 100644 --- a/layouts/issues/small.html +++ b/layouts/issues/small.html @@ -52,7 +52,10 @@ {{ $minutesForCalc := (mod $diffInMin 60) }} {{ div (sub $diffInMin $minutesForCalc) 60 }}h - {{ $minutesForCalc }}m {{ T "ofDowntime" }} + {{ $minutesForCalc }}m + {{ if eq .Params.severity "down" }} + {{ T "ofDowntime" }} + {{ end }} </div> {{ else }} <div class="ok"> @@ -61,7 +64,9 @@ {{ $secsForCalc := (mod $timeDiff 60) }} {{ div (sub $timeDiff $secsForCalc) 60 }}m + {{ if eq .Params.severity "down" }} <!-- {{ $secsForCalc }}s --> {{ T "ofDowntime" }} + {{ end }} </div> {{ end }} {{ end }} diff --git a/layouts/partials/index/components.html b/layouts/partials/index/components.html index f9937f2..1a338c4 100644 --- a/layouts/partials/index/components.html +++ b/layouts/partials/index/components.html @@ -110,35 +110,35 @@ // // By default, all is good but we change this value // for progressively worse statuses - var highlestLevelStatus = ''; + var highestLevelStatus = ''; function checkStatus(element) { var status = element.getAttribute('data-status'); if (status === 'down') { - highlestLevelStatus = 'down' - } else if (status === 'disrupted' && highlestLevelStatus !== 'down') { - highlestLevelStatus = 'disrupted' - } else if (status === 'notice' && highlestLevelStatus !== 'down' && highlestLevelStatus !== 'disrupted') { - highlestLevelStatus = 'notice' + highestLevelStatus = 'down' + } else if (status === 'disrupted' && highestLevelStatus !== 'down') { + highestLevelStatus = 'disrupted' + } else if (status === 'notice' && highestLevelStatus !== 'down' && highestLevelStatus !== 'disrupted') { + highestLevelStatus = 'notice' } } componentsOfThisCategory.forEach(element => checkStatus(element)); // Human readable (i18n) status name variable - var highlestLevelStatusReadable = highlestLevelStatus; + var highestLevelStatusReadable = highestLevelStatus; - if (highlestLevelStatus === 'ok') { highlestLevelStatusReadable = '{{ T "thisIsOk" }}' } - if (highlestLevelStatus === 'notice') { highlestLevelStatusReadable = '{{ T "thisIsNotice" }}' } - if (highlestLevelStatus === 'disrupted') { highlestLevelStatusReadable = '{{ T "thisIsDisrupted" }}' } - if (highlestLevelStatus === 'down') { highlestLevelStatusReadable = '{{ T "thisIsDown" }}' } + if (highestLevelStatus === 'ok') { highestLevelStatusReadable = '{{ T "thisIsOk" }}' } + if (highestLevelStatus === 'notice') { highestLevelStatusReadable = '{{ T "thisIsNotice" }}' } + if (highestLevelStatus === 'disrupted') { highestLevelStatusReadable = '{{ T "thisIsDisrupted" }}' } + if (highestLevelStatus === 'down') { highestLevelStatusReadable = '{{ T "thisIsDown" }}' } // Finally we can show the status // (but only for categories with a name) if (thisCategory.classList.contains('category--titled')) { - thisCategory.querySelector('.category__head').setAttribute('data-status', highlestLevelStatus); - thisCategory.querySelector('.category-status').innerHTML = highlestLevelStatusReadable; + thisCategory.querySelector('.category__head').setAttribute('data-status', highestLevelStatus); + thisCategory.querySelector('.category-status').innerHTML = highestLevelStatusReadable; } </script> </div> diff --git a/layouts/partials/js.html b/layouts/partials/js.html index 9e4dd9d..a5b974e 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -3,7 +3,7 @@ * Dev toolset */ - console.log('cState v5.5.1 - https://github.com/cstate/cstate'); + console.log('cState v5.5.2 - https://github.com/cstate/cstate'); document.getElementsByTagName('html')[0].className = 'js'; /** diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html index c8381a9..da0ed46 100644 --- a/layouts/partials/meta.html +++ b/layouts/partials/meta.html @@ -12,7 +12,7 @@ {{ range .AlternativeOutputFormats -}} {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} {{ end -}} - <meta name="generator" content="cState v5.5.1 - https://github.com/cstate/cstate"> + <meta name="generator" content="cState v5.5.2 - https://github.com/cstate/cstate"> <meta name="theme-color" content="{{ .Site.Params.brand }}"> <script> var themeBrandColor = '{{ .Site.Params.brand }}'; @@ -107,6 +107,10 @@ padding: 16px; } + .markdown pre { + overflow-x: scroll; + } + .contain--more { max-width: 680px; } .center { text-align: center; } diff --git a/static/admin/config.yml b/static/admin/config.yml index 551eb96..9f5cdbf 100644 --- a/static/admin/config.yml +++ b/static/admin/config.yml @@ -241,7 +241,7 @@ collections: - label: 'Show last modified date at bottom of issues' name: 'enableLastMod' widget: 'boolean' - hint: 'Experimental feature shows when changes occured based on Git info. Read the wiki for more: https://github.com/cstate/cstate/wiki/Customization#time' + hint: 'Experimental feature shows when changes occurred based on Git info. Read the wiki for more: https://github.com/cstate/cstate/wiki/Customization#time' required: false default: false - label: 'Use relative time (issue began x min ago)' @@ -288,7 +288,7 @@ collections: required: false default: true - label: 'Disable dark mode' - hint: 'If your OS and browser supports prefers-color-scheme and the user opted into a dark mode, the status page will be darker. Some color choices may be overriden.' + hint: 'If your OS and browser supports prefers-color-scheme and the user opted into a dark mode, the status page will be darker. Some color choices may be overridden.' name: 'disableDarkMode' widget: 'boolean' required: false |