Minor fixes for TOC

assets/diary/diary-calendar.html

@@ -0,0 +1,29 @@
+<div class="diary-cal">
+  <div class="panel-header"><a href="{{.DiaryURL}}">Chronological</a></div>
+  <div class="diary-cal-nav">
+    <a href="{{.MonthURL}}" class="diary-cal-heading">{{.MonthName}}</a>
+    <div class="dropdown diary-cal-drop">
+      <button type="button" class="btn btn-small" data-action="cal-month-drop" aria-expanded="false" title="Monat wählen">▾</button>
+      <div class="dropdown-menu">
+        {{range .AllMonths}}<a class="dropdown-item{{if .IsCurrent}} cal-current{{end}}" href="{{.URL}}">{{.Name}}</a>{{end}}
+      </div>
+    </div>
+    <a href="{{.YearURL}}" class="diary-cal-heading">{{.DisplayYear}}</a>
+    <div class="dropdown diary-cal-drop">
+      <button type="button" class="btn btn-small" data-action="cal-year-drop" aria-expanded="false" title="Jahr wählen">▾</button>
+      <div class="dropdown-menu align-right">
+        {{range .Years}}<a class="dropdown-item{{if .IsCurrent}} cal-current{{end}}" href="{{.URL}}">{{.Num}}</a>{{end}}
+      </div>
+    </div>
+  </div>
+  <table class="diary-cal-grid">
+    <thead>
+      <tr><th>Mo</th><th>Di</th><th>Mi</th><th>Do</th><th>Fr</th><th>Sa</th><th>So</th></tr>
+    </thead>
+    <tbody>
+    {{range .Weeks}}<tr>{{range .}}<td class="{{if .IsCurrent}}cal-current{{else if .IsToday}}cal-today{{end}}{{if and .Num (not .HasEntry)}} cal-empty{{end}}">{{if .Num}}<a href="{{.URL}}">{{.Num}}</a>{{end}}</td>{{end}}</tr>
+    {{end}}
+    </tbody>
+  </table>
+</div>
+<script src="/_/diary/diary-calendar.js"></script>

assets/diary/diary-calendar.js

@@ -0,0 +1,32 @@
+(function () {
+  var cal = document.querySelector(".diary-cal");
+  if (!cal) return;
+
+  var toggle = document.createElement("button");
+  toggle.type = "button";
+  toggle.className = "panel-toggle";
+  toggle.textContent = "Kalender";
+  toggle.setAttribute("aria-expanded", "false");
+  toggle.addEventListener("click", function () {
+    var open = cal.classList.toggle("is-open");
+    toggle.setAttribute("aria-expanded", open ? "true" : "false");
+  });
+
+  var main = document.querySelector("main");
+  if (main) {
+    main.parentNode.insertBefore(toggle, main);
+    main.parentNode.insertBefore(cal, main);
+  }
+
+  cal.querySelectorAll(".diary-cal-drop > button").forEach(wireDropdown);
+
+  var pageHeader = document.querySelector("header");
+  function updateTop() {
+    if (!pageHeader || getComputedStyle(cal).position !== "fixed") return;
+    var rect = pageHeader.getBoundingClientRect();
+    cal.style.top = Math.max(8, rect.bottom + 8) + "px";
+  }
+  window.addEventListener("scroll", updateTop, { passive: true });
+  window.addEventListener("resize", updateTop);
+  updateTop();
+})();

assets/global-shortcuts.js

@@ -17,3 +17,33 @@
         }
     });
 })();
+
+// Wire a dropdown: clicking the trigger toggles its sibling .dropdown-menu;
+// clicking outside or pressing Escape closes all wired menus. Safe to call
+// multiple times on the same trigger (no-op on re-registration).
+function wireDropdown(trigger) {
+    if (!trigger || trigger.dataset.wired) return;
+    var menu = trigger.parentElement && trigger.parentElement.querySelector('.dropdown-menu');
+    if (!menu) return;
+    trigger.dataset.wired = '1';
+    trigger.addEventListener('click', function (e) {
+        e.stopPropagation();
+        document.querySelectorAll('.dropdown-menu.is-open').forEach(function (m) {
+            if (m !== menu) m.classList.remove('is-open');
+        });
+        menu.classList.toggle('is-open');
+    });
+    menu.addEventListener('click', function () { menu.classList.remove('is-open'); });
+}
+
+document.addEventListener('click', function (e) {
+    document.querySelectorAll('.dropdown-menu.is-open').forEach(function (menu) {
+        if (!menu.parentElement.contains(e.target)) menu.classList.remove('is-open');
+    });
+});
+document.addEventListener('keydown', function (e) {
+    if (e.key !== 'Escape') return;
+    document.querySelectorAll('.dropdown-menu.is-open').forEach(function (menu) {
+        menu.classList.remove('is-open');
+    });
+});

