tweak project menu with sub lists

input/blog.md

@@ -9,12 +9,13 @@ noheader: true
 
 # Blog Archive
 
-To receive my latest updates, you can subscribe to the <a href="rss.xml"><img src="img/rss.png">RSS Feed</a>.
+To receive my latest updates you can subscribe to the <a href="rss.xml"><img src="img/rss.png">RSS Feed</a>.
 
 <!--%
 import datetime
 year = int(datetime.date.today().year)
-printBlogMenu(str(year - 5), None)
+
+printBlogMenu(str(year - get_conf("blog_years_back") + 1), None)
 %-->
 
 [Click here](blog_old.html) for older blog posts.

input/blog_old.md

@@ -7,10 +7,11 @@ noheader: true
 
 [Click here](blog.html) for the more recent blog posts.
 
-To receive my latest updates, you can subscribe to the <a href="rss.xml"><img src="img/rss.png">RSS Feed</a>.
+To receive my latest updates you can subscribe to the <a href="rss.xml"><img src="img/rss.png">RSS Feed</a>.
 
 <!--%
 import datetime
 year = int(datetime.date.today().year)
-printBlogMenu(None, str(year - 5 - 1))
+
+printBlogMenu(None, str(year - get_conf("blog_years_back")))
 %-->

input/index.md

@@ -10,27 +10,7 @@ noheader: true
 
 <img id="index-avatar" src="img/ava.jpg">
 
