From ba601b66c37cb3cffced071617b9984c13882595 Mon Sep 17 00:00:00 2001 From: Greg Gauthier Date: Tue, 24 Jan 2023 21:26:11 +0000 Subject: [PATCH] add shortcodes and beef up the blog entries --- archetypes/default.md | 1 + content/blog/post-1.md | 8 +-- content/blog/post-2.md | 10 ++-- content/blog/post-3.md | 30 +++++++++-- content/links.md | 4 ++ layouts/_default/li.html | 6 +-- layouts/_default/list.html | 2 +- layouts/partials/welcome.html | 72 ++------------------------- layouts/shortcodes/abstab.html | 8 +++ layouts/shortcodes/ah.html | 6 +++ layouts/shortcodes/audio.html | 5 ++ layouts/shortcodes/bitchute.html | 7 +++ layouts/shortcodes/fluid_img.html | 7 +++ layouts/shortcodes/fluid_imgs.html | 21 ++++++++ layouts/shortcodes/gab.html | 6 +++ layouts/shortcodes/highlighter.html | 1 + layouts/shortcodes/home.html | 1 + layouts/shortcodes/include.html | 4 ++ layouts/shortcodes/newtab.html | 7 +++ layouts/shortcodes/note.html | 3 ++ layouts/shortcodes/odysee.html | 6 +++ layouts/shortcodes/pdflist.html | 23 +++++++++ layouts/shortcodes/pure_table.html | 23 +++++++++ layouts/shortcodes/rawhtml.html | 2 + layouts/shortcodes/reltab.html | 8 +++ layouts/shortcodes/span.html | 1 + layouts/shortcodes/strikethrough.html | 1 + layouts/shortcodes/video.html | 7 +++ layouts/shortcodes/year.html | 1 + layouts/shortcodes/youtube.html | 6 +++ layouts/taxonomy/tag.html | 7 +++ static/css/index.css | 58 ++++++++++----------- 32 files changed, 238 insertions(+), 114 deletions(-) create mode 100644 layouts/shortcodes/abstab.html create mode 100644 layouts/shortcodes/ah.html create mode 100644 layouts/shortcodes/audio.html create mode 100644 layouts/shortcodes/bitchute.html create mode 100644 layouts/shortcodes/fluid_img.html create mode 100644 layouts/shortcodes/fluid_imgs.html create mode 100644 layouts/shortcodes/gab.html create mode 100644 layouts/shortcodes/highlighter.html create mode 100644 layouts/shortcodes/home.html create mode 100644 layouts/shortcodes/include.html create mode 100644 layouts/shortcodes/newtab.html create mode 100644 layouts/shortcodes/note.html create mode 100644 layouts/shortcodes/odysee.html create mode 100644 layouts/shortcodes/pdflist.html create mode 100644 layouts/shortcodes/pure_table.html create mode 100644 layouts/shortcodes/rawhtml.html create mode 100644 layouts/shortcodes/reltab.html create mode 100644 layouts/shortcodes/span.html create mode 100644 layouts/shortcodes/strikethrough.html create mode 100644 layouts/shortcodes/video.html create mode 100644 layouts/shortcodes/year.html create mode 100644 layouts/shortcodes/youtube.html create mode 100644 layouts/taxonomy/tag.html diff --git a/archetypes/default.md b/archetypes/default.md index 2fc2f53..e7f511a 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -2,5 +2,6 @@ title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} tags: [] +description: "" draft: false --- \ No newline at end of file diff --git a/content/blog/post-1.md b/content/blog/post-1.md index 440ffa4..3944ab2 100644 --- a/content/blog/post-1.md +++ b/content/blog/post-1.md @@ -1,9 +1,11 @@ --- -title: "Post 1" -date: 2023-01-24T13:52:16Z +title: "Hello, World!" +date: 2023-01-23T13:52:16Z tags: ["post"] description: The first post draft: false --- -This is a test +This is the beginning of this blog. Here is a video to prove it! + +{{}} diff --git a/content/blog/post-2.md b/content/blog/post-2.md index cd95f29..eebffa4 100644 --- a/content/blog/post-2.md +++ b/content/blog/post-2.md @@ -1,9 +1,11 @@ --- -title: "Post 2" +title: "Program Text Editor" date: 2023-01-24T13:52:30Z -tags: ["post"] -description: The second post +tags: ["medit", "assembler", "video"] +description: Just a quick test for the blog draft: false --- -This is a test \ No newline at end of file +This was an attempt to make sure that the video cloner was working, and to give the Program Text Editor a spin. I think it went well! + +{{}} diff --git a/content/blog/post-3.md b/content/blog/post-3.md index 101369a..cbc6dff 100644 --- a/content/blog/post-3.md +++ b/content/blog/post-3.md @@ -1,9 +1,31 @@ --- -title: "Post 3" +title: "What Is 2+2?" date: 2023-01-24T13:52:39Z -tags: ["post"] -description: The third post +tags: ["assembler", "accumulator", "coding"] +description: Writing our first program! draft: false --- -This is a test \ No newline at end of file +For my first outing, I've decided to go with the simplest possible coding project I could imagine: adding 2 and 2, to get 4. I call it the "Winston Smith" Demo, for obvious reasons! + +{{}} + +This is the code from the video: + +{{< rawhtml >}} +
+10 ;
+20 ;ADDNRS.SRC
+30 ;
+40  *=$0600
+50 ;
+60  CLD
+70 ADDNRS CLC
+80  LDA #2
+90  ADC #2
+100  STA $CB
+110  RTS
+120  .END
+
+{{< /rawhtml >}} + \ No newline at end of file diff --git a/content/links.md b/content/links.md index 4dd9738..a3f4e53 100644 --- a/content/links.md +++ b/content/links.md @@ -2,3 +2,7 @@ title: Links description: Useful resources for Atarians --- + +Here is a list of useful websites: + +* [Atari Archives]( https://www.atariarchives.org/) \ No newline at end of file diff --git a/layouts/_default/li.html b/layouts/_default/li.html index 323f851..c2202fe 100644 --- a/layouts/_default/li.html +++ b/layouts/_default/li.html @@ -1,9 +1,9 @@ -
  • +
  • {{ if isset .Params "image" }} {{ else }} + width="60px" height="30px" style="vertical-align: middle; padding: 1px"/> {{end}} - - {{ .Title }} + - {{ .Title }}
    • diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 87f8a3f..8e19c59 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -6,7 +6,7 @@
    {{ range .Data.Pages.GroupByDate "2006" }} -

    {{ .Key }}

    +

    {{ .Key }}

      {{ range .Pages }} {{ .Render "li" }} diff --git a/layouts/partials/welcome.html b/layouts/partials/welcome.html index 4225b5b..d2d1717 100644 --- a/layouts/partials/welcome.html +++ b/layouts/partials/welcome.html @@ -8,73 +8,11 @@ and looking at other people's projects. So, you may find this interesting, too! I hope you do.

      - -

      Some small text

      -

      Some very tiny text

    - -
    -
    -

    Attention!

    -

    Hello, this is a highlighted notice!

    -
    - -
    -

    H2 Test Text

    -

    Some standard text.

    -

    Some small text

    -

    Some very tiny text

    -
    +
    +

    + Current Events: +

    +
  • Nothing scheduled
    • - -

    H3 Test Text

    -

    Some standard text.

    -

    Some small text

    -

    Some very tiny text

    - -

    H4 Test Text

    -

    Here is a code block:

    -
    -100 REM PLAYER/MISSILE EXAMPLE
-110 DIM A$(512),B$(20)
-120 X=X+1:READ A:IF A<>-1 THEN B$(X,X)=CHR$(A):GOTO 120
-130 DATA 0,255,129,129,129,129,129,129,129,129,255,0,-1
-2000 POKE 559,62:POKE 704,88
-2020 I=PEEK(106)-16:POKE 54279,I
-2030 POKE 53277,3:POKE 710,224
-2040 VTAB=PEEK(134)+PEEK(135)*256
-2050 ATAB=PEEK(140)+PEEK(141)*256
-2060 OFFS=I*256+1024-ATAB
-2070 HI=INT(OFFS/256):LO=OFFS-HI*256
-2090 POKE VTAB+2,LO:POKE VTAB+3,HI
-3000 Y=60:Z=100:V=1:H=1
-4000 A$(Y,Y+11)=B$:POKE 53248,Z
-4010 Y=Y+V:Z=Z+H
-4020 IF Y>213 OR Y<33 THEN V=-V
-4030 IF Z>206 OR Z<49 THEN H=-H
-4420 GOTO 4000
-
    -

    - Here is a code printout! -

    -
    - 100 REM PLAYER/MISSILE EXAMPLE
    - 110 DIM A$(512),B$(20)
    - 120 X=X+1:READ A:IF A<>-1 THEN B$(X,X)=CHR$(A):GOTO 120
    - 130 DATA 0,255,129,129,129,129,129,129,129,129,255,0,-1
    - 2000 POKE 559,62:POKE 704,88
    - 2020 I=PEEK(106)-16:POKE 54279,I
    - 2030 POKE 53277,3:POKE 710,224
    - 2040 VTAB=PEEK(134)+PEEK(135)*256
    - 2050 ATAB=PEEK(140)+PEEK(141)*256
    - 2060 OFFS=I*256+1024-ATAB
    - 2070 HI=INT(OFFS/256):LO=OFFS-HI*256
    - 2090 POKE VTAB+2,LO:POKE VTAB+3,HI
    - 3000 Y=60:Z=100:V=1:H=1
    - 4000 A$(Y,Y+11)=B$:POKE 53248,Z
    - 4010 Y=Y+V:Z=Z+H
    - 4020 IF Y>213 OR Y<33 THEN V=-V
    - 4030 IF Z>206 OR Z<49 THEN H=-H
    - 4420 GOTO 4000
    -
    \ No newline at end of file diff --git a/layouts/shortcodes/abstab.html b/layouts/shortcodes/abstab.html new file mode 100644 index 0000000..05d668e --- /dev/null +++ b/layouts/shortcodes/abstab.html @@ -0,0 +1,8 @@ + + + {{ with .Get "title" }} + {{.}} + {{else}} + {{ .Get "url" }} + {{end}} + diff --git a/layouts/shortcodes/ah.html b/layouts/shortcodes/ah.html new file mode 100644 index 0000000..034735b --- /dev/null +++ b/layouts/shortcodes/ah.html @@ -0,0 +1,6 @@ +{{ $anchorized := anchorize .Inner }} + +

    + # + {{ .Inner }} +

    \ No newline at end of file diff --git a/layouts/shortcodes/audio.html b/layouts/shortcodes/audio.html new file mode 100644 index 0000000..ca561b1 --- /dev/null +++ b/layouts/shortcodes/audio.html @@ -0,0 +1,5 @@ +
    + +
    \ No newline at end of file diff --git a/layouts/shortcodes/bitchute.html b/layouts/shortcodes/bitchute.html new file mode 100644 index 0000000..2ec4f61 --- /dev/null +++ b/layouts/shortcodes/bitchute.html @@ -0,0 +1,7 @@ +
    + +
    +
    \ No newline at end of file diff --git a/layouts/shortcodes/fluid_img.html b/layouts/shortcodes/fluid_img.html new file mode 100644 index 0000000..6930dd9 --- /dev/null +++ b/layouts/shortcodes/fluid_img.html @@ -0,0 +1,7 @@ +{{ if .IsNamedParams }} +
    + +
    +{{ else }} + +{{ end }} \ No newline at end of file diff --git a/layouts/shortcodes/fluid_imgs.html b/layouts/shortcodes/fluid_imgs.html new file mode 100644 index 0000000..7d1717f --- /dev/null +++ b/layouts/shortcodes/fluid_imgs.html @@ -0,0 +1,21 @@ +{{ $paramCount := len .Params }} +{{ if gt $paramCount 0 }} +
    +{{ range $param := .Params }} + {{ $items := split $param "|" }} + {{ $itemCount := len $items }} + + {{ if ge $itemCount 2 }} +
    +
    + {{ if ge $itemCount 3 }}{{ index $items 2 }}{{ else }}{{ +
    +
    + {{ end }} +{{ end }} +
    +{{ end }} \ No newline at end of file diff --git a/layouts/shortcodes/gab.html b/layouts/shortcodes/gab.html new file mode 100644 index 0000000..46b2452 --- /dev/null +++ b/layouts/shortcodes/gab.html @@ -0,0 +1,6 @@ + +
    + +
    \ No newline at end of file diff --git a/layouts/shortcodes/highlighter.html b/layouts/shortcodes/highlighter.html new file mode 100644 index 0000000..8727b45 --- /dev/null +++ b/layouts/shortcodes/highlighter.html @@ -0,0 +1 @@ +{{ with .Get 0 }}{{.}}{{end}} \ No newline at end of file diff --git a/layouts/shortcodes/home.html b/layouts/shortcodes/home.html new file mode 100644 index 0000000..5c315ab --- /dev/null +++ b/layouts/shortcodes/home.html @@ -0,0 +1 @@ +{{.Site.BaseURL}} \ No newline at end of file diff --git a/layouts/shortcodes/include.html b/layouts/shortcodes/include.html new file mode 100644 index 0000000..1f58549 --- /dev/null +++ b/layouts/shortcodes/include.html @@ -0,0 +1,4 @@ +
    + +
    diff --git a/layouts/shortcodes/newtab.html b/layouts/shortcodes/newtab.html new file mode 100644 index 0000000..f9725eb --- /dev/null +++ b/layouts/shortcodes/newtab.html @@ -0,0 +1,7 @@ + + {{ with .Get "title" }} + {{.}} + {{else}} + {{ .Site.BaseURL }}{{ .Get "url" }} + {{end}} + diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html new file mode 100644 index 0000000..0c5b6e0 --- /dev/null +++ b/layouts/shortcodes/note.html @@ -0,0 +1,3 @@ +
    + {{ .Inner }} +
    \ No newline at end of file diff --git a/layouts/shortcodes/odysee.html b/layouts/shortcodes/odysee.html new file mode 100644 index 0000000..5f695d2 --- /dev/null +++ b/layouts/shortcodes/odysee.html @@ -0,0 +1,6 @@ +
    +
    + +
    +
    \ No newline at end of file diff --git a/layouts/shortcodes/pdflist.html b/layouts/shortcodes/pdflist.html new file mode 100644 index 0000000..d7ada14 --- /dev/null +++ b/layouts/shortcodes/pdflist.html @@ -0,0 +1,23 @@ +{{ $path := $.Page.Dir }} +{{ $filePath := printf "content/%s" ($path) }} +{{ $withCaptions := .Get "withCaptions"}} +{{ $gallery := .Get "id" }} + + +{{ range readDir ($filePath) }} + {{ $display := strings.HasSuffix .Name "pdf" }} + {{ $caption := substr .Name 0 128 }} + {{ if $display}} +
    + + {{ $caption}} + +
    + {{ end }} +{{ end }} + + \ No newline at end of file diff --git a/layouts/shortcodes/pure_table.html b/layouts/shortcodes/pure_table.html new file mode 100644 index 0000000..f50a773 --- /dev/null +++ b/layouts/shortcodes/pure_table.html @@ -0,0 +1,23 @@ +{{ $fields := (index .Params 0) }} +{{ $data := after 1 .Params }} + + + + + {{ range split $fields "|"}} + + {{ end }} + + + {{ range $data}} + + {{ $items := split . "|" }} + {{ range $items }} + + {{ end }} + + {{ end }} + +
    {{ . }}
    {{ . }}
    +     \ No newline at end of file diff --git a/layouts/shortcodes/rawhtml.html b/layouts/shortcodes/rawhtml.html new file mode 100644 index 0000000..520ec17 --- /dev/null +++ b/layouts/shortcodes/rawhtml.html @@ -0,0 +1,2 @@ + +{{.Inner}} \ No newline at end of file diff --git a/layouts/shortcodes/reltab.html b/layouts/shortcodes/reltab.html new file mode 100644 index 0000000..04caac5 --- /dev/null +++ b/layouts/shortcodes/reltab.html @@ -0,0 +1,8 @@ + + + {{ with .Get "title" }} + {{.}} + {{else}} + {{ .Site.BaseURL }}{{ .Get "url" }} + {{end}} + diff --git a/layouts/shortcodes/span.html b/layouts/shortcodes/span.html new file mode 100644 index 0000000..c484819 --- /dev/null +++ b/layouts/shortcodes/span.html @@ -0,0 +1 @@ +{{ .Get "text" }} \ No newline at end of file diff --git a/layouts/shortcodes/strikethrough.html b/layouts/shortcodes/strikethrough.html new file mode 100644 index 0000000..3589a13 --- /dev/null +++ b/layouts/shortcodes/strikethrough.html @@ -0,0 +1 @@ +{{ with .Get 0 }}{{.}}{{end}} \ No newline at end of file diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html new file mode 100644 index 0000000..2c64ac9 --- /dev/null +++ b/layouts/shortcodes/video.html @@ -0,0 +1,7 @@ +
    +
    + +
    +
    \ No newline at end of file diff --git a/layouts/shortcodes/year.html b/layouts/shortcodes/year.html new file mode 100644 index 0000000..6b40db5 --- /dev/null +++ b/layouts/shortcodes/year.html @@ -0,0 +1 @@ +{{ now.Format "2006" }} diff --git a/layouts/shortcodes/youtube.html b/layouts/shortcodes/youtube.html new file mode 100644 index 0000000..b315d9b --- /dev/null +++ b/layouts/shortcodes/youtube.html @@ -0,0 +1,6 @@ +
    + +
    +
    \ No newline at end of file diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html new file mode 100644 index 0000000..a9772eb --- /dev/null +++ b/layouts/taxonomy/tag.html @@ -0,0 +1,7 @@ +{{ partial "head.html" . }} + +
    + {{ range .Data.Pages }} + {{ .Render "summary"}} + {{ end }} +
    diff --git a/static/css/index.css b/static/css/index.css index 45fa153..d04e097 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -70,7 +70,6 @@ HTML src: url('../font/ATARCC__.TTF') format('truetype'); font-weight: normal; font-style: normal; - color: black; } @font-face { font-family: 'Atari Tiny'; @@ -104,7 +103,7 @@ HTML } body { - font-family: 'Atari Classic Chunky'; + font-family: 'Atari Classic Chunky', serif; justify-content: center; margin: 0.5em; padding: 0.5em; @@ -113,39 +112,39 @@ body { } p { - font-family: 'Atari Classic Extrasmooth'; + font-family: 'Atari Classic Extrasmooth', serif; line-height: 1.3; font-size: 0.595em; color: #f2f2f2; } .p2 { - font-family: 'Atari Classic Smooth'; + font-family: 'Atari Classic Smooth', serif; font-size: 0.485em; color: #f2f2f2; } .p3 { - font-family: 'Atari Classic Extrasmooth'; + font-family: 'Atari Classic Extrasmooth', serif; font-size: 0.365em; color: #f2f2f2; } .p4 { - font-family: 'Atari Classic Smooth'; + font-family: 'Atari Classic Smooth', serif; font-size: 0.595em; color: #322918; } pre { - width: 87%; + width: 78%; border: solid yellow 2px; padding-top: 10px; - padding-bottom: 0px; + padding-bottom: 10px; padding-left:10px; - margin-left: 25px; + margin-left: 10px; background-color: #004d80; - font-family: 'Atari Classic Chunky'; + font-family: 'Atari Classic Chunky', serif; font-weight: lighter; font-size: 0.525em; line-height: 1.2; @@ -157,11 +156,11 @@ pre { width: 87%; border: solid yellow 2px; padding-top: 10px; - padding-bottom: 0px; + padding-bottom: 0; padding-left:10px; margin-left: 25px; background-color: #004d80; - font-family: 'Atari Classic Chunky'; + font-family: 'Atari Classic Chunky', serif; font-weight: lighter; font-size: 0.525em; line-height: 1.2; @@ -169,7 +168,6 @@ pre { color: #f2f2f2; } - .title-wrap { display:flex; justify-content:center; @@ -180,18 +178,16 @@ pre { .title-text { width: 100%; text-align: center; - font-family: 'Atarian System Regular'; + font-family: 'Atarian System Regular', serif; font-size: 7.3vw; line-height: 1.0; - /* #color: #f0e6da; */ color: #fcf4dd; } .title-image { - padding: 0px; - padding-top: 5px; + padding: 0; float: bottom; - height:40px; + height:45px; width:40px; } @@ -199,16 +195,14 @@ pre { width: 80%; margin: auto; text-align: center; - font-family: 'Atarian System Regular'; + font-family: 'Atarian System Regular', serif; font-size: 1.0em; line-height: 1.1; color: #afcde9; - /* #color: #dd504a; - #color: #ffb600; */ } .start { - font-family: 'Atarian System Regular'; + font-family: 'Atarian System Regular', serif; font-size: 1.2em; color: #322918; text-align: center; @@ -220,7 +214,7 @@ pre { } .select { - font-family: 'Atarian System Regular'; + font-family: 'Atarian System Regular', serif; font-size: 1.2em; color: #322918; text-align: center; @@ -232,7 +226,7 @@ pre { } .option { - font-family: 'Atarian System Regular'; + font-family: 'Atarian System Regular', serif; font-size: 1.2em; color: #322918; text-align: center; @@ -243,9 +237,8 @@ pre { margin: 5px; } - .reset { - font-family: 'Atarian System Regular'; + font-family: 'Atarian System Regular', serif; font-size: 1.2em; color: #322918; text-align: center; @@ -257,7 +250,7 @@ pre { } .button-row button { - font-family: 'Atarian System Regular'; + font-family: 'Atarian System Regular', serif; color: #322918; align-content: center; justify-content: center; @@ -266,7 +259,7 @@ pre { } .button-row button:hover { - font-family: 'Atarian System Bold'; + font-family: 'Atarian System Bold', serif; } .button-column button { @@ -281,11 +274,11 @@ pre { } .button-column button:hover { - font-family: 'Atarian System Bold'; + font-family: 'Atarian System Bold', serif; } .shadowbox { - font-family: 'Atari Classic Chunky Reverse'; + font-family: 'Atari Classic Chunky Reverse', serif; width: 11.95em; background-color: #fcf4dd; border: 3px solid #003366; @@ -294,7 +287,7 @@ pre { } .printout { - font-family: 'Dot Matrix Regular'; + font-family: 'Dot Matrix Regular', serif; font-size: small; color: black; width: 65%; @@ -304,7 +297,6 @@ pre { box-shadow: 2px 2px darkgray; } - /* unvisited link */ a:link { color: #5a97d0; @@ -348,11 +340,13 @@ H4 { } UL { + font-size: 1.1vw; margin:1em; padding:0; } LI { + font-size: 1.1vw; padding-bottom: 0.2em; color: #dd504a; }