assets/page-actions.js

@@ -68,24 +68,5 @@ function deletePage() {
 }
 
 document.addEventListener('DOMContentLoaded', function () {
-    var trigger = document.querySelector('[data-action="actions-drop"]');
+    wireDropdown(document.querySelector('[data-action="actions-drop"]'));
-    if (!trigger) return;
-    var menu = trigger.parentElement.querySelector('.dropdown-menu');
-    if (!menu) return;
-
-    trigger.addEventListener('click', function (e) {
-        e.stopPropagation();
-        menu.classList.toggle('is-open');
-    });
-    menu.addEventListener('click', function () {
-        menu.classList.remove('is-open');
-    });
-    document.addEventListener('click', function (e) {
-        if (!trigger.contains(e.target) && !menu.contains(e.target)) {
-            menu.classList.remove('is-open');
-        }
-    });
-    document.addEventListener('keydown', function (e) {
-        if (e.key === 'Escape') menu.classList.remove('is-open');
-    });
 });

assets/page.html

@@ -99,5 +99,6 @@
             {{end}}
             {{end}}
         </main>
+        {{if .SidebarWidget}}{{.SidebarWidget}}{{end}}
     </body>
 </html>

assets/style.css

@@ -417,7 +417,7 @@ hr {
     font-size: 0.85rem;
 }
 
