From 15534a5cb2aa7bf871f27d25c5d560168ab9d224 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Tue, 10 May 2022 23:37:57 -0400 Subject: [PATCH 01/16] Apply background colour to the html element. Older versions of Mozilla do not colour the entire window when the style is applied to the body element. Using the html element instead seems to do the job. --- content/style.scss | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/content/style.scss b/content/style.scss index 727a865..2708bb4 100644 --- a/content/style.scss +++ b/content/style.scss @@ -40,14 +40,11 @@ max-width: 1em * ($maxwidth / $fontsize); } +html { @include usecolours($background-color: background); } body { + @include usecolours($color: foreground); font-family: sans-serif; margin: 1em; - - @include usecolours - ( $background-color: background - , $color: foreground - ); } a:link { -- 2.43.0 From e86a4a5aa2cbe15fed0ea55cb4ee6955db62b104 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 16 May 2022 01:17:29 -0400 Subject: [PATCH 02/16] Lunar eclipse 2022-05-15 --- content/images/eclipse-20220515-223224.jpg | 1 + content/images/eclipse-20220515-223224.yaml | 4 ++++ content/images/eclipse-20220515-223904.jpg | 1 + content/images/eclipse-20220515-223904.yaml | 4 ++++ content/images/eclipse-20220515-225442.jpg | 1 + content/images/eclipse-20220515-225442.yaml | 4 ++++ content/images/eclipse-20220515-230507.jpg | 1 + content/images/eclipse-20220515-230507.yaml | 4 ++++ content/images/eclipse-20220515-231141.jpg | 1 + content/images/eclipse-20220515-231141.yaml | 4 ++++ content/images/eclipse-20220515-231939.jpg | 1 + content/images/eclipse-20220515-231939.yaml | 4 ++++ content/images/eclipse-20220515-232447.jpg | 1 + content/images/eclipse-20220515-232447.yaml | 4 ++++ content/images/eclipse-20220515-232709.jpg | 1 + content/images/eclipse-20220515-232709.yaml | 4 ++++ content/images/eclipse-20220515-233454.jpg | 1 + content/images/eclipse-20220515-233454.yaml | 4 ++++ content/images/eclipse-20220515-233803.jpg | 1 + content/images/eclipse-20220515-233803.yaml | 4 ++++ content/images/eclipse-20220515-234126.jpg | 1 + content/images/eclipse-20220515-234126.yaml | 4 ++++ content/images/eclipse-20220515-234942.jpg | 1 + content/images/eclipse-20220515-234942.yaml | 4 ++++ content/images/eclipse-20220515-235136.jpg | 1 + content/images/eclipse-20220515-235136.yaml | 4 ++++ content/images/eclipse-20220516-000739.jpg | 1 + content/images/eclipse-20220516-000739.yaml | 4 ++++ content/weblog/eclipse-20220515.md | 11 +++++++++++ 29 files changed, 81 insertions(+) create mode 120000 content/images/eclipse-20220515-223224.jpg create mode 100644 content/images/eclipse-20220515-223224.yaml create mode 120000 content/images/eclipse-20220515-223904.jpg create mode 100644 content/images/eclipse-20220515-223904.yaml create mode 120000 content/images/eclipse-20220515-225442.jpg create mode 100644 content/images/eclipse-20220515-225442.yaml create mode 120000 content/images/eclipse-20220515-230507.jpg create mode 100644 content/images/eclipse-20220515-230507.yaml create mode 120000 content/images/eclipse-20220515-231141.jpg create mode 100644 content/images/eclipse-20220515-231141.yaml create mode 120000 content/images/eclipse-20220515-231939.jpg create mode 100644 content/images/eclipse-20220515-231939.yaml create mode 120000 content/images/eclipse-20220515-232447.jpg create mode 100644 content/images/eclipse-20220515-232447.yaml create mode 120000 content/images/eclipse-20220515-232709.jpg create mode 100644 content/images/eclipse-20220515-232709.yaml create mode 120000 content/images/eclipse-20220515-233454.jpg create mode 100644 content/images/eclipse-20220515-233454.yaml create mode 120000 content/images/eclipse-20220515-233803.jpg create mode 100644 content/images/eclipse-20220515-233803.yaml create mode 120000 content/images/eclipse-20220515-234126.jpg create mode 100644 content/images/eclipse-20220515-234126.yaml create mode 120000 content/images/eclipse-20220515-234942.jpg create mode 100644 content/images/eclipse-20220515-234942.yaml create mode 120000 content/images/eclipse-20220515-235136.jpg create mode 100644 content/images/eclipse-20220515-235136.yaml create mode 120000 content/images/eclipse-20220516-000739.jpg create mode 100644 content/images/eclipse-20220516-000739.yaml create mode 100644 content/weblog/eclipse-20220515.md diff --git a/content/images/eclipse-20220515-223224.jpg b/content/images/eclipse-20220515-223224.jpg new file mode 120000 index 0000000..ecd014e --- /dev/null +++ b/content/images/eclipse-20220515-223224.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/7V/6K/SHA512-s62206--3c7b5e8560109819d8616fbb77e86dfe275da79bee14a99958b849e2d45fd82196a3aa88d06f7d4bb6a5258a9ee025f5505ee120388c5066dfa1b09e3c61772f/SHA512-s62206--3c7b5e8560109819d8616fbb77e86dfe275da79bee14a99958b849e2d45fd82196a3aa88d06f7d4bb6a5258a9ee025f5505ee120388c5066dfa1b09e3c61772f \ No newline at end of file diff --git a/content/images/eclipse-20220515-223224.yaml b/content/images/eclipse-20220515-223224.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-223224.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-223904.jpg b/content/images/eclipse-20220515-223904.jpg new file mode 120000 index 0000000..8f52052 --- /dev/null +++ b/content/images/eclipse-20220515-223904.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/z1/gk/SHA512-s67272--ee40a65584c53a7bdf481f66b0633bfcb5612a832b6d033bd0e049d3b4556641168e4842e95a465031dccfb8516635c861ae64065a733cf7392bcbf88df790f3/SHA512-s67272--ee40a65584c53a7bdf481f66b0633bfcb5612a832b6d033bd0e049d3b4556641168e4842e95a465031dccfb8516635c861ae64065a733cf7392bcbf88df790f3 \ No newline at end of file diff --git a/content/images/eclipse-20220515-223904.yaml b/content/images/eclipse-20220515-223904.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-223904.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-225442.jpg b/content/images/eclipse-20220515-225442.jpg new file mode 120000 index 0000000..071bd37 --- /dev/null +++ b/content/images/eclipse-20220515-225442.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/56/0v/SHA512-s62547--acaa868e092acac5329ff17af7b36c6715b0b27c0c7e856199a5c0137fd6d27fbeb3cda7b2e71f6e45538108ecc3dc7782ea7a7ec332d2f903e79b2875d90b7c/SHA512-s62547--acaa868e092acac5329ff17af7b36c6715b0b27c0c7e856199a5c0137fd6d27fbeb3cda7b2e71f6e45538108ecc3dc7782ea7a7ec332d2f903e79b2875d90b7c \ No newline at end of file diff --git a/content/images/eclipse-20220515-225442.yaml b/content/images/eclipse-20220515-225442.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-225442.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-230507.jpg b/content/images/eclipse-20220515-230507.jpg new file mode 120000 index 0000000..0b86aad --- /dev/null +++ b/content/images/eclipse-20220515-230507.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/V2/pq/SHA512-s59928--c64ed7765384fd5bd27b61ccf2e927ae38dbce4737d50890c173a7e2b32ab47fea76129d804eb22462582d27e95d1703bb5c29e07e881ee4d91f3c9739f56e9a/SHA512-s59928--c64ed7765384fd5bd27b61ccf2e927ae38dbce4737d50890c173a7e2b32ab47fea76129d804eb22462582d27e95d1703bb5c29e07e881ee4d91f3c9739f56e9a \ No newline at end of file diff --git a/content/images/eclipse-20220515-230507.yaml b/content/images/eclipse-20220515-230507.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-230507.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-231141.jpg b/content/images/eclipse-20220515-231141.jpg new file mode 120000 index 0000000..597a301 --- /dev/null +++ b/content/images/eclipse-20220515-231141.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/pq/vJ/SHA512-s61153--ca215607a273fee73a79513d2e53ca76225a428f2ee2898e7616798802dac52703b24551644f235eca14660a32f5959b59f0960157748d73d0ccc6513a501c08/SHA512-s61153--ca215607a273fee73a79513d2e53ca76225a428f2ee2898e7616798802dac52703b24551644f235eca14660a32f5959b59f0960157748d73d0ccc6513a501c08 \ No newline at end of file diff --git a/content/images/eclipse-20220515-231141.yaml b/content/images/eclipse-20220515-231141.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-231141.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-231939.jpg b/content/images/eclipse-20220515-231939.jpg new file mode 120000 index 0000000..111cfce --- /dev/null +++ b/content/images/eclipse-20220515-231939.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/qK/wK/SHA512-s42573--ac7ec2f106c7924a66b021eac1d8e53d0f480fda49adb27ce6dfe715c05d4cd463a41ec4a8ce8dca50b186f0ef719b201b0d757d13e8f4f793d61f24ee68c2bc/SHA512-s42573--ac7ec2f106c7924a66b021eac1d8e53d0f480fda49adb27ce6dfe715c05d4cd463a41ec4a8ce8dca50b186f0ef719b201b0d757d13e8f4f793d61f24ee68c2bc \ No newline at end of file diff --git a/content/images/eclipse-20220515-231939.yaml b/content/images/eclipse-20220515-231939.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-231939.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-232447.jpg b/content/images/eclipse-20220515-232447.jpg new file mode 120000 index 0000000..237113e --- /dev/null +++ b/content/images/eclipse-20220515-232447.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/41/06/SHA512-s45985--47c57854f6bf0235a0beceadda5bd3e44e216ca10e4f48f1a15104d48c353405eca7d8b6834b411f2ea4d35e97fed5e83bc090db3902d2cdbbf40b6e025c6d8e/SHA512-s45985--47c57854f6bf0235a0beceadda5bd3e44e216ca10e4f48f1a15104d48c353405eca7d8b6834b411f2ea4d35e97fed5e83bc090db3902d2cdbbf40b6e025c6d8e \ No newline at end of file diff --git a/content/images/eclipse-20220515-232447.yaml b/content/images/eclipse-20220515-232447.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-232447.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-232709.jpg b/content/images/eclipse-20220515-232709.jpg new file mode 120000 index 0000000..2f3f5f7 --- /dev/null +++ b/content/images/eclipse-20220515-232709.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/7w/J8/SHA512-s46545--ce81c5cf09098e2c3d9566b7a23705d29e2db6c08f2dc3a5129294b546f814f8f4c84a28a4a82a236d327f55bf2e8930fa5afea2f67001ce5e565a35aa89eb39/SHA512-s46545--ce81c5cf09098e2c3d9566b7a23705d29e2db6c08f2dc3a5129294b546f814f8f4c84a28a4a82a236d327f55bf2e8930fa5afea2f67001ce5e565a35aa89eb39 \ No newline at end of file diff --git a/content/images/eclipse-20220515-232709.yaml b/content/images/eclipse-20220515-232709.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-232709.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-233454.jpg b/content/images/eclipse-20220515-233454.jpg new file mode 120000 index 0000000..fec7426 --- /dev/null +++ b/content/images/eclipse-20220515-233454.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/k1/5F/SHA512-s45317--093734cb997e659c34ccceff0899ffa33b42da32c10b8f1a26ca7fc7bebcde982835f85033731c1a17c43c90a695a6e5081721d68a07109bd090fe2dced56021/SHA512-s45317--093734cb997e659c34ccceff0899ffa33b42da32c10b8f1a26ca7fc7bebcde982835f85033731c1a17c43c90a695a6e5081721d68a07109bd090fe2dced56021 \ No newline at end of file diff --git a/content/images/eclipse-20220515-233454.yaml b/content/images/eclipse-20220515-233454.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-233454.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-233803.jpg b/content/images/eclipse-20220515-233803.jpg new file mode 120000 index 0000000..34a8b24 --- /dev/null +++ b/content/images/eclipse-20220515-233803.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/P3/Z3/SHA512-s61296--0fbbe13c91dd55730ab794c173ef89cb67236af9815183b89cb4cb2422d96a69b7642b545a9759c6d701c101468276e59a63fea597b6bdd8cd591b12b5dddede/SHA512-s61296--0fbbe13c91dd55730ab794c173ef89cb67236af9815183b89cb4cb2422d96a69b7642b545a9759c6d701c101468276e59a63fea597b6bdd8cd591b12b5dddede \ No newline at end of file diff --git a/content/images/eclipse-20220515-233803.yaml b/content/images/eclipse-20220515-233803.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-233803.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-234126.jpg b/content/images/eclipse-20220515-234126.jpg new file mode 120000 index 0000000..8a16ccc --- /dev/null +++ b/content/images/eclipse-20220515-234126.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/jP/q9/SHA512-s62280--e38d6442ee33be62ca39f1d0976888d1b8dde77fb84043133887190e25febd2dcc7f1c0351880d5879ab542b9db3854e172be60cad1208a859e30c30e1f774dc/SHA512-s62280--e38d6442ee33be62ca39f1d0976888d1b8dde77fb84043133887190e25febd2dcc7f1c0351880d5879ab542b9db3854e172be60cad1208a859e30c30e1f774dc \ No newline at end of file diff --git a/content/images/eclipse-20220515-234126.yaml b/content/images/eclipse-20220515-234126.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-234126.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-234942.jpg b/content/images/eclipse-20220515-234942.jpg new file mode 120000 index 0000000..1dd3e25 --- /dev/null +++ b/content/images/eclipse-20220515-234942.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/xv/81/SHA512-s75054--65490d25c866e5b275a84133da3305a2df5b31a5a5a83741ee6149d480c2fa1b446cde857487709b34bb7091f31de734b7bdc225250494f8b1ecdd1934957be2/SHA512-s75054--65490d25c866e5b275a84133da3305a2df5b31a5a5a83741ee6149d480c2fa1b446cde857487709b34bb7091f31de734b7bdc225250494f8b1ecdd1934957be2 \ No newline at end of file diff --git a/content/images/eclipse-20220515-234942.yaml b/content/images/eclipse-20220515-234942.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-234942.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220515-235136.jpg b/content/images/eclipse-20220515-235136.jpg new file mode 120000 index 0000000..40f0ebb --- /dev/null +++ b/content/images/eclipse-20220515-235136.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/0m/kX/SHA512-s74615--1af33e462be8dcc467fb5a81400438974197918af7caa39eea77113c6e49788df04585ea574efca75699d9a79d0f1f1623d4976c17b8129dbcb6a43a4ba84685/SHA512-s74615--1af33e462be8dcc467fb5a81400438974197918af7caa39eea77113c6e49788df04585ea574efca75699d9a79d0f1f1623d4976c17b8129dbcb6a43a4ba84685 \ No newline at end of file diff --git a/content/images/eclipse-20220515-235136.yaml b/content/images/eclipse-20220515-235136.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220515-235136.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/images/eclipse-20220516-000739.jpg b/content/images/eclipse-20220516-000739.jpg new file mode 120000 index 0000000..fc0b549 --- /dev/null +++ b/content/images/eclipse-20220516-000739.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/jW/6f/SHA512-s68109--7e627c88851979ffa02c55369993935c70d7a9e107ddbf334189825c87436a4fbc1d14249ffbc5f9f9b97acf752c27abe557d11b3f5bf385c62b22eee36b18b6/SHA512-s68109--7e627c88851979ffa02c55369993935c70d7a9e107ddbf334189825c87436a4fbc1d14249ffbc5f9f9b97acf752c27abe557d11b3f5bf385c62b22eee36b18b6 \ No newline at end of file diff --git a/content/images/eclipse-20220516-000739.yaml b/content/images/eclipse-20220516-000739.yaml new file mode 100644 index 0000000..6752422 --- /dev/null +++ b/content/images/eclipse-20220516-000739.yaml @@ -0,0 +1,4 @@ +--- +title: 2022-05-15/16 Lunar Eclipse from Ottawa +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 diff --git a/content/weblog/eclipse-20220515.md b/content/weblog/eclipse-20220515.md new file mode 100644 index 0000000..ab471b7 --- /dev/null +++ b/content/weblog/eclipse-20220515.md @@ -0,0 +1,11 @@ +--- +title: Lunar Eclipse in Ottawa on 2022-05-15 +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 +published: 2022-05-16T01:17:29-0400 +--- + +<% images = @items.find_all("/images/eclipse-202205*.jpg") +images.sort_by(&:identifier).each do |item| %> +<%= gallery_img(item, caption: "") %> +<% end %> -- 2.43.0 From c047dafad7bcb66a096284497eca6ef20ca1584d Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 4 Jun 2022 22:01:19 -0400 Subject: [PATCH 03/16] Add project page for rrace --- .gitmodules | 3 +++ content/projects/rrace.md | 8 ++++++++ gitmodules/rrace | 1 + 3 files changed, 12 insertions(+) create mode 100644 content/projects/rrace.md create mode 160000 gitmodules/rrace diff --git a/.gitmodules b/.gitmodules index d345e88..649ec89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "gitmodules/cdecl99"] path = gitmodules/cdecl99 url = https://git.draconx.ca/cdecl99.git +[submodule "gitmodules/rrace"] + path = gitmodules/rrace + url = https://git.draconx.ca/rrace.git diff --git a/content/projects/rrace.md b/content/projects/rrace.md new file mode 100644 index 0000000..b5a111f --- /dev/null +++ b/content/projects/rrace.md @@ -0,0 +1,8 @@ +--- +title: RRace +copyright: 2022 Nick Bowler +license: gpl-3 or (at your option) any later version +module: rrace +--- + +<%= project_readme %> diff --git a/gitmodules/rrace b/gitmodules/rrace new file mode 160000 index 0000000..d9238fc --- /dev/null +++ b/gitmodules/rrace @@ -0,0 +1 @@ +Subproject commit d9238fc6c4a4ceaeab31be2908ade413e52b60b4 -- 2.43.0 From eb8b04d03e5355826a8e4e53274faf24d2320cd3 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 9 Jul 2022 12:12:20 -0400 Subject: [PATCH 04/16] M48T59Y battery replacement --- content/images/m48t59y-fixed.jpg | 1 + content/images/m48t59y-fixed.yaml | 6 ++ content/images/m48t59y-installed.jpg | 1 + content/images/m48t59y-installed.yaml | 6 ++ content/images/m48t59y-solder.jpg | 1 + content/images/m48t59y-solder.yaml | 7 ++ content/images/m48t59y-terminals.jpg | 1 + content/images/m48t59y-terminals.yaml | 8 ++ content/images/m48t59y.jpg | 1 + content/images/m48t59y.yaml | 9 +++ content/style.scss | 25 ++++++- content/weblog/ultra60-nvram.md | 101 ++++++++++++++++++++++++++ layouts/default.xsl | 45 ++++++++++-- layouts/functions.xsl | 16 +++- lib/helpers.rb | 42 ++++++++--- 15 files changed, 249 insertions(+), 21 deletions(-) create mode 120000 content/images/m48t59y-fixed.jpg create mode 100644 content/images/m48t59y-fixed.yaml create mode 120000 content/images/m48t59y-installed.jpg create mode 100644 content/images/m48t59y-installed.yaml create mode 120000 content/images/m48t59y-solder.jpg create mode 100644 content/images/m48t59y-solder.yaml create mode 120000 content/images/m48t59y-terminals.jpg create mode 100644 content/images/m48t59y-terminals.yaml create mode 120000 content/images/m48t59y.jpg create mode 100644 content/images/m48t59y.yaml create mode 100644 content/weblog/ultra60-nvram.md diff --git a/content/images/m48t59y-fixed.jpg b/content/images/m48t59y-fixed.jpg new file mode 120000 index 0000000..d0f066e --- /dev/null +++ b/content/images/m48t59y-fixed.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/wK/GG/SHA512-s215590--23ec4d09ab8ed674c51d1fa81145f4983e207ca989ec65c3035ba49c876aa01c37df3ca458b80ab7863607ec80ec8ac950bd03e7d83ec493adc40fef80c55f8d/SHA512-s215590--23ec4d09ab8ed674c51d1fa81145f4983e207ca989ec65c3035ba49c876aa01c37df3ca458b80ab7863607ec80ec8ac950bd03e7d83ec493adc40fef80c55f8d \ No newline at end of file diff --git a/content/images/m48t59y-fixed.yaml b/content/images/m48t59y-fixed.yaml new file mode 100644 index 0000000..6038682 --- /dev/null +++ b/content/images/m48t59y-fixed.yaml @@ -0,0 +1,6 @@ +--- +title: M48T59Y-70PC1 With Battery Clip +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 +description: | + Finished repair of M48T59Y part with external battery clip glued on top. diff --git a/content/images/m48t59y-installed.jpg b/content/images/m48t59y-installed.jpg new file mode 120000 index 0000000..2fa0639 --- /dev/null +++ b/content/images/m48t59y-installed.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/jF/WK/SHA512-s821129--859631534da810c3a29d2246edf97a8d6a61a2ac67c21e18aee2753eb96a38a2856e45278f44db7a7a0ef9bb1c1ae6b00bc32e72b9b143b5d14a8abc7e376a1d/SHA512-s821129--859631534da810c3a29d2246edf97a8d6a61a2ac67c21e18aee2753eb96a38a2856e45278f44db7a7a0ef9bb1c1ae6b00bc32e72b9b143b5d14a8abc7e376a1d \ No newline at end of file diff --git a/content/images/m48t59y-installed.yaml b/content/images/m48t59y-installed.yaml new file mode 100644 index 0000000..2c74fe6 --- /dev/null +++ b/content/images/m48t59y-installed.yaml @@ -0,0 +1,6 @@ +--- +title: M48T59Y-70PC1 Repair Complete +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 +description: | + Repaired M48T59Y chip installed onto the Sun Ultra 60 motherboard. diff --git a/content/images/m48t59y-solder.jpg b/content/images/m48t59y-solder.jpg new file mode 120000 index 0000000..5d8078e --- /dev/null +++ b/content/images/m48t59y-solder.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/8M/9g/SHA512-s146926--2dd1f0b920387121d4e1f658f151417d55d65dfa27a6b397343deeebde08636236a0e123a9cfa3fdeef8204425c3f7d00a5e5dcee121126535a140a059f6fb04/SHA512-s146926--2dd1f0b920387121d4e1f658f151417d55d65dfa27a6b397343deeebde08636236a0e123a9cfa3fdeef8204425c3f7d00a5e5dcee121126535a140a059f6fb04 \ No newline at end of file diff --git a/content/images/m48t59y-solder.yaml b/content/images/m48t59y-solder.yaml new file mode 100644 index 0000000..dc6253b --- /dev/null +++ b/content/images/m48t59y-solder.yaml @@ -0,0 +1,7 @@ +--- +title: M48T59Y-70PC1 Wire Leads +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 +description: | + M48T59Y with battery leads connected, after disconnecting the internal + battery tabs. diff --git a/content/images/m48t59y-terminals.jpg b/content/images/m48t59y-terminals.jpg new file mode 120000 index 0000000..795475d --- /dev/null +++ b/content/images/m48t59y-terminals.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/98/V1/SHA512-s186948--c3277cf2aea7e159ee6203e9c7f5330f3a1c79a4d2c347c7637c19f354c7cafe2181b54fd40e84eba434a16340fb9cd3a87e76a636d45278846cb46c3d1f606e/SHA512-s186948--c3277cf2aea7e159ee6203e9c7f5330f3a1c79a4d2c347c7637c19f354c7cafe2181b54fd40e84eba434a16340fb9cd3a87e76a636d45278846cb46c3d1f606e \ No newline at end of file diff --git a/content/images/m48t59y-terminals.yaml b/content/images/m48t59y-terminals.yaml new file mode 100644 index 0000000..806df38 --- /dev/null +++ b/content/images/m48t59y-terminals.yaml @@ -0,0 +1,8 @@ +--- +title: M48T59Y-70PC1 Battery Terminals +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 +description: | + M48T59Y with internal battery connections exposed. The negative connection + is on the left, closest to pin 14. The positive connection is on the right, + closest to pin 16. diff --git a/content/images/m48t59y.jpg b/content/images/m48t59y.jpg new file mode 120000 index 0000000..40e10d3 --- /dev/null +++ b/content/images/m48t59y.jpg @@ -0,0 +1 @@ +../../.git/annex/objects/5f/mJ/SHA512-s141937--ebbd8a2ad4b6d4f1c6d66d9f7ba76685c5281bff3d0fb34f7e00e3016b8422c4935aa9b87caa1c4f8ed9b1b7f727b4f2c97d49991f483317c8248f536c225620/SHA512-s141937--ebbd8a2ad4b6d4f1c6d66d9f7ba76685c5281bff3d0fb34f7e00e3016b8422c4935aa9b87caa1c4f8ed9b1b7f727b4f2c97d49991f483317c8248f536c225620 \ No newline at end of file diff --git a/content/images/m48t59y.yaml b/content/images/m48t59y.yaml new file mode 100644 index 0000000..7258310 --- /dev/null +++ b/content/images/m48t59y.yaml @@ -0,0 +1,9 @@ +--- +title: M48T59Y-70PC1 +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 +description: | +

