summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJedidiah Barber <contact@jedbarber.id.au>2021-11-26 20:17:43 +1300
committerJedidiah Barber <contact@jedbarber.id.au>2021-11-26 20:17:43 +1300
commit14025d22ce3d66c9d235e57221ec4653e00f972c (patch)
treedac7c0f2cd22007aa1c396b460a1f2d90445a4d3
parent03ea6ba48bfbb25dc74a0a369b5aa15bf10e91b9 (diff)
Switched to .xhtml extension, fixed some minor bugs
-rw-r--r--project/assets/css/default.css6
-rw-r--r--project/complexity.yml59
-rw-r--r--project/context/articles.json24
-rw-r--r--project/templates/about.xhtml (renamed from project/templates/about.html)2
-rw-r--r--project/templates/adapad.xhtml (renamed from project/templates/adapad.html)2
-rw-r--r--project/templates/base.xhtml (renamed from project/templates/base.html)6
-rw-r--r--project/templates/base_math.xhtml (renamed from project/templates/base_math.html)6
-rw-r--r--project/templates/deckconv.xhtml (renamed from project/templates/deckconv.html)2
-rw-r--r--project/templates/fltkada.xhtml (renamed from project/templates/fltkada.html)4
-rw-r--r--project/templates/grasp.xhtml (renamed from project/templates/grasp.html)2
-rw-r--r--project/templates/index.xhtml (renamed from project/templates/index.html)2
-rw-r--r--project/templates/integral.xhtml (renamed from project/templates/integral.html)2
-rw-r--r--project/templates/links.xhtml (renamed from project/templates/links.html)2
-rw-r--r--project/templates/packrat.xhtml (renamed from project/templates/packrat.html)2
-rw-r--r--project/templates/sokoban.xhtml (renamed from project/templates/sokoban.html)2
-rw-r--r--project/templates/steelman.xhtml (renamed from project/templates/steelman.html)2
-rw-r--r--project/templates/stvcount.xhtml (renamed from project/templates/stvcount.html)2
-rw-r--r--project/templates/sunset.xhtml (renamed from project/templates/sunset.html)2
-rw-r--r--project/templates/sydneyrail.xhtml (renamed from project/templates/sydneyrail.html)2
-rw-r--r--project/templates/tags.xhtml (renamed from project/templates/tags.html)4
-rw-r--r--project/templates/tags/application.xhtml (renamed from project/templates/tags/application.html)2
-rw-r--r--project/templates/tags/binding.xhtml (renamed from project/templates/tags/binding.html)2
-rw-r--r--project/templates/tags/compsci.xhtml (renamed from project/templates/tags/compsci.html)2
-rw-r--r--project/templates/tags/copyright.xhtml (renamed from project/templates/tags/copyright.html)2
-rw-r--r--project/templates/tags/esoteric.xhtml (renamed from project/templates/tags/esoteric.html)2
-rw-r--r--project/templates/tags/language.xhtml (renamed from project/templates/tags/language.html)2
-rw-r--r--project/templates/tags/legal.xhtml (renamed from project/templates/tags/legal.html)2
-rw-r--r--project/templates/tags/library.xhtml (renamed from project/templates/tags/library.html)2
-rw-r--r--project/templates/tags/maps.xhtml (renamed from project/templates/tags/maps.html)2
-rw-r--r--project/templates/tags/mathematics.xhtml (renamed from project/templates/tags/mathematics.html)2
-rw-r--r--project/templates/tags/politics.xhtml (renamed from project/templates/tags/politics.html)2
-rw-r--r--project/templates/tags/programming.xhtml (renamed from project/templates/tags/programming.html)2
-rw-r--r--project/templates/tags/transport.xhtml (renamed from project/templates/tags/transport.html)2
-rw-r--r--project/templates/tags/videogames.xhtml (renamed from project/templates/tags/videogames.html)2
-rw-r--r--project/templates/thue2a.xhtml (renamed from project/templates/thue2a.html)2
35 files changed, 85 insertions, 80 deletions
diff --git a/project/assets/css/default.css b/project/assets/css/default.css
index 8e09c9b..5655a27 100644
--- a/project/assets/css/default.css
+++ b/project/assets/css/default.css
@@ -76,7 +76,11 @@ pre {
text-align: left;
background-color: #cef6ce;
border-radius: 1.5em;
- padding: 2em 2em 2em 2em;
+ /* similar to above padding-top issue */
+ padding-right: 2em;
+ padding-bottom: 2em;
+ padding-left: 2em;
+ /*padding: 2em 2em 2em 2em;*/
margin: 1em 2em 1em 2em;
width: 60em;
}
diff --git a/project/complexity.yml b/project/complexity.yml
index 2a93b73..6a2374e 100644
--- a/project/complexity.yml
+++ b/project/complexity.yml
@@ -10,33 +10,34 @@ output_dir: "../www"
# I don't know why the hell anyone thought hiding the .html was a good idea.
# Was this the same person who thought hiding file extensions on Windows was a good plan?
unexpanded_templates:
- - "about.html"
- - "adapad.html"
- - "deckconv.html"
- - "fltkada.html"
- - "grasp.html"
- - "integral.html"
- - "links.html"
- - "packrat.html"
- - "sokoban.html"
- - "steelman.html"
- - "stvcount.html"
- - "sunset.html"
- - "sydneyrail.html"
- - "thue2a.html"
- - "tags.html"
- - "tags/application.html"
- - "tags/binding.html"
- - "tags/compsci.html"
- - "tags/copyright.html"
- - "tags/esoteric.html"
- - "tags/language.html"
- - "tags/legal.html"
- - "tags/library.html"
- - "tags/maps.html"
- - "tags/mathematics.html"
- - "tags/politics.html"
- - "tags/programming.html"
- - "tags/transport.html"
- - "tags/videogames.html"
+ - "about.xhtml"
+ - "adapad.xhtml"
+ - "deckconv.xhtml"
+ - "fltkada.xhtml"
+ - "grasp.xhtml"
+ - "index.xhtml"
+ - "integral.xhtml"
+ - "links.xhtml"
+ - "packrat.xhtml"
+ - "sokoban.xhtml"
+ - "steelman.xhtml"
+ - "stvcount.xhtml"
+ - "sunset.xhtml"
+ - "sydneyrail.xhtml"
+ - "thue2a.xhtml"
+ - "tags.xhtml"
+ - "tags/application.xhtml"
+ - "tags/binding.xhtml"
+ - "tags/compsci.xhtml"
+ - "tags/copyright.xhtml"
+ - "tags/esoteric.xhtml"
+ - "tags/language.xhtml"
+ - "tags/legal.xhtml"
+ - "tags/library.xhtml"
+ - "tags/maps.xhtml"
+ - "tags/mathematics.xhtml"
+ - "tags/politics.xhtml"
+ - "tags/programming.xhtml"
+ - "tags/transport.xhtml"
+ - "tags/videogames.xhtml"
diff --git a/project/context/articles.json b/project/context/articles.json
index c7dccaf..9703b98 100644
--- a/project/context/articles.json
+++ b/project/context/articles.json
@@ -2,75 +2,75 @@
[
{
"title": "Flashcard Deck Converter",
- "anchor": "/deckconv.html",
+ "anchor": "/deckconv.xhtml",
"taglist": ["application", "programming"],
"postdate": "11/11/2021"
},
{
"title": "Sydney Rail Maps",
- "anchor": "/sydneyrail.html",
+ "anchor": "/sydneyrail.xhtml",
"taglist": ["maps", "transport"],
"postdate": "21/9/2021"
},
{
"title": "Packrat Parser Combinator Library",
- "anchor": "/packrat.html",
+ "anchor": "/packrat.xhtml",
"taglist": ["compsci", "library", "programming"],
"postdate": "2/2/2021"
},
{
"title": "Area Under the Curve of a Complex Integral",
- "anchor": "/integral.html",
+ "anchor": "/integral.xhtml",
"taglist": ["mathematics"],
"postdate": "29/12/2018"
},
{
"title": "D, Parasail, Pascal, and Rust vs The Steelman",
- "anchor": "/steelman.html",
+ "anchor": "/steelman.xhtml",
"taglist": ["compsci", "language"],
"postdate": "29/10/2017"
},
{
"title": "Sokoban Clone",
- "anchor": "/sokoban.html",
+ "anchor": "/sokoban.xhtml",
"taglist": ["programming", "videogames"],
"postdate": "8/8/2017"
},
{
"title": "Sunset License",
- "anchor": "/sunset.html",
+ "anchor": "/sunset.xhtml",
"taglist": ["copyright", "legal"],
"postdate": "29/6/2017"
},
{
"title": "FLTK Ada Binding",
- "anchor": "/fltkada.html",
+ "anchor": "/fltkada.xhtml",
"taglist": ["binding", "library", "programming"],
"postdate": "9/11/2021",
"updated": "yes"
},
{
"title": "Single Transferable Vote Counter",
- "anchor": "/stvcount.html",
+ "anchor": "/stvcount.xhtml",
"taglist": ["application", "politics", "programming"],
"postdate": "19/2/2017"
},
{
"title": "Adapad",
- "anchor": "/adapad.html",
+ "anchor": "/adapad.xhtml",
"taglist": ["application", "programming"],
"postdate": "8/5/2017",
"updated": "yes"
},
{
"title": "Grasp Interpreter",
- "anchor": "/grasp.html",
+ "anchor": "/grasp.xhtml",
"taglist": ["esoteric", "programming"],
"postdate": "1/1/2017"
},
{
"title": "Thue Version 2a",
- "anchor": "/thue2a.html",
+ "anchor": "/thue2a.xhtml",
"taglist": ["esoteric", "programming"],
"postdate": "1/1/2017"
}
diff --git a/project/templates/about.html b/project/templates/about.xhtml
index 723c530..8eef5e4 100644
--- a/project/templates/about.html
+++ b/project/templates/about.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/adapad.html b/project/templates/adapad.xhtml
index 9982aca..542feaf 100644
--- a/project/templates/adapad.html
+++ b/project/templates/adapad.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/base.html b/project/templates/base.xhtml
index 7282f57..a05e26b 100644
--- a/project/templates/base.html
+++ b/project/templates/base.xhtml
@@ -18,10 +18,10 @@
<div class="nav">
<ul>
<li><a href="/">Index</a></li>
- <li><a href="/about.html">About</a></li>
- <li><a href="/tags.html">Tags</a></li>
+ <li><a href="/about.xhtml">About</a></li>
+ <li><a href="/tags.xhtml">Tags</a></li>
<li><a href="/cgi-bin/cgit.cgi">Git</a></li>
- <li><a href="/links.html">Links</a></li>
+ <li><a href="/links.xhtml">Links</a></li>
</ul>
</div>
<hr />
diff --git a/project/templates/base_math.html b/project/templates/base_math.xhtml
index 025968c..3b5be69 100644
--- a/project/templates/base_math.html
+++ b/project/templates/base_math.xhtml
@@ -18,10 +18,10 @@
<div class="nav">
<ul>
<li><a href="/">Index</a></li>
- <li><a href="/about.html">About</a></li>
- <li><a href="/tags.html">Tags</a></li>
+ <li><a href="/about.xhtml">About</a></li>
+ <li><a href="/tags.xhtml">Tags</a></li>
<li><a href="/cgi-bin/cgit.cgi">Git</a></li>
- <li><a href="/links.html">Links</a></li>
+ <li><a href="/links.xhtml">Links</a></li>
</ul>
</div>
<hr />
diff --git a/project/templates/deckconv.html b/project/templates/deckconv.xhtml
index 4103518..ee8abd5 100644
--- a/project/templates/deckconv.html
+++ b/project/templates/deckconv.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/fltkada.html b/project/templates/fltkada.xhtml
index 8bb477f..f68ea27 100644
--- a/project/templates/fltkada.html
+++ b/project/templates/fltkada.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
@@ -21,7 +21,7 @@ Estimated status: 80% complete</p>
<p>First, unbeknownst to me the Fl_Widget constructor doesn't copy the given label string inside
FLTK and merely stores a pointer. This meant that declaring several Widgets in a row each with their
own different label could have unexpected and erratic results. Easily fixed by ensuring the binding
-constructor also calls copy_label() afterwards.<p>
+constructor also calls copy_label() afterwards.</p>
<p>And second, somehow I had made an oversight with the type assigned to Color, using a signed
Integer when it really needed an unsigned modular type with 32 bits of range. Again, easily fixed
diff --git a/project/templates/grasp.html b/project/templates/grasp.xhtml
index a213c02..5afc4b7 100644
--- a/project/templates/grasp.html
+++ b/project/templates/grasp.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/index.html b/project/templates/index.xhtml
index c0a1ed7..1026136 100644
--- a/project/templates/index.html
+++ b/project/templates/index.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/integral.html b/project/templates/integral.xhtml
index 364fe84..8f2f33a 100644
--- a/project/templates/integral.html
+++ b/project/templates/integral.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base_math.html" -%}
+{%- extends "base_math.xhtml" -%}
diff --git a/project/templates/links.html b/project/templates/links.xhtml
index 3b4d4bf..991810b 100644
--- a/project/templates/links.html
+++ b/project/templates/links.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/packrat.html b/project/templates/packrat.xhtml
index 4ae1c3e..ee33b41 100644
--- a/project/templates/packrat.html
+++ b/project/templates/packrat.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/sokoban.html b/project/templates/sokoban.xhtml
index c3f9238..0ce990a 100644
--- a/project/templates/sokoban.html
+++ b/project/templates/sokoban.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/steelman.html b/project/templates/steelman.xhtml
index 3ae2d95..11136cf 100644
--- a/project/templates/steelman.html
+++ b/project/templates/steelman.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/stvcount.html b/project/templates/stvcount.xhtml
index 8d4c3ae..2cb3dda 100644
--- a/project/templates/stvcount.html
+++ b/project/templates/stvcount.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/sunset.html b/project/templates/sunset.xhtml
index bfad239..ab4389d 100644
--- a/project/templates/sunset.html
+++ b/project/templates/sunset.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/sydneyrail.html b/project/templates/sydneyrail.xhtml
index a2959cf..c5873e2 100644
--- a/project/templates/sydneyrail.html
+++ b/project/templates/sydneyrail.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags.html b/project/templates/tags.xhtml
index be63920..42f3b5a 100644
--- a/project/templates/tags.html
+++ b/project/templates/tags.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
@@ -24,7 +24,7 @@
{%- if total.update({'value': total.value + 1}) -%}{%- endif -%}
{%- endif -%}
{%- if item == articles | last %}
- <li><a href="/tags/{{ tag }}.html">{{ tag }} ({{ total.value }})</a></li>
+ <li><a href="/tags/{{ tag }}.xhtml">{{ tag }} ({{ total.value }})</a></li>
{%- endif -%}
{%- endfor -%}
{%- endfor %}
diff --git a/project/templates/tags/application.html b/project/templates/tags/application.xhtml
index f1b4b60..e8555c7 100644
--- a/project/templates/tags/application.html
+++ b/project/templates/tags/application.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/binding.html b/project/templates/tags/binding.xhtml
index 222ded4..34d5b91 100644
--- a/project/templates/tags/binding.html
+++ b/project/templates/tags/binding.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/compsci.html b/project/templates/tags/compsci.xhtml
index 7b9f5b1..7a269ef 100644
--- a/project/templates/tags/compsci.html
+++ b/project/templates/tags/compsci.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/copyright.html b/project/templates/tags/copyright.xhtml
index 686b025..9c23058 100644
--- a/project/templates/tags/copyright.html
+++ b/project/templates/tags/copyright.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/esoteric.html b/project/templates/tags/esoteric.xhtml
index 223c57c..14f75b4 100644
--- a/project/templates/tags/esoteric.html
+++ b/project/templates/tags/esoteric.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/language.html b/project/templates/tags/language.xhtml
index a7730b8..f3193ca 100644
--- a/project/templates/tags/language.html
+++ b/project/templates/tags/language.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/legal.html b/project/templates/tags/legal.xhtml
index ff8b9d9..71e30dd 100644
--- a/project/templates/tags/legal.html
+++ b/project/templates/tags/legal.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/library.html b/project/templates/tags/library.xhtml
index dd2dc62..b73f7b5 100644
--- a/project/templates/tags/library.html
+++ b/project/templates/tags/library.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/maps.html b/project/templates/tags/maps.xhtml
index 745c49e..ccccc34 100644
--- a/project/templates/tags/maps.html
+++ b/project/templates/tags/maps.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/mathematics.html b/project/templates/tags/mathematics.xhtml
index b39967d..6d16264 100644
--- a/project/templates/tags/mathematics.html
+++ b/project/templates/tags/mathematics.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/politics.html b/project/templates/tags/politics.xhtml
index 414ea98..8b2b1f9 100644
--- a/project/templates/tags/politics.html
+++ b/project/templates/tags/politics.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/programming.html b/project/templates/tags/programming.xhtml
index 4c7d83c..8307d65 100644
--- a/project/templates/tags/programming.html
+++ b/project/templates/tags/programming.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/transport.html b/project/templates/tags/transport.xhtml
index 863da30..b457d92 100644
--- a/project/templates/tags/transport.html
+++ b/project/templates/tags/transport.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/tags/videogames.html b/project/templates/tags/videogames.xhtml
index 904aa29..188f016 100644
--- a/project/templates/tags/videogames.html
+++ b/project/templates/tags/videogames.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}
diff --git a/project/templates/thue2a.html b/project/templates/thue2a.xhtml
index 76a1279..e729280 100644
--- a/project/templates/thue2a.html
+++ b/project/templates/thue2a.xhtml
@@ -1,5 +1,5 @@
-{%- extends "base.html" -%}
+{%- extends "base.xhtml" -%}