-.toc-header {
+.panel-header {
     font-size: 0.75rem;
     text-transform: uppercase;
     letter-spacing: 0.05em;
@@ -455,7 +455,7 @@ hr {
     padding-left: 1.6rem;
 }
 
-.toc-toggle {
+.panel-toggle {
     display: none;
 }
 
@@ -516,9 +516,92 @@ hr {
     outline: none;
 }
 
+/* === Diary Calendar === */
+.diary-cal {
+    position: fixed;
+    top: 1rem;
+    left: 1rem;
+    width: 13rem;
+    border: 1px solid var(--secondary);
+    background: var(--bg);
+    padding: 0.5rem 0.75rem;
+    font-size: 0.85rem;
+}
+
+.diary-cal-nav {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.2rem;
+    margin-bottom: 0.4rem;
+    font-size: 0.85rem;
+}
+
+.diary-cal-nav .diary-cal-drop + .diary-cal-heading {
+    margin-left: 0.75rem;
+}
+
+.diary-cal-heading {
+    color: var(--link);
+}
+
+.diary-cal-heading:hover {
+    color: var(--link-hover);
+}
+
+.diary-cal-grid {
+    width: 100%;
+    border-collapse: collapse;
+    font-size: 0.8rem;
+    margin-bottom: 0.4rem;
+}
+
+.diary-cal-grid th,
+.diary-cal-grid td {
+    text-align: center;
+    padding: 0.1rem 0.15rem;
+    font-weight: normal;
+    color: var(--text-muted);
+}
+
+.diary-cal-grid td a {
+    color: var(--link);
+    display: block;
+}
+
+.diary-cal-grid td a:hover {
+    color: var(--link-hover);
+}
+
+.diary-cal-grid td.cal-empty a {
+    color: var(--text-muted);
+}
+
+.diary-cal-grid td.cal-empty a:hover {
+    color: var(--link-hover);
+}
+
+.diary-cal-grid td.cal-today {
+    background: var(--bg-panel);
+}
+
+.diary-cal-grid td.cal-current,
+.diary-cal-grid td.cal-current a {
+    color: var(--primary-hover);
+}
+
+.diary-cal-drop .dropdown-menu {
+    max-height: 14rem;
+    overflow-y: auto;
+}
+
+.diary-cal-drop .dropdown-item.cal-current {
+    color: var(--primary-hover);
+}
+
 /* === Responsive === */
 @media (max-width: 1100px) {
-    .toc-toggle {
+    .panel-toggle {
         display: block;
         background: none;
         border: 1px solid var(--secondary);
@@ -533,14 +616,15 @@ hr {
         width: calc(100% - 2rem);
         max-width: 860px;
     }
-    .toc-toggle::before {
+    .panel-toggle::before {
         content: "▸ ";
         color: var(--secondary);
     }
-    .toc-toggle[aria-expanded="true"]::before {
+    .panel-toggle[aria-expanded="true"]::before {
         content: "▾ ";
     }
-    .toc {
+    .toc,
+    .diary-cal {
         position: static;
         display: none;
         width: calc(100% - 2rem);
@@ -548,7 +632,8 @@ hr {
         margin: 0 auto 1rem;
         max-height: none;
     }
-    .toc.is-open {
+    .toc.is-open,
+    .diary-cal.is-open {
         display: block;
     }
 }
@@ -563,8 +648,9 @@ hr {
     textarea {
         min-height: 50vh;
     }
-    .toc-toggle,
+    .panel-toggle,
-    .toc.is-open {
+    .toc.is-open,
+    .diary-cal.is-open {
         width: calc(100% - 1.5rem);
     }
     .modal-backdrop {

assets/toc.js

@@ -9,7 +9,7 @@
   nav.className = "toc";
 
   var header = document.createElement("div");
-  header.className = "toc-header";
+  header.className = "panel-header";
   header.textContent = "Contents";
   nav.appendChild(header);
 
@@ -20,7 +20,9 @@
     li.className = "toc-" + h.tagName.toLowerCase();
     var a = document.createElement("a");
     a.href = "#" + h.id;
-    a.textContent = h.textContent;
+    var clone = h.cloneNode(true);
+    clone.querySelectorAll(".btn, .muted").forEach(function (el) { el.remove(); });
+    a.textContent = clone.textContent.trim();
     li.appendChild(a);
     list.appendChild(li);
   });
@@ -28,7 +30,7 @@
 
   var toggle = document.createElement("button");
   toggle.type = "button";
-  toggle.className = "toc-toggle";
+  toggle.className = "panel-toggle";
   toggle.textContent = "Contents";
   toggle.setAttribute("aria-expanded", "false");
   toggle.addEventListener("click", function () {

diary.go

@@ -22,10 +22,14 @@ func init() {
 type diaryHandler struct{}
 
 func (d *diaryHandler) handle(root, fsPath, urlPath string) *specialPage {
-	depth, ok := findDiaryContext(root, fsPath)
+	depth, diaryRootFS, diaryRootURL, ok := findDiaryContext(root, fsPath, urlPath)
-	if !ok || depth == 0 {
+	if !ok {
 		return nil
 	}
+	widget := computeCalendarWidget(diaryRootFS, diaryRootURL, fsPath, depth)
+	if depth == 0 {
+		return &specialPage{Widget: widget}
+	}
 	var content template.HTML
 	switch depth {
 	case 1:
@@ -35,30 +39,246 @@ func (d *diaryHandler) handle(root, fsPath, urlPath string) *specialPage {
 	case 3:
 		content = renderDiaryDay(fsPath, urlPath)
 	}
-	return &specialPage{Content: content, SuppressListing: true}
+	return &specialPage{Content: content, SuppressListing: true, Widget: widget}
 }
 
 // findDiaryContext walks up from fsPath toward root looking for a
 // .page-settings file with type=diary. Returns the depth of fsPath
-// relative to the diary root, and whether one was found.
+// relative to the diary root, the diary root fs path, its URL, and
-// depth=0 means fsPath itself is the diary root.
+// whether a diary root was found. depth=0 means fsPath itself is the root.
-func findDiaryContext(root, fsPath string) (int, bool) {
+func findDiaryContext(root, fsPath, urlPath string) (depth int, diaryRootFS, diaryRootURL string, ok bool) {
-	current := fsPath
+	currentFS := fsPath
-	for depth := 0; ; depth++ {
+	currentURL := urlPath
-		s := readPageSettings(current)
+	for d := 0; ; d++ {
+		s := readPageSettings(currentFS)
 		if s != nil && s.Type == "diary" {
-			return depth, true
+			return d, currentFS, currentURL, true
 		}
-		if current == root {
+		if currentFS == root {
 			break
 		}
-		parent := filepath.Dir(current)
+		parent := filepath.Dir(currentFS)
-		if parent == current {
+		if parent == currentFS {
 			break
 		}
-		current = parent
+		currentFS = parent
+		currentURL = parentURL(currentURL)
 	}
-	return 0, false
+	return 0, "", "", false
+}
+
+type calDay struct {
+	Num       int
+	URL       string
+	HasEntry  bool
+	IsToday   bool
+	IsCurrent bool
+}
+
+type calYear struct {
+	Num       int
+	URL       string
+	IsCurrent bool
+}
+
+type calMonth struct {
+	Num       int
+	Name      string
+	URL       string
+	IsCurrent bool
+}
+
+type calendarData struct {
+	DisplayYear  int
+	DisplayMonth int
+	MonthName    string
+	DiaryURL     string
+	YearURL      string
+	MonthURL     string
+	PrevMonURL   string
+	NextMonURL   string
+	Weeks        [][]calDay
+	Years        []calYear
+	AllMonths    []calMonth
+}
+
+var diaryCalTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-calendar.html"))
+
+func computeCalendarWidget(diaryRootFS, diaryRootURL, fsPath string, depth int) template.HTML {
+	today := time.Now()
+	var displayYear, displayMonth, currentDay int
+
+	switch depth {
+	case 0:
+		displayYear = today.Year()
+		displayMonth = int(today.Month())
+	case 1:
+		y, err := strconv.Atoi(filepath.Base(fsPath))
+		if err != nil {
+			return ""
+		}
+		displayYear = y
+		if y == today.Year() {
+			displayMonth = int(today.Month())
+		} else {
+			displayMonth = 1
+		}
+	case 2:
+		m, err := strconv.Atoi(filepath.Base(fsPath))
+		if err != nil || m < 1 || m > 12 {
+			return ""
+		}
+		y, err := strconv.Atoi(filepath.Base(filepath.Dir(fsPath)))
+		if err != nil {
+			return ""
+		}
+		displayYear = y
+		displayMonth = m
+	case 3:
+		d, err := strconv.Atoi(filepath.Base(fsPath))
+		if err != nil || d < 1 || d > 31 {
+			return ""
+		}
+		monthFS := filepath.Dir(fsPath)
+		m, err := strconv.Atoi(filepath.Base(monthFS))
+		if err != nil || m < 1 || m > 12 {
+			return ""
+		}
+		y, err := strconv.Atoi(filepath.Base(filepath.Dir(monthFS)))
+		if err != nil {
+			return ""
+		}
+		displayYear = y
+		displayMonth = m
+		currentDay = d
+	default:
+		return ""
+	}
+
+	// Which days in the display month have diary subfolders?
+	monthFSPath := filepath.Join(diaryRootFS,
+		fmt.Sprintf("%d", displayYear),
+		fmt.Sprintf("%02d", displayMonth))
+	dayEntries, _ := os.ReadDir(monthFSPath)
+	hasDayEntry := map[int]bool{}
+	for _, e := range dayEntries {
+		if !e.IsDir() {
+			continue
+		}
+		d, err := strconv.Atoi(e.Name())
+		if err != nil || d < 1 || d > 31 {
+			continue
+		}
+		hasDayEntry[d] = true
+	}
+
+	// Build calendar grid with Monday as first column.
+	firstDay := time.Date(displayYear, time.Month(displayMonth), 1, 0, 0, 0, 0, time.UTC)
+	startOffset := int(firstDay.Weekday()+6) % 7
+	daysInMonth := time.Date(displayYear, time.Month(displayMonth)+1, 0, 0, 0, 0, 0, time.UTC).Day()
+
+	monthURLBase := path.Join(diaryRootURL,
+		fmt.Sprintf("%d", displayYear),
+		fmt.Sprintf("%02d", displayMonth)) + "/"
+
+	var weeks [][]calDay
+	week := make([]calDay, 7)
+	col := startOffset
+	for d := 1; d <= daysInMonth; d++ {
+		dayURL := path.Join(monthURLBase, fmt.Sprintf("%02d", d)) + "/"
+		cell := calDay{Num: d, HasEntry: hasDayEntry[d]}
+		if cell.HasEntry {
+			cell.URL = dayURL
+		} else {
+			cell.URL = dayURL + "?edit"
+		}
+		cell.IsCurrent = d == currentDay
+		cell.IsToday = d == today.Day() &&
+			time.Month(displayMonth) == today.Month() &&
+			displayYear == today.Year()
+		week[col] = cell
+		col++
+		if col == 7 {
+			weeks = append(weeks, week)
+			week = make([]calDay, 7)
+			col = 0
+		}
+	}
+	if col > 0 {
+		weeks = append(weeks, week)
+	}
+
+	prev := time.Date(displayYear, time.Month(displayMonth)-1, 1, 0, 0, 0, 0, time.UTC)
+	next := time.Date(displayYear, time.Month(displayMonth)+1, 1, 0, 0, 0, 0, time.UTC)
+	prevMonURL := path.Join(diaryRootURL,
+		fmt.Sprintf("%d", prev.Year()),
+		fmt.Sprintf("%02d", int(prev.Month()))) + "/"
+	nextMonURL := path.Join(diaryRootURL,
+		fmt.Sprintf("%d", next.Year()),
+		fmt.Sprintf("%02d", int(next.Month()))) + "/"
+	yearURL := path.Join(diaryRootURL, fmt.Sprintf("%d", displayYear)) + "/"
+
+	// Collect all year subdirectories in diary root (descending).
+	yearEntries, _ := os.ReadDir(diaryRootFS)
+	var years []calYear
+	yearSet := map[int]bool{}
+	for _, e := range yearEntries {
+		if !e.IsDir() {
+			continue
+		}
+		y, err := strconv.Atoi(e.Name())
+		if err != nil {
+			continue
+		}
+		yearSet[y] = true
+		years = append(years, calYear{
+			Num:       y,
+			URL:       path.Join(diaryRootURL, e.Name()) + "/",
+			IsCurrent: y == displayYear,
+		})
+	}
+	if !yearSet[displayYear] {
+		years = append(years, calYear{
+			Num:       displayYear,
+			URL:       yearURL,
+			IsCurrent: true,
+		})
+	}
+	sort.Slice(years, func(i, j int) bool { return years[i].Num > years[j].Num })
+
+	// All 12 months, ascending, linked to current display year.
+	allMonths := make([]calMonth, 12)
+	for m := 1; m <= 12; m++ {
+		allMonths[m-1] = calMonth{
+			Num:  m,
+			Name: germanMonths[time.Month(m)],
+			URL: path.Join(diaryRootURL,
+				fmt.Sprintf("%d", displayYear),
+				fmt.Sprintf("%02d", m)) + "/",
+			IsCurrent: m == displayMonth,
+		}
+	}
+
+	data := calendarData{
+		DisplayYear:  displayYear,
+		DisplayMonth: displayMonth,
+		MonthName:    germanMonths[time.Month(displayMonth)],
+		DiaryURL:     diaryRootURL,
+		YearURL:      yearURL,
+		MonthURL:     monthURLBase,
+		PrevMonURL:   prevMonURL,
+		NextMonURL:   nextMonURL,
+		Weeks:        weeks,
+		Years:        years,
+		AllMonths:    allMonths,
+	}
+
+	var buf bytes.Buffer
+	if err := diaryCalTmpl.Execute(&buf, data); err != nil {
+		log.Printf("diary calendar template: %v", err)
+		return ""
+	}
+	return template.HTML(buf.String())
 }
 
 // diaryPhoto is a photo file whose name starts with a YYYY-MM-DD date prefix.
@@ -263,17 +483,14 @@ func renderDiaryMonth(fsPath, urlPath string) template.HTML {
 	for _, dayNum := range days {
 		date := time.Date(year, time.Month(monthNum), dayNum, 0, 0, 0, 0, time.UTC)
 
-		heading := formatGermanDate(date)
+		heading := date.Format("2006-01-02")
 		dayURL := path.Join(urlPath, fmt.Sprintf("%02d", dayNum)) + "/"
 		var content template.HTML
 		if dirName, ok := dayDirs[dayNum]; ok {
 			dayURL = path.Join(urlPath, dirName) + "/"
 			dayFsPath := filepath.Join(fsPath, dirName)
 			if raw, err := os.ReadFile(filepath.Join(dayFsPath, "index.md")); err == nil && len(raw) > 0 {
-				if h := extractFirstHeading(raw); h != "" {
-					heading = h
 				raw = stripFirstHeading(raw)
-				}
 				content = renderMarkdown(raw)
 			}
 		}

main.go

@@ -22,9 +22,11 @@ var tmpl = template.Must(template.New("page.html").ParseFS(assets, "assets/page.
 // specialPage is the result returned by a pageTypeHandler.
 // Content is injected into the page after the standard markdown content.
 // SuppressListing hides the default file/folder listing.
+// Widget is a persistent sidebar widget rendered outside the main content area.
 type specialPage struct {
 	Content         template.HTML
 	SuppressListing bool
+	Widget          template.HTML
 }
 
 // pageTypeHandler is implemented by each special folder type (diary, gallery, …).
@@ -168,8 +170,10 @@ func (h *handler) serveDir(w http.ResponseWriter, r *http.Request, urlPath, fsPa
 	}
 
 	var specialContent template.HTML
+	var sidebarWidget template.HTML
 	if special != nil {
 		specialContent = special.Content
+		sidebarWidget = special.Widget
 	}
 
 	rawContent := string(rawMD)
@@ -192,6 +196,7 @@ func (h *handler) serveDir(w http.ResponseWriter, r *http.Request, urlPath, fsPa
 		Content:        rendered,
 		Entries:        entries,
 		SpecialContent: specialContent,
+		SidebarWidget:  sidebarWidget,
 	}
 
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")

render.go

@@ -46,6 +46,7 @@ type pageData struct {
 	Content        template.HTML
 	Entries        []entry
 	SpecialContent template.HTML
+	SidebarWidget  template.HTML
 }
 
 // pageSettings holds the parsed contents of a .page-settings file.