The NVRAM module + used in my Sun Ultra 60 workstation. This combines a normal memory with a + real-time clock and an internal lithium primary cell to maintain everything. + However, the internal cell is long dead so this chip is dead too.

diff --git a/content/style.scss b/content/style.scss index 2708bb4..abc6c49 100644 --- a/content/style.scss +++ b/content/style.scss @@ -76,6 +76,16 @@ h5 { @include header_size(60em, 1em); } p.img { margin: 0.5em 0; } } + + @media (max-width: 45em) { + .inline.gallery { + display: block; + p.img { + a { max-width: 24em; } + margin: 1em 0; + } + } + } } p.img { @@ -94,12 +104,22 @@ p.img { border: solid 2px; } + a.left { margin: 0 1em 0.5em 0; float: left; clear: left; } + a.right { margin: 0 0 0.5em 1em; float: right; clear: right; } + a.left, a.right { + @media (max-width: 45em) { float: none; margin: 0; } + + max-width: 24em; + } + small { @include usecolours($color: foreground); - text-align: justify; @media (max-width: 24em) { text-align: left; } padding: 0.5ex; display: block; + display: -moz-inline-box; + display: inline-block; + text-align: justify; font-size: 0.9em; } } @@ -137,10 +157,12 @@ kbd { font-family: monospace; font-size: 0.95em; &:before { content: "% "; } + &.ok:before { content: "ok "; } &>span { white-space: nowrap; } blockquote & { display: block; + & + br { display: none; } text-align: left; padding-left: 3em; text-indent: -3em; @@ -160,6 +182,7 @@ kbd { table { @include usecolour(border-top, ruledefault, 1px solid); border-collapse: collapse; + clear: both; width: 100%; } diff --git a/content/weblog/ultra60-nvram.md b/content/weblog/ultra60-nvram.md new file mode 100644 index 0000000..ec96370 --- /dev/null +++ b/content/weblog/ultra60-nvram.md @@ -0,0 +1,101 @@ +--- +title: M48T59Y-70PC1 NVRAM Battery Replacement +copyright: 2022 Nick Bowler +license: cc-by-sa-4.0 +published: 2022-07-09T12:12:21-0400 +--- + +*[NVRAM]: Non-Volatile Random Access Memory +*[SRAM]: Static Random-Access Memory +*[NOS]: New Old Stock +*[DIP]: Dual In-line Package +*[SOIC]: Small-Outline Integrated Circuit +*[MAC]: Media Access Control + +Thanks to [Mark Henderson's Sun NVRAM FAQ][nvram-faq] for providing invaluable +insight regarding this repair. +{:article-info="article-info"} + +[nvram-faq]: http://web.archive.org/web/20150919135835/http://www.squirrel.com/sun-nvram-hostid.faq.html + +The Sun Ultra 60 workstation uses an ST M48T59Y-70PC1 battery-backed SRAM with +real-time clock. When the embedded lithium primary cell inevitably dies, the +chip is essentially useless. The most noticeable negative effect of a dead +chip is that the workstation always powers up in a default configuration with +diag-switch? true, running several minutes of self tests every time, with +bogus MAC and host ID values. + +<%= floating_img(@items["/images/m48t59y.jpg"], caption: < + +This device was branded obsolescent by the manufacturer in April of 2008 and +has presumably been out of production since around that time. Similar chips +like the M48T58Y are still made but they are expensive (around $40) and slight +differences may result in compatibility problems. It appears that NOS parts +can be found fairly cheap online but these must be almost 15 years old by now +and who knows what state the embedded batteries are in. No thanks. + +One option could be to find the SOIC version of the M48T59Y for which NOS also +seems to be available, although somewhat less readily than the DIP modules, and +then construct an adapter board to fit into the DIP socket on the motherboard. +The SOIC package does not include the battery and crystal; instead, it has +contacts on the top to attach a separate "SNAPHAT" package which are still +made. This would be complicated and somewhat expensive. + +Fortunately, a straightforward (if time-consuming) repair is possible. This +is a literal hackjob: we can dig through the potting to expose the battery +terminals, disconnect the internal battery, and connect a normal battery clip. +This enables the use of readily-available CR2032 lithium primary cells that can +be replaced as needed, just like a normal PC. Since we already have the chip +we need, it is not necessary to source any obscure or expensive components. + +<%= +floating_img(@items["/images/m48t59y-terminals.jpg"], left: 1, caption: '') +%> + +<%= +floating_img(@items["/images/m48t59y-solder.jpg"], left: 1, caption: '') +%> + +The battery contacts are located on the end opposite pin 1, between pins +14 and 15. Looking underneath the chip there is a small well at either end +filled with potting compound. The battery connections are inside one of +these. Using a knife, cut back the plastic outer shell on the battery side, +then begin scraping away potting compound until the terminals are exposed. +You can use a suitable DIP socket to help protect the pins from accidental +damage. + +Once the terminals are exposed, the internal battery must be disconnected. +The thick protruding tabs near the bottom of the module are what we want +to solder to. The vertical strips going up and into the module are the +internal battery terminals. These can be desoldered from the tabs and +lifted out of the way, or simply cut off. + +With the time-consuming parts completed it is a straightforward matter to +connect a normal battery clip to the exposed terminals. As the Ultra 60 has +no clearance issues I simply glued it to the top of the chip. Since this +would obscure the barcode sticker which is useful to restore the original MAC +address and host ID, I moved this sticker to the side of the chip. + +Finally all that remains is to put everything back together and power up +the system. The system will run the full self-diagnostic tests again and +if all goes well, the "NVRAM Battery Detect Test" should no longer display +any errors. At the ok prompt, the memory can now be initialized. Where +"AA BB CC" are the six hexadecimal digits from the orange barcode sticker: + +set-defaults
+setenv diag-switch? false
+8 0 20 AA BB CC AABBCC mkpl
<Ctrl-D><Ctrl-R>
+.idprom
+reset + +<%= gallery_img(@items["/images/m48t59y-fixed.jpg"], caption: < +<%= gallery_img(@items["/images/m48t59y-installed.jpg"], caption: < diff --git a/layouts/default.xsl b/layouts/default.xsl index d5be103..7681933 100644 --- a/layouts/default.xsl +++ b/layouts/default.xsl @@ -222,7 +222,7 @@ - +
@@ -400,18 +400,42 @@

+ + + - + +
-

- Posted - -

+ + +
+ +

+ Posted + + + , last updated + + +

+ + + + + + + + + + @@ -439,7 +463,14 @@ -
+
+ + gallery + + inline + + diff --git a/layouts/functions.xsl b/layouts/functions.xsl index a88c338..bbaf90e 100644 --- a/layouts/functions.xsl +++ b/layouts/functions.xsl @@ -1,7 +1,7 @@ + + + + + + + diff --git a/lib/helpers.rb b/lib/helpers.rb index 77916dd..24d37e4 100644 --- a/lib/helpers.rb +++ b/lib/helpers.rb @@ -1,6 +1,6 @@ # Nick's web site: Ruby helpers for processing # -# Copyright © 2018-2021 Nick Bowler +# Copyright © 2018-2022 Nick Bowler # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -77,26 +77,31 @@ def counter(name = :default, item = @item) name.to_s.capitalize + " " + ($counters[item][name] += 1).to_s end -def img_rep_fallback(item, rep) - return rep unless item.reps[rep].raw_path.nil? - return :large +# Return a hash containing :src, :width and :height based on an image item rep. +def img_rep_attrs(item, rep) + rep = :large if item.reps[rep].raw_path.nil? + attrs = {} + + attrs[:src] ||= item_uri(item, rep: rep) + attrs[:width], attrs[:height] = FastImage.size(item.reps[rep].raw_path) + + return attrs end -def gallery_img(item, rep: :large, alt: nil, caption: nil) +def embed_img(item, rep: :large, caption: nil, block_attrs: {}, img_attrs: {}) return "[image not found]" unless item - alt ||= item[:title] - caption ||= alt + img_attrs[:alt] ||= item[:title] + caption ||= img_attrs[:alt] caption = caption.strip caption.gsub!(/\s+/, " ") - rep = img_rep_fallback(item, rep) - attrs = { :src => item_uri(item, rep: rep), :alt => item[:title] } - attrs[:width], attrs[:height] = FastImage.size(item.reps[rep].raw_path) + img_attrs = img_rep_attrs(item, rep).merge(img_attrs) + block_attrs[:href] = item_uri(item, rep: :info) b = Nokogiri::XML::Builder.new do |xml| - xml.a(:href => item_uri(item, rep: :info)) { - xml.img(attrs, "generate-gallery" => "generate-gallery") + xml.a(block_attrs) { + xml.img(img_attrs) unless caption.empty? xml << " ⁠" xml.small { xml << caption } @@ -106,6 +111,19 @@ def gallery_img(item, rep: :large, alt: nil, caption: nil) b.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::NO_DECLARATION) end +def gallery_img(item, rep: :medium, caption: nil, alt: nil) + attrs = { alt: alt, "generate-gallery" => "generate-gallery" } + embed_img(item, rep: rep, caption: caption, img_attrs: attrs) +end + +def floating_img(item, rep: :medium, caption: nil, alt: nil, left: nil) + battrs = { class: if left then "left" else "right" end } + attrs = { alt: alt } + + embed_img(item, rep: rep, caption: caption, + block_attrs: battrs, img_attrs: attrs) +end + def expand_copyright(copyright) result = { :years => {} } -- 2.43.0 From a6bdcbd6dd9bbb5310cc3d3f3346cf169b09292e Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Tue, 13 Sep 2022 01:29:20 -0400 Subject: [PATCH 05/16] Update rrace README. --- gitmodules/rrace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitmodules/rrace b/gitmodules/rrace index d9238fc..c1dbd8f 160000 --- a/gitmodules/rrace +++ b/gitmodules/rrace @@ -1 +1 @@ -Subproject commit d9238fc6c4a4ceaeab31be2908ade413e52b60b4 +Subproject commit c1dbd8fcf932d82b4d77da62288b4a6cdf5c1470 -- 2.43.0 From 466a4c7c22997ce016719a051d72af8371bb8863 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 3 Nov 2022 20:51:23 -0400 Subject: [PATCH 06/16] Move whitespace handling templates into a separate file. This is pretty independent of anything else so we can use an xsl:include to pull it in. Also remove duplicate definition of f:ends-with which is in the same area. --- layouts/default.xsl | 81 +--------------------------- layouts/whitespace.xsl | 116 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 80 deletions(-) create mode 100644 layouts/whitespace.xsl diff --git a/layouts/default.xsl b/layouts/default.xsl index 7681933..a9a75df 100644 --- a/layouts/default.xsl +++ b/layouts/default.xsl @@ -35,13 +35,6 @@ - - - - - - @@ -52,79 +45,6 @@ - - - - - ⁠ - - - - - - - ⁠ - - - - - - - - - - ⁠ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/layouts/whitespace.xsl b/layouts/whitespace.xsl new file mode 100644 index 0000000..c15639a --- /dev/null +++ b/layouts/whitespace.xsl @@ -0,0 +1,116 @@ + + + + + + + + + + ⁠ + + + + + + + ⁠ + + + + + + + + + + ⁠ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.43.0 From 5e2eaac44dfd84ac3878853e352d5752867c4196 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 4 Nov 2022 03:15:43 -0400 Subject: [PATCH 07/16] Update css_darkmode to handle media queries under @supports. This filter currently does not "see" anything within a @supports block, so the hoisting of dark-mode media queries inside such a block is not properly done. Fix this by restructuring the filter to recurse down into these blocks. --- lib/css-darkmode.rb | 105 ++++++++++++++++++++++++++++++++------------ 1 file changed, 77 insertions(+), 28 deletions(-) diff --git a/lib/css-darkmode.rb b/lib/css-darkmode.rb index 50662e3..f15f64d 100644 --- a/lib/css-darkmode.rb +++ b/lib/css-darkmode.rb @@ -26,6 +26,22 @@ class CssDarkModeFilter < Nanoc::Filter return nodes.reject {|x| x[:node] == :whitespace } end + # Return a new list of nodes where consecutive whitespace nodes have been + # replaced with a single whitespace node, and if the whitespace contains + # one or more newlines, everything before the final newline is removed. + def simplify_whitespace(nodes) + nodes.slice_when do |a,b| + a[:node] != :whitespace or b[:node] != :whitespace + end.map do |x| + if x[0][:node] == :whitespace + combined = x.map{|y| y[:raw]}.join.sub(/.*\n/m, "\n") + x[0].merge({ raw: combined}) + else + x[0] + end + end + end + def is_media_dark_block(x) return false unless x[:node] == :simple_block @@ -44,6 +60,10 @@ class CssDarkModeFilter < Nanoc::Filter x[:prelude].index {|y| is_media_dark_block(y)} end + def is_supports_block(x) + true if x[:node] == :at_rule and x[:name] == "supports" + end + # Remove (prefers-color-scheme: dark) conditions from a media query. # If the resulting query is empty, returns the query's block alone. # Otherwise, returns the modified query. @@ -115,6 +135,54 @@ class CssDarkModeFilter < Nanoc::Filter end end + def process(tree, params) + last_visited = {} + darknodes = [] + + tree.delete_if do |x| + sep = { node: :whitespace, raw: "\n" } + if last_visited[:node] == :whitespace + # Try to maintain indentation + sep[:raw] += last_visited[:raw].sub(/[^\n]*\z|.*\n/m, "") + end + last_visited = x + + if is_supports_block(x) + # Re-parse the block as a list of rules + s = Crass::Parser.stringify(x[:block]) + x[:block] = Crass::Parser.parse_rules(s, params) + + block = process(x[:block], params) + unless block.empty? + block << { node: :whitespace, raw: "\n" } + darknodes << [sep, x.merge({ block: block })] + end + + Crass::Parser.stringify(x[:block]).strip.empty? + elsif is_media_dark(x) + if params[:alternate] + x = prune_media_dark(x) + end + darknodes << [sep, x] + end + end + + # Combine consecutive equivalent media queries into a single query + result = darknodes.slice_when do |a,b| + !equiv_query(a[1], b[1]) + end.each.map do |x| + case x[0][1] + when Hash + g = x.map{ |sep, node| node[:block] }.flatten + [ x[0][0], x[0][1].merge({ block: simplify_whitespace(g) }) ] + else + x + end + end.flatten + + simplify_whitespace(result) + end + def run(content, params = {}) params = { preserve_comments: true, @@ -123,36 +191,17 @@ class CssDarkModeFilter < Nanoc::Filter tree = Crass.parse(content, params) - darknodes = [] - tree.delete_if { |x| darknodes << x if is_media_dark(x) } - - # Combine consecutive equivalent media queries into a single query - darknodes = darknodes.slice_when{|a,b| !equiv_query(a, b)}.each.map \ - do |x| - combined = x[0].merge({block: x.map{|x| x[:block]}.flatten}) - end - - # In alternate mode, remove prefers-color-scheme queries. - if params[:alternate] - darknodes.map!{|x| prune_media_dark(x)} + prologue = tree.take_while do |x| + x[:node] == :comment or x[:node] == :whitespace end + tree.slice!(0, prologue.length) - darkcss = "" - darknodes.each do |x| - darkcss += "#{Crass::Parser.stringify(x).rstrip}\n" - end - darkcss.sub!(/^\n*/, "") - - if params[:alternate] - prologue = tree.take_while do |x| - x[:node] == :comment or x[:node] == :whitespace - end - - "#{Crass::Parser.stringify(prologue).rstrip}\n\n#{darkcss}" - else - output = "#{Crass::Parser.stringify(tree).rstrip}\n" - output += "\n#{darkcss}" unless darkcss.empty? - output + output = "#{Crass::Parser.stringify(prologue).rstrip}\n" + darknodes = process(tree, params) + unless params[:alternate] + tree = simplify_whitespace(tree) + output += "#{Crass::Parser.stringify(tree).rstrip}\n" end + output += "#{Crass::Parser.stringify(darknodes).rstrip}\n" end end -- 2.43.0 From 26fb391fd994e985c8dcd310477eaffe0b72947a Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 1 Apr 2023 17:50:48 -0400 Subject: [PATCH 08/16] Fix compiled_content filter on Ruby 3. It is apparently now required to use ** when passing a hash to a function that takes keyword arguments. --- lib/compiledcontent.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/compiledcontent.rb b/lib/compiledcontent.rb index 016ed23..80e7911 100644 --- a/lib/compiledcontent.rb +++ b/lib/compiledcontent.rb @@ -1,7 +1,7 @@ # Nick's web site: compiled_content filter. Simply calls the compiled_content # method on the current item to retrieve the text from a named rep or snapshot. # -# Copyright © 2022 Nick Bowler +# Copyright © 2022-2023 Nick Bowler # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,6 +20,6 @@ class CompiledContentFilter < Nanoc::Filter identifier :compiled_content def run(content, params = {}) - return @item.compiled_content(params) + return @item.compiled_content(**params) end end -- 2.43.0 From 348da92aeda2cb82e59534bb38726e99cfea3c69 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 27 Jul 2023 01:47:33 -0400 Subject: [PATCH 09/16] Add new rarpd-dx project. If the iputils folks don't want to package this anymore, I guess I can. --- .gitmodules | 3 +++ content/projects.md | 3 +++ content/projects/rarpd-dx.md | 12 ++++++++++++ content/style.scss | 6 ++++-- gitmodules/rarpd-dx | 1 + layouts/default.xsl | 27 +++++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 content/projects/rarpd-dx.md create mode 160000 gitmodules/rarpd-dx diff --git a/.gitmodules b/.gitmodules index 649ec89..f24b460 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "gitmodules/rrace"] path = gitmodules/rrace url = https://git.draconx.ca/rrace.git +[submodule "gitmodules/rarpd-dx"] + path = gitmodules/rarpd-dx + url = https://git.draconx.ca/rarpd-dx.git diff --git a/content/projects.md b/content/projects.md index 90413c9..8db0c42 100644 --- a/content/projects.md +++ b/content/projects.md @@ -4,6 +4,9 @@ copyright: 2019 Nick Bowler license: cc-by-nd-4.0 --- +*[RARP]: Reverse Address Resolution Protocol +*[ARP]: Address Resolution Protocol + Most of the operations here in the workshop are tracked on our local [git server](//git.draconx.ca) which can be browsed online. All the work here is [free as in freedom](//www.gnu.org/philosophy/free-sw) which means you are diff --git a/content/projects/rarpd-dx.md b/content/projects/rarpd-dx.md new file mode 100644 index 0000000..ffaf19f --- /dev/null +++ b/content/projects/rarpd-dx.md @@ -0,0 +1,12 @@ +--- +title: RARP Daemon +copyright: 2023 Nick Bowler +license: gpl-2 or (at your option) any later version +module: rarpd-dx +--- + +*[RARP]: Reverse Address Resolution Protocol +*[ARP]: Address Resolution Protocol + +<%= project_readme %> + diff --git a/content/style.scss b/content/style.scss index abc6c49..17aff0b 100644 --- a/content/style.scss +++ b/content/style.scss @@ -67,6 +67,8 @@ h1 { @include header_size(60em, 2em); } h2 { @include header_size(60em, 1.5em); } h5 { @include header_size(60em, 1em); } +h1, h2 { abbr { text-decoration: none; } } + @supports (display: grid) { .gallery { display: grid; @@ -226,8 +228,8 @@ table.cc { } } -// CSS rules for stortable clicky table headers: Update the display of -// the /table based on the current state. Each column has its own set +// CSS rules for sortable clicky table headers: Update the display of +// the table based on the current state. Each column has its own set // nearly-identical rules, only the class names differ. // // The clickytables.xsl stylesheet generates two inputs for each column. diff --git a/gitmodules/rarpd-dx b/gitmodules/rarpd-dx new file mode 160000 index 0000000..97a1829 --- /dev/null +++ b/gitmodules/rarpd-dx @@ -0,0 +1 @@ +Subproject commit 97a182920cd28f822aa3fcdd74ace01cf7b0a495 diff --git a/layouts/default.xsl b/layouts/default.xsl index a9a75df..6bf8094 100644 --- a/layouts/default.xsl +++ b/layouts/default.xsl @@ -83,6 +83,33 @@ + + + + + + + + + + + + + + + + + + + + +