-I'm a <!--%
-from datetime import datetime
-from datetime import timedelta
-from calendar import isleap
-
-size_of_day = 1. / 366.
-size_of_second = size_of_day / (24. * 60. * 60.)
-
-def date_as_float(dt):
-    days_from_jan1 = dt - datetime(dt.year, 1, 1)
-    if not isleap(dt.year) and days_from_jan1.days >= 31+28:
-        days_from_jan1 += timedelta(1)
-    return dt.year + days_from_jan1.days * size_of_day + days_from_jan1.seconds * size_of_second
-
-start_date = datetime(1994,1,22,0,0)
-end_date = datetime.now()
-difference_in_years = date_as_float(end_date) - date_as_float(start_date)
-
-print(int(difference_in_years))
-
-%--> year old software developer from Germany.
+I'm a <!--% print(own_age()) %--> year old software developer from Germany.
 All of my projects are released as free or open-source software on [my Gitea Server](https://git.xythobuz.de/thomas), [my GitHub profile](https://github.com/xythobuz) and here on my website. Have fun!
 
 To receive my latest updates, you can subscribe to the <a href="rss.xml"><img src="img/rss.png">RSS Feed</a>.

input/projects.md

@@ -4,10 +4,10 @@ position: 10
 ---
 
 This page lists all of my projects that are documented on this website.
-Some projects have a specific date and time where I worked on them, so they are listed by date below.
-Some others are on-going or still recent for other reasons, these are listed first.
+Some bigger topics that are on-going are listed first.
+Other projects have a specific date and time where I worked on them, so they are listed by date below.
 
-To receive my latest updates, you can subscribe to the <a href="rss.xml"><img src="img/rss.png">RSS Feed</a>.
+To receive my latest updates you can subscribe to the <a href="rss.xml"><img src="img/rss.png">RSS Feed</a>.
 
 <!--%
 printProjectsMenu()

input/projects/3d-printing.md

@@ -2,6 +2,7 @@ title: 3D Printing
 description: Reports of my different endeavours in 3D printing
 parent: projects
 position: 10
+child-id: 3d-printing
 ---
 
 In 2016 I've started experimenting with 3D printers.

input/projects/dampfmaschine.md

@@ -4,6 +4,7 @@ description: My Grandfathers self-built model steam engine
 parent: projects
 position: 500
 comments: true
+child-id: steam
 ---
 
 In 1992 my grandfather began building his own live model steam engine, in 1:2.7 scale.

input/projects/drinkrobotics.md

@@ -3,6 +3,7 @@ description: Collection of various cocktail machine related things
 parent: projects
 position: 100
 comments: true
+child-id: drinkrobotics
 ---
 
 ## Ubabot

input/projects/input_devices.md

@@ -2,6 +2,7 @@ title: Input Devices
 description: Mechanical Keyboards and other Human-Machine-Interfaces
 parent: projects
 position: 15
+child-id: input_devices
 ---
 
 One of the recurring topics in my projects are different kind of input devices.

input/projects/quadcopters.md

@@ -2,6 +2,7 @@ title: Flying RC Vehicles
 description: My self-made Quadcopters and other model stuff
 parent: projects
 position: 20
+child-id: quadcopters
 ---
 
 In the last couple of years I built multiple quadcopters and some other related flying remote-controlled model vehicles.

input/projects/smarthome.md

@@ -2,6 +2,7 @@ title: Smart Home
 description: Home automation without shady cloud companies
 parent: projects
 position: 50
+child-id: smarthome
 ---
 
 With the appearance of cheap WiFi-capable microcontrollers in recent years, like the ESP8266 and the ESP32, the Internet of Things and Smart Home automation have been on my mind.

input/projects/xyrobot.md

@@ -9,6 +9,7 @@ github: https://github.com/xythobuz/xyRobot
 compat: rob
 date: 2011-07-28
 update: 2012-08-30
+child-id: xyrobot
 ---
 
 This is my robot project. A self-made PCB with an AtMega2560 controls everything. The robot has a [Bluetooth module][1], a [Gameboy Camera][2] and my [RAM module][3]. I bought the [RN-KeyLCD][4] and the [RN-VN2][5] from [Roboternetz][6].

macros.py

@@ -11,12 +11,9 @@ import time
 import codecs
 from datetime import datetime
 
-DEFAULT_LANG = "en"
-BASE_URL = "https://www.xythobuz.de"
-
-# =============================================================================
+# -----------------------------------------------------------------------------
 # Python 2/3 hacks
-# =============================================================================
+# -----------------------------------------------------------------------------
 
 PY3 = sys.version_info[0] == 3
 
@@ -32,6 +29,50 @@ else:
         return urlparse.parse_qs(urlparse.urlparse(link).query)['v'][0]
 
 # -----------------------------------------------------------------------------
+# config "system"
+# -----------------------------------------------------------------------------
+
+conf = {
+    "default_lang": "en",
+    "base_url": "https://www.xythobuz.de",
+
+    "birthday": datetime(1994, 1, 22, 0, 0),
+    "blog_years_back": 6,
+}
+
+def get_conf(name):
+    return conf[name]
+
+# -----------------------------------------------------------------------------
+# local vars for compatibility
+# -----------------------------------------------------------------------------
+
+DEFAULT_LANG = get_conf("default_lang")
+BASE_URL = get_conf("base_url")
+
+# -----------------------------------------------------------------------------
+# birthday calculation
+# -----------------------------------------------------------------------------
+
+from datetime import timedelta
+from calendar import isleap
+
+size_of_day = 1. / 366.
+size_of_second = size_of_day / (24. * 60. * 60.)
+
+def date_as_float(dt):
+    days_from_jan1 = dt - datetime(dt.year, 1, 1)
+    if not isleap(dt.year) and days_from_jan1.days >= 31+28:
+        days_from_jan1 += timedelta(1)
+    return dt.year + days_from_jan1.days * size_of_day + days_from_jan1.seconds * size_of_second
+
+def difference_in_years(start_date, end_date):
+    return int(date_as_float(end_date) - date_as_float(start_date))
+
+def own_age():
+    return difference_in_years(get_conf("birthday"), datetime.now())
+
+# -----------------------------------------------------------------------------
 # sub page helper macro
 # -----------------------------------------------------------------------------
 
@@ -119,7 +160,7 @@ def githubCommitBadge(p, showInline = False):
             ret += ".svg?logo=git&style=flat\" /></a>"
     return ret
 
-def printMenuItem(p, yearsAsHeading = False, showDateSpan = False, showOnlyStartDate = False, nicelyFormatFullDate = False, lastyear = "0", lang = "", showLastCommit = True):
+def printMenuItem(p, yearsAsHeading = False, showDateSpan = False, showOnlyStartDate = False, nicelyFormatFullDate = False, lastyear = "0", lang = "", showLastCommit = True, hide_description = False, indent_count = 0, updates_as_heading = False):
     title = p.title
     if lang != "":
         if p.get("title_" + lang, "") != "":
@@ -127,7 +168,10 @@ def printMenuItem(p, yearsAsHeading = False, showDateSpan = False, showOnlyStart
     if title == "Blog":
         title = p.post
 
-    year = p.get("date", "")[0:4]
+    if updates_as_heading:
+        year = p.get("update", p.get("date", ""))[0:4]
+    else:
+        year = p.get("date", "")[0:4]
     if year != lastyear:
         lastyear = year
         if yearsAsHeading:
@@ -146,14 +190,16 @@ def printMenuItem(p, yearsAsHeading = False, showDateSpan = False, showOnlyStart
         if nicelyFormatFullDate:
             dateto = " - " + datetime.strptime(p.get("update", p.date), "%Y-%m-%d").strftime("%B %d, %Y")
 
-    print("  * **[%s](%s)**%s" % (title, p.url, dateto))
+    indent = "  " * (indent_count + 1)
+    print(indent + "* **[%s](%s)**%s" % (title, p.url, dateto))
 
-    if p.get("description", "") != "":
-        description = p.get("description", "")
-        if lang != "":
-            if p.get("description_" + lang, "") != "":
-                description = p.get("description_" + lang, "")
-        print("<br><span class=\"listdesc\">" + description + "</span>")
+    if hide_description == False:
+        if p.get("description", "") != "":
+            description = p.get("description", "")
+            if lang != "":
+                if p.get("description_" + lang, "") != "":
+                    description = p.get("description_" + lang, "")
+            print("<br><span class=\"listdesc\">" + description + "</span>")
 
     if showLastCommit:
         link = githubCommitBadge(p)
@@ -165,10 +211,13 @@ def printMenuItem(p, yearsAsHeading = False, showDateSpan = False, showOnlyStart
 def printRecentMenu(count = 5):
     posts = [p for p in pages if "date" in p and p.lang == "en"]
     posts.sort(key=lambda p: p.get("update", p.get("date")), reverse=True)
+
     if count > 0:
         posts = posts[0:count]
+
+    lastyear = "0"
     for p in posts:
-        printMenuItem(p, False, False, False, True, "0", "", False)
+        lastyear = printMenuItem(p, count == 0, False, False, True, lastyear, "", False, False, 0, True)
 
 def printBlogMenu(year_min=None, year_max=None):
     posts = [p for p in pages if "post" in p and p.lang == "en"]
@@ -186,23 +235,44 @@ def printBlogMenu(year_min=None, year_max=None):
 def printProjectsMenu():
     # prints all pages with parent 'projects' or 'stuff'.
     # first the ones without date, sorted by position.
+    # this first section includes sub-headings for children
     # then afterwards those with date, split by year.
     # also supports blog posts with parent.
     enpages = [p for p in pages if p.lang == "en"]
 
+    # select pages without date
     dpages = [p for p in enpages if p.get("date", "") == ""]
+    # only those that have a parent in ['projects', 'stuff']
     mpages = [p for p in dpages if any(x in p.get("parent", "") for x in [ 'projects', 'stuff' ])]
+    # sort by position
     mpages.sort(key=lambda p: [int(p.get("position", "999"))])
+    # print all pages
     for p in mpages:
         printMenuItem(p)
 
+        # print subpages for these top-level items
+        subpages = [sub for sub in enpages if sub.get("parent", "none") == p.get("child-id", "unknown")]
+        for sp in subpages:
+            printMenuItem(sp, False, True, True, False, "0", "", False, True, 1)
+
+    # slect pages with a date
     dpages = [p for p in enpages if p.get("date", "") != ""]
+    # only those that have a parent in ['projects', 'stuff']
     mpages = [p for p in dpages if any(x in p.get("parent", "") for x in [ 'projects', 'stuff' ])]
+    # sort by date
     mpages.sort(key=lambda p: [p.get("date", "9999-01-01")], reverse = True)
+
+    # print all pages
     lastyear = "0"
     for p in mpages:
         lastyear = printMenuItem(p, True, True, False, False, lastyear)
 
+        # print subpages for these top-level items
+        subpages = [sub for sub in enpages if sub.get("parent", "none") == p.get("child-id", "unknown")]
+        subpages.sort(key=lambda p: [p.get("date", "9999-01-01")], reverse = True)
+        for sp in subpages:
+            printMenuItem(sp, False, True, True, False, "0", "", False, True, 1)
+
 def print3DPrintingMenu():
     mpages = [p for p in pages if p.get("parent", "") == "3d-printing" and p.lang == "en"]
     mpages.sort(key=lambda p: int(p["position"]))
@@ -487,9 +557,9 @@ def hook_preconvert_anotherlang():
             langs.append(lang)
 
             if lang == "en":
-                filename = re.sub(MKD_PATT, "%s\g<0>" % "", p.fname).split(os.path.sep)[-1]
+                filename = re.sub(MKD_PATT, r"%s\g<0>" % "", p.fname).split(os.path.sep)[-1]
             else:
-                filename = re.sub(MKD_PATT, ".%s\g<0>" % lang, p.fname).split(os.path.sep)[-1]
+                filename = re.sub(MKD_PATT, r".%s\g<0>" % lang, p.fname).split(os.path.sep)[-1]
 
             vp = Page(filename, virtual=text)
             # Copy real page attributes to the virtual page
@@ -746,6 +816,6 @@ def hook_postconvert_size():
         except:
             print("Unable to estimate file size for %s" % matchobj.group(1))
             return '<a href=\"%s\">%s</a>' % (matchobj.group(1), matchobj.group(3))
-    _re_url = '<a href=\"([^\"]*?\.(%s))\">(.*?)<\/a>' % file_ext
+    _re_url = r'<a href=\"([^\"]*?\.(%s))\">(.*?)<\/a>' % file_ext
     for p in pages:
         p.html = re.sub(_re_url, matched_link, p.html)

static/css/style.css

@@ -183,6 +183,11 @@ a.anchor {
     margin-right: 0.5em;
 }
 
+ul ul {
+    font-size: 0.75em;
+    margin-bottom: 1em;
+}
+
 a:link, a:visited {
     text-decoration: none;
 }