From 05c12e8452eae1be101ac23b688ebf73173fece7 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 29 Nov 2020 16:32:52 +0500
Subject: [PATCH 01/50] Show prev/next links

---
 README.md                                |   2 +-
 http_readers.go                          |   6 +-
 templates/asset.qtpl                     |   3 +
 templates/{css.qtpl.go => asset.qtpl.go} |  53 +++---
 templates/{css.qtpl => default.css}      |  10 +-
 templates/http_readers.qtpl              |  13 +-
 templates/http_readers.qtpl.go           | 217 ++++++++++++++---------
 tree/tree.go                             |  20 ++-
 8 files changed, 205 insertions(+), 119 deletions(-)
 create mode 100644 templates/asset.qtpl
 rename templates/{css.qtpl.go => asset.qtpl.go} (75%)
 rename templates/{css.qtpl => default.css} (88%)

diff --git a/README.md b/README.md
index 82876c6..784c616 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 🍄 MycorrhizaWiki 0.11
+# 🍄 MycorrhizaWiki 0.12
 A wiki engine.
 
 ## Building
diff --git a/http_readers.go b/http_readers.go
index b8887e9..759f05d 100644
--- a/http_readers.go
+++ b/http_readers.go
@@ -39,12 +39,13 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
 	if err == nil {
 		contents = markup.ToHtml(hyphaName, textContents)
 	}
+	treeHTML, _, _ := tree.Tree(hyphaName, IterateHyphaNamesWith)
 	page := templates.RevisionHTML(
 		rq,
 		hyphaName,
 		naviTitle(hyphaName),
 		contents,
-		tree.TreeAsHtml(hyphaName, IterateHyphaNamesWith),
+		treeHTML,
 		revHash,
 	)
 	w.Header().Set("Content-Type", "text/html;charset=utf-8")
@@ -111,8 +112,9 @@ func handlerPage(w http.ResponseWriter, rq *http.Request) {
 			contents = binaryHtmlBlock(hyphaName, data) + contents
 		}
 	}
+	treeHTML, prevHypha, nextHypha := tree.Tree(hyphaName, IterateHyphaNamesWith)
 	util.HTTP200Page(w, base(hyphaName, templates.PageHTML(rq, hyphaName,
 		naviTitle(hyphaName),
 		contents,
-		tree.TreeAsHtml(hyphaName, IterateHyphaNamesWith))))
+		treeHTML, prevHypha, nextHypha)))
 }
diff --git a/templates/asset.qtpl b/templates/asset.qtpl
new file mode 100644
index 0000000..91e873f
--- /dev/null
+++ b/templates/asset.qtpl
@@ -0,0 +1,3 @@
+{% func DefaultCSS() %}
+{% cat "default.css" %}
+{% endfunc %}
diff --git a/templates/css.qtpl.go b/templates/asset.qtpl.go
similarity index 75%
rename from templates/css.qtpl.go
rename to templates/asset.qtpl.go
index 72a25fc..2004603 100644
--- a/templates/css.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -1,27 +1,29 @@
-// Code generated by qtc from "css.qtpl". DO NOT EDIT.
+// Code generated by qtc from "asset.qtpl". DO NOT EDIT.
 // See https://github.com/valyala/quicktemplate for details.
 
-//line templates/css.qtpl:1
+//line templates/asset.qtpl:1
 package templates
 
-//line templates/css.qtpl:1
+//line templates/asset.qtpl:1
 import (
 	qtio422016 "io"
 
 	qt422016 "github.com/valyala/quicktemplate"
 )
 
-//line templates/css.qtpl:1
+//line templates/asset.qtpl:1
 var (
 	_ = qtio422016.Copy
 	_ = qt422016.AcquireByteBuffer
 )
 
-//line templates/css.qtpl:1
+//line templates/asset.qtpl:1
 func StreamDefaultCSS(qw422016 *qt422016.Writer) {
-//line templates/css.qtpl:1
+//line templates/asset.qtpl:1
 	qw422016.N().S(`
-@media screen and (min-width: 700px) {
+`)
+//line templates/asset.qtpl:2
+	qw422016.N().S(`@media screen and (min-width: 700px) {
 	main {margin: 0 auto; width: 700px;}
 }
 @media screen and (max-width: 700px) {
@@ -56,7 +58,7 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
 .navi-title a {text-decoration:none;}
-.img-gallery { text-align: center; margin-top: .25rem; }
+.img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
 .img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
 .img-gallery img { max-width: 100%; max-height: 50vh; }
 figure { margin: 0; }
@@ -73,32 +75,41 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 .rc-entry__hash { font-style: italic; text-align: right; }
 .rc-entry__links { grid-column: 1 / span 2; }
 .rc-entry__author { font-style: italic; }
+
+.prevnext__el { display: block-inline; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; background-color: #eee; border-radius: .25rem; }
+.prevnext__prev { float: left; }
+.prevnext__next { float: right; text-align: right; }
+
+.page-separator { clear: both; }
 `)
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:2
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:3
 }
 
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 func WriteDefaultCSS(qq422016 qtio422016.Writer) {
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 	StreamDefaultCSS(qw422016)
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 	qt422016.ReleaseWriter(qw422016)
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 }
 
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 func DefaultCSS() string {
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 	WriteDefaultCSS(qb422016)
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 	qs422016 := string(qb422016.B)
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 	return qs422016
-//line templates/css.qtpl:54
+//line templates/asset.qtpl:3
 }
diff --git a/templates/css.qtpl b/templates/default.css
similarity index 88%
rename from templates/css.qtpl
rename to templates/default.css
index 7a6f6e3..060a814 100644
--- a/templates/css.qtpl
+++ b/templates/default.css
@@ -1,4 +1,3 @@
-{% func DefaultCSS() %}
 @media screen and (min-width: 700px) {
 	main {margin: 0 auto; width: 700px;}
 }
@@ -34,7 +33,7 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
 .navi-title a {text-decoration:none;}
-.img-gallery { text-align: center; margin-top: .25rem; }
+.img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
 .img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
 .img-gallery img { max-width: 100%; max-height: 50vh; }
 figure { margin: 0; }
@@ -51,4 +50,9 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 .rc-entry__hash { font-style: italic; text-align: right; }
 .rc-entry__links { grid-column: 1 / span 2; }
 .rc-entry__author { font-style: italic; }
-{% endfunc %}
+
+.prevnext__el { display: block-inline; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; background-color: #eee; border-radius: .25rem; }
+.prevnext__prev { float: left; }
+.prevnext__next { float: right; text-align: right; }
+
+.page-separator { clear: both; }
diff --git a/templates/http_readers.qtpl b/templates/http_readers.qtpl
index a1cb2f3..da82cf9 100644
--- a/templates/http_readers.qtpl
+++ b/templates/http_readers.qtpl
@@ -1,4 +1,5 @@
 {% import "net/http" %}
+{% import "path" %}
 {% import "github.com/bouncepaw/mycorrhiza/user" %}
 
 {% func HistoryHTML(rq *http.Request, hyphaName, tbody string) %}
@@ -35,7 +36,7 @@
 {% endfunc %}
 
 If `contents` == "", a helpful message is shown instead.
-{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree string) %}
+{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) %}
 <main>
 {%= navHTML(rq, hyphaName, "page") %}
 	<article>
@@ -46,7 +47,15 @@ If `contents` == "", a helpful message is shown instead.
 			{%s= contents %}
 		{% endif %}
 	</article>
-	<hr/>
+	<section class="prevnext">
+		{% if prevHyphaName != "" %}
+		<a class="prevnext__el prevnext__prev" href="/page/{%s prevHyphaName %}">← {%s path.Base(prevHyphaName) %}</a>
+		{% endif %}
+		{% if nextHyphaName != "" %}
+		<a class="prevnext__el prevnext__next" href="/page/{%s nextHyphaName %}">{%s path.Base(nextHyphaName) %} →</a>
+		{% endif %}
+	</section>
+	<hr class="page-separator"/>
 {% if u := user.FromRequest(rq).OrAnon(); !user.AuthUsed || u.Group > user.UserAnon %}
 	<form action="/upload-binary/{%s hyphaName %}"
 			method="post" enctype="multipart/form-data">
diff --git a/templates/http_readers.qtpl.go b/templates/http_readers.qtpl.go
index 3ffac47..335b3d2 100644
--- a/templates/http_readers.qtpl.go
+++ b/templates/http_readers.qtpl.go
@@ -8,30 +8,33 @@ package templates
 import "net/http"
 
 //line templates/http_readers.qtpl:2
+import "path"
+
+//line templates/http_readers.qtpl:3
 import "github.com/bouncepaw/mycorrhiza/user"
 
-//line templates/http_readers.qtpl:4
+//line templates/http_readers.qtpl:5
 import (
 	qtio422016 "io"
 
 	qt422016 "github.com/valyala/quicktemplate"
 )
 
-//line templates/http_readers.qtpl:4
+//line templates/http_readers.qtpl:5
 var (
 	_ = qtio422016.Copy
 	_ = qt422016.AcquireByteBuffer
 )
 
-//line templates/http_readers.qtpl:4
+//line templates/http_readers.qtpl:5
 func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, tbody string) {
-//line templates/http_readers.qtpl:4
+//line templates/http_readers.qtpl:5
 	qw422016.N().S(`
 <main>
 `)
-//line templates/http_readers.qtpl:6
+//line templates/http_readers.qtpl:7
 	streamnavHTML(qw422016, rq, hyphaName, "history")
-//line templates/http_readers.qtpl:6
+//line templates/http_readers.qtpl:7
 	qw422016.N().S(`
 	<table>
 		<thead>
@@ -43,159 +46,199 @@ func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, t
 		</thead>
 		<tbody>
 		`)
-//line templates/http_readers.qtpl:16
+//line templates/http_readers.qtpl:17
 	qw422016.N().S(tbody)
-//line templates/http_readers.qtpl:16
+//line templates/http_readers.qtpl:17
 	qw422016.N().S(`
 		</tbody>
 	</table>
 </main>
 `)
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 }
 
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, tbody string) {
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 	StreamHistoryHTML(qw422016, rq, hyphaName, tbody)
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 }
 
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 func HistoryHTML(rq *http.Request, hyphaName, tbody string) string {
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 	WriteHistoryHTML(qb422016, rq, hyphaName, tbody)
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 	qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 	return qs422016
-//line templates/http_readers.qtpl:20
+//line templates/http_readers.qtpl:21
 }
 
-//line templates/http_readers.qtpl:22
+//line templates/http_readers.qtpl:23
 func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) {
-//line templates/http_readers.qtpl:22
+//line templates/http_readers.qtpl:23
 	qw422016.N().S(`
 <main>
 `)
-//line templates/http_readers.qtpl:24
+//line templates/http_readers.qtpl:25
 	streamnavHTML(qw422016, rq, hyphaName, "revision", revHash)
-//line templates/http_readers.qtpl:24
+//line templates/http_readers.qtpl:25
 	qw422016.N().S(`
 	<article>
 		<p>Please note that viewing binary parts of hyphae is not supported in history for now.</p>
 		`)
-//line templates/http_readers.qtpl:27
+//line templates/http_readers.qtpl:28
 	qw422016.N().S(naviTitle)
-//line templates/http_readers.qtpl:27
+//line templates/http_readers.qtpl:28
 	qw422016.N().S(`
 		`)
-//line templates/http_readers.qtpl:28
+//line templates/http_readers.qtpl:29
 	qw422016.N().S(contents)
-//line templates/http_readers.qtpl:28
+//line templates/http_readers.qtpl:29
 	qw422016.N().S(`
 	</article>
 	<hr/>
 	<aside>
 		`)
-//line templates/http_readers.qtpl:32
+//line templates/http_readers.qtpl:33
 	qw422016.N().S(tree)
-//line templates/http_readers.qtpl:32
+//line templates/http_readers.qtpl:33
 	qw422016.N().S(`
 	</aside>
 </main>
 `)
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 }
 
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) {
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 	StreamRevisionHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, revHash)
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 }
 
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) string {
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 	WriteRevisionHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, revHash)
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 	qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 	return qs422016
-//line templates/http_readers.qtpl:35
+//line templates/http_readers.qtpl:36
 }
 
 // If `contents` == "", a helpful message is shown instead.
 
-//line templates/http_readers.qtpl:38
-func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree string) {
-//line templates/http_readers.qtpl:38
+//line templates/http_readers.qtpl:39
+func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) {
+//line templates/http_readers.qtpl:39
 	qw422016.N().S(`
 <main>
 `)
-//line templates/http_readers.qtpl:40
+//line templates/http_readers.qtpl:41
 	streamnavHTML(qw422016, rq, hyphaName, "page")
-//line templates/http_readers.qtpl:40
+//line templates/http_readers.qtpl:41
 	qw422016.N().S(`
 	<article>
 		`)
-//line templates/http_readers.qtpl:42
+//line templates/http_readers.qtpl:43
 	qw422016.N().S(naviTitle)
-//line templates/http_readers.qtpl:42
+//line templates/http_readers.qtpl:43
 	qw422016.N().S(`
 		`)
-//line templates/http_readers.qtpl:43
+//line templates/http_readers.qtpl:44
 	if contents == "" {
-//line templates/http_readers.qtpl:43
+//line templates/http_readers.qtpl:44
 		qw422016.N().S(`
 			<p>This hypha has no text. Why not <a href="/edit/`)
-//line templates/http_readers.qtpl:44
+//line templates/http_readers.qtpl:45
 		qw422016.E().S(hyphaName)
-//line templates/http_readers.qtpl:44
+//line templates/http_readers.qtpl:45
 		qw422016.N().S(`">create it</a>?</p>
 		`)
-//line templates/http_readers.qtpl:45
+//line templates/http_readers.qtpl:46
 	} else {
-//line templates/http_readers.qtpl:45
+//line templates/http_readers.qtpl:46
 		qw422016.N().S(`
 			`)
-//line templates/http_readers.qtpl:46
+//line templates/http_readers.qtpl:47
 		qw422016.N().S(contents)
-//line templates/http_readers.qtpl:46
+//line templates/http_readers.qtpl:47
 		qw422016.N().S(`
 		`)
-//line templates/http_readers.qtpl:47
+//line templates/http_readers.qtpl:48
 	}
-//line templates/http_readers.qtpl:47
+//line templates/http_readers.qtpl:48
 	qw422016.N().S(`
 	</article>
-	<hr/>
+	<section class="prevnext">
+		`)
+//line templates/http_readers.qtpl:51
+	if prevHyphaName != "" {
+//line templates/http_readers.qtpl:51
+		qw422016.N().S(`
+		<a class="prevnext__el prevnext__prev" href="/page/`)
+//line templates/http_readers.qtpl:52
+		qw422016.E().S(prevHyphaName)
+//line templates/http_readers.qtpl:52
+		qw422016.N().S(`">← `)
+//line templates/http_readers.qtpl:52
+		qw422016.E().S(path.Base(prevHyphaName))
+//line templates/http_readers.qtpl:52
+		qw422016.N().S(`</a>
+		`)
+//line templates/http_readers.qtpl:53
+	}
+//line templates/http_readers.qtpl:53
+	qw422016.N().S(`
+		`)
+//line templates/http_readers.qtpl:54
+	if nextHyphaName != "" {
+//line templates/http_readers.qtpl:54
+		qw422016.N().S(`
+		<a class="prevnext__el prevnext__next" href="/page/`)
+//line templates/http_readers.qtpl:55
+		qw422016.E().S(nextHyphaName)
+//line templates/http_readers.qtpl:55
+		qw422016.N().S(`">`)
+//line templates/http_readers.qtpl:55
+		qw422016.E().S(path.Base(nextHyphaName))
+//line templates/http_readers.qtpl:55
+		qw422016.N().S(` →</a>
+		`)
+//line templates/http_readers.qtpl:56
+	}
+//line templates/http_readers.qtpl:56
+	qw422016.N().S(`
+	</section>
+	<hr class="page-separator"/>
 `)
-//line templates/http_readers.qtpl:50
+//line templates/http_readers.qtpl:59
 	if u := user.FromRequest(rq).OrAnon(); !user.AuthUsed || u.Group > user.UserAnon {
-//line templates/http_readers.qtpl:50
+//line templates/http_readers.qtpl:59
 		qw422016.N().S(`
 	<form action="/upload-binary/`)
-//line templates/http_readers.qtpl:51
+//line templates/http_readers.qtpl:60
 		qw422016.E().S(hyphaName)
-//line templates/http_readers.qtpl:51
+//line templates/http_readers.qtpl:60
 		qw422016.N().S(`"
 			method="post" enctype="multipart/form-data">
 		<label for="upload-binary__input">Upload a new attachment</label>
@@ -205,44 +248,44 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi
 	</form>
 	<hr/>
 `)
-//line templates/http_readers.qtpl:59
+//line templates/http_readers.qtpl:68
 	}
-//line templates/http_readers.qtpl:59
+//line templates/http_readers.qtpl:68
 	qw422016.N().S(`
 	<aside>
 		`)
-//line templates/http_readers.qtpl:61
+//line templates/http_readers.qtpl:70
 	qw422016.N().S(tree)
-//line templates/http_readers.qtpl:61
+//line templates/http_readers.qtpl:70
 	qw422016.N().S(`
 	</aside>
 </main>
 `)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
 }
 
-//line templates/http_readers.qtpl:64
-func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree string) {
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
+func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) {
+//line templates/http_readers.qtpl:73
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:64
-	StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, tree)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
+	StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName)
+//line templates/http_readers.qtpl:73
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
 }
 
-//line templates/http_readers.qtpl:64
-func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree string) string {
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
+func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) string {
+//line templates/http_readers.qtpl:73
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:64
-	WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, tree)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
+	WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName)
+//line templates/http_readers.qtpl:73
 	qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
 	return qs422016
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:73
 }
diff --git a/tree/tree.go b/tree/tree.go
index 1655664..982fed7 100644
--- a/tree/tree.go
+++ b/tree/tree.go
@@ -10,17 +10,20 @@ import (
 // If Name == "", the tree is empty.
 type tree struct {
 	name          string
+	exists        bool
+	prevSibling   string
+	nextSibling   string
 	siblings      []string
 	descendants   []*tree
 	root          bool
 	hyphaIterator func(func(string))
 }
 
-// TreeAsHtml generates a tree for `hyphaName`. `hyphaStorage` has this type because package `tree` has no access to `HyphaData` data type. One day it shall have it, I guess.
-func TreeAsHtml(hyphaName string, hyphaIterator func(func(string))) string {
+// Tree generates a tree for `hyphaName` as html and returns next and previous hyphae if any.
+func Tree(hyphaName string, hyphaIterator func(func(string))) (html, prev, next string) {
 	t := &tree{name: hyphaName, root: true, hyphaIterator: hyphaIterator}
 	t.fill()
-	return t.asHtml()
+	return t.asHtml(), t.prevSibling, t.nextSibling
 }
 
 // subtree adds a descendant tree to `t` and returns that tree.
@@ -34,11 +37,22 @@ func (t *tree) fork(descendantName string) *tree {
 	return subt
 }
 
+// Compare current prev next hyphae and decide if any of them should be set to `name2`.
+func (t *tree) prevNextDetermine(name2 string) {
+	if name2 < t.name && (name2 > t.prevSibling || t.prevSibling == "") {
+		t.prevSibling = name2
+	} else if name2 > t.name && (name2 < t.nextSibling || t.nextSibling == "") {
+		t.nextSibling = name2
+	}
+}
+
 // Compares names and does something with them, may generate a subtree.
 func (t *tree) compareNamesAndAppend(name2 string) {
 	switch {
 	case t.name == name2:
+		t.exists = true
 	case t.root && path.Dir(t.name) == path.Dir(name2):
+		t.prevNextDetermine(name2)
 		t.siblings = append(t.siblings, name2)
 	case t.name == path.Dir(name2):
 		t.fork(name2).fill()

From 3d20b3e77a26b78a1a208b6d3fd8ce1ba64d19f7 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 29 Nov 2020 22:06:45 +0500
Subject: [PATCH 02/50] Make history page easier to use

---
 history/information.go         |  68 +++++++++--
 http_readers.go                |   8 +-
 templates/asset.qtpl.go        |   9 +-
 templates/default.css          |   9 +-
 templates/http_readers.qtpl    |  18 +--
 templates/http_readers.qtpl.go | 212 ++++++++++++++++-----------------
 6 files changed, 184 insertions(+), 140 deletions(-)

diff --git a/history/information.go b/history/information.go
index bc65cac..80d5b5d 100644
--- a/history/information.go
+++ b/history/information.go
@@ -7,8 +7,10 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/bouncepaw/mycorrhiza/templates"
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 func RecentChanges(n int) string {
@@ -37,8 +39,8 @@ func Revisions(hyphaName string) ([]Revision, error) {
 	var (
 		out, err = gitsh(
 			"log", "--oneline", "--no-merges",
-			// Hash, Commiter email, Commiter time, Commit msg separated by tab
-			"--pretty=format:\"%h\t%ce\t%ct\t%s\"",
+			// Hash, author email, author time, commit msg separated by tab
+			"--pretty=format:\"%h\t%ae\t%at\t%s\"",
 			"--", hyphaName+".*",
 		)
 		revs []Revision
@@ -53,6 +55,58 @@ func Revisions(hyphaName string) ([]Revision, error) {
 	return revs, err
 }
 
+// HistoryWithRevisions returns an html representation of `revs` that is meant to be inserted in a history page.
+func HistoryWithRevisions(hyphaName string, revs []Revision) (html string) {
+	var (
+		currentYear  int
+		currentMonth time.Month
+	)
+	for i, rev := range revs {
+		if rev.Time.Month() != currentMonth || rev.Time.Year() != currentYear {
+			currentYear = rev.Time.Year()
+			currentMonth = rev.Time.Month()
+			if i != 0 {
+				html += `
+	</ul>
+</section>`
+			}
+			html += fmt.Sprintf(`
+<section class="history__month">
+	<a href="#%[1]d-%[2]d" class="history__month-anchor">
+		<h2 id="%[1]d-%[2]d" class="history__month-title">%[3]s</h2>
+	</a>
+	<ul class="history__entries">`,
+				currentYear, currentMonth,
+				strconv.Itoa(currentYear)+" "+rev.Time.Month().String())
+		}
+		html += rev.asHistoryEntry(hyphaName)
+	}
+	return html
+}
+
+func (rev *Revision) asHistoryEntry(hyphaName string) (html string) {
+	author := ""
+	if rev.Username != "anon" {
+		author = fmt.Sprintf(`
+		<span class="history-entry__author">by <a href="/page/%[1]s/%[2]s" rel="author">%[2]s</span>`, util.UserTree, rev.Username)
+	}
+	return fmt.Sprintf(`
+<li class="history__entry">
+	<a class="history-entry" href="/rev/%[3]s/%[1]s">
+		<time class="history-entry__time">%[2]s</time>
+		<span class="history-entry__hash">%[3]s</span>
+		<span class="history-entry__msg">%[4]s</span>
+	</a>%[5]s
+</li>
+`, hyphaName, rev.timeHourMinute(), rev.Hash, rev.Message, author)
+}
+
+// Return time like 13:42
+func (rev *Revision) timeHourMinute() string {
+	h, m, _ := rev.Time.Clock()
+	return strconv.Itoa(h) + ":" + strconv.Itoa(m)
+}
+
 // This regex is wrapped in "". For some reason, these quotes appear at some time and we have to get rid of them.
 var revisionLinePattern = regexp.MustCompile("\"(.*)\t(.*)@.*\t(.*)\t(.*)\"")
 
@@ -66,16 +120,6 @@ func parseRevisionLine(line string) Revision {
 	}
 }
 
-// Represent revision as a table row.
-func (rev *Revision) AsHtmlTableRow(hyphaName string) string {
-	return fmt.Sprintf(`
-<tr>
-	<td><time>%s</time></td>
-	<td><a href="/rev/%s/%s">%s</a></td>
-	<td>%s</td>
-</tr>`, rev.TimeString(), rev.Hash, hyphaName, rev.Hash, rev.Message)
-}
-
 // See how the file with `filepath` looked at commit with `hash`.
 func FileAtRevision(filepath, hash string) (string, error) {
 	out, err := gitsh("show", hash+":"+filepath)
diff --git a/http_readers.go b/http_readers.go
index 759f05d..e9bf8dc 100644
--- a/http_readers.go
+++ b/http_readers.go
@@ -57,19 +57,17 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
 func handlerHistory(w http.ResponseWriter, rq *http.Request) {
 	log.Println(rq.URL)
 	hyphaName := HyphaNameFromRq(rq, "history")
-	var tbody string
+	var list string
 
 	// History can be found for files that do not exist anymore.
 	revs, err := history.Revisions(hyphaName)
 	if err == nil {
-		for _, rev := range revs {
-			tbody += rev.AsHtmlTableRow(hyphaName)
-		}
+		list = history.HistoryWithRevisions(hyphaName, revs)
 	}
 	log.Println("Found", len(revs), "revisions for", hyphaName)
 
 	util.HTTP200Page(w,
-		base(hyphaName, templates.HistoryHTML(rq, hyphaName, tbody)))
+		base(hyphaName, templates.HistoryHTML(rq, hyphaName, list)))
 }
 
 // handlerText serves raw source text of the hypha.
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 2004603..655f800 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -33,7 +33,7 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) {
 html {height:100%; padding:0; background-color:#ddd;
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
 body {height:100%; margin:0; font-size:16px; font-family:sans-serif;}
-main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); }
+main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:15px;}
 .edit {height:100%;}
@@ -81,6 +81,13 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 .prevnext__next { float: right; text-align: right; }
 
 .page-separator { clear: both; }
+.history__entries { background-color: #eee; margin: 0; padding: 0; border-radius: .25rem; }
+.history__month-anchor { text-decoration: none; color: black; }
+.history__entry { list-style-type: none; padding: .25rem; }
+.history-entry { padding: .25rem; }
+.history-entry__time { font-weight: bold; }
+.history-entry__author { font-style: italic; }
+
 `)
 //line templates/asset.qtpl:2
 	qw422016.N().S(`
diff --git a/templates/default.css b/templates/default.css
index 060a814..f79a0a8 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -8,7 +8,7 @@
 html {height:100%; padding:0; background-color:#ddd;
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
 body {height:100%; margin:0; font-size:16px; font-family:sans-serif;}
-main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); }
+main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:15px;}
 .edit {height:100%;}
@@ -56,3 +56,10 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 .prevnext__next { float: right; text-align: right; }
 
 .page-separator { clear: both; }
+.history__entries { background-color: #eee; margin: 0; padding: 0; border-radius: .25rem; }
+.history__month-anchor { text-decoration: none; color: black; }
+.history__entry { list-style-type: none; padding: .25rem; }
+.history-entry { padding: .25rem; }
+.history-entry__time { font-weight: bold; }
+.history-entry__author { font-style: italic; }
+
diff --git a/templates/http_readers.qtpl b/templates/http_readers.qtpl
index da82cf9..ca58c7c 100644
--- a/templates/http_readers.qtpl
+++ b/templates/http_readers.qtpl
@@ -2,21 +2,13 @@
 {% import "path" %}
 {% import "github.com/bouncepaw/mycorrhiza/user" %}
 
-{% func HistoryHTML(rq *http.Request, hyphaName, tbody string) %}
+{% func HistoryHTML(rq *http.Request, hyphaName, list string) %}
 <main>
 {%= navHTML(rq, hyphaName, "history") %}
-	<table>
-		<thead>
-			<tr>
-				<th>Time</th>
-				<th>Hash</th>
-				<th>Message</th>
-			</tr>
-		</thead>
-		<tbody>
-		{%s= tbody %}
-		</tbody>
-	</table>
+	<article class="history">
+		<h1>History of {%s hyphaName %}</h1>
+		{%s= list %}
+	</article>
 </main>
 {% endfunc %}
 
diff --git a/templates/http_readers.qtpl.go b/templates/http_readers.qtpl.go
index 335b3d2..95e85f5 100644
--- a/templates/http_readers.qtpl.go
+++ b/templates/http_readers.qtpl.go
@@ -27,7 +27,7 @@ var (
 )
 
 //line templates/http_readers.qtpl:5
-func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, tbody string) {
+func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) {
 //line templates/http_readers.qtpl:5
 	qw422016.N().S(`
 <main>
@@ -36,209 +36,205 @@ func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, t
 	streamnavHTML(qw422016, rq, hyphaName, "history")
 //line templates/http_readers.qtpl:7
 	qw422016.N().S(`
-	<table>
-		<thead>
-			<tr>
-				<th>Time</th>
-				<th>Hash</th>
-				<th>Message</th>
-			</tr>
-		</thead>
-		<tbody>
+	<article class="history">
+		<h1>History of `)
+//line templates/http_readers.qtpl:9
+	qw422016.E().S(hyphaName)
+//line templates/http_readers.qtpl:9
+	qw422016.N().S(`</h1>
 		`)
-//line templates/http_readers.qtpl:17
-	qw422016.N().S(tbody)
-//line templates/http_readers.qtpl:17
+//line templates/http_readers.qtpl:10
+	qw422016.N().S(list)
+//line templates/http_readers.qtpl:10
 	qw422016.N().S(`
-		</tbody>
-	</table>
+	</article>
 </main>
 `)
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
 }
 
-//line templates/http_readers.qtpl:21
-func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, tbody string) {
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
+func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) {
+//line templates/http_readers.qtpl:13
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:21
-	StreamHistoryHTML(qw422016, rq, hyphaName, tbody)
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
+	StreamHistoryHTML(qw422016, rq, hyphaName, list)
+//line templates/http_readers.qtpl:13
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
 }
 
-//line templates/http_readers.qtpl:21
-func HistoryHTML(rq *http.Request, hyphaName, tbody string) string {
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
+func HistoryHTML(rq *http.Request, hyphaName, list string) string {
+//line templates/http_readers.qtpl:13
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:21
-	WriteHistoryHTML(qb422016, rq, hyphaName, tbody)
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
+	WriteHistoryHTML(qb422016, rq, hyphaName, list)
+//line templates/http_readers.qtpl:13
 	qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
 	return qs422016
-//line templates/http_readers.qtpl:21
+//line templates/http_readers.qtpl:13
 }
 
-//line templates/http_readers.qtpl:23
+//line templates/http_readers.qtpl:15
 func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) {
-//line templates/http_readers.qtpl:23
+//line templates/http_readers.qtpl:15
 	qw422016.N().S(`
 <main>
 `)
-//line templates/http_readers.qtpl:25
+//line templates/http_readers.qtpl:17
 	streamnavHTML(qw422016, rq, hyphaName, "revision", revHash)
-//line templates/http_readers.qtpl:25
+//line templates/http_readers.qtpl:17
 	qw422016.N().S(`
 	<article>
 		<p>Please note that viewing binary parts of hyphae is not supported in history for now.</p>
 		`)
-//line templates/http_readers.qtpl:28
+//line templates/http_readers.qtpl:20
 	qw422016.N().S(naviTitle)
-//line templates/http_readers.qtpl:28
+//line templates/http_readers.qtpl:20
 	qw422016.N().S(`
 		`)
-//line templates/http_readers.qtpl:29
+//line templates/http_readers.qtpl:21
 	qw422016.N().S(contents)
-//line templates/http_readers.qtpl:29
+//line templates/http_readers.qtpl:21
 	qw422016.N().S(`
 	</article>
 	<hr/>
 	<aside>
 		`)
-//line templates/http_readers.qtpl:33
+//line templates/http_readers.qtpl:25
 	qw422016.N().S(tree)
-//line templates/http_readers.qtpl:33
+//line templates/http_readers.qtpl:25
 	qw422016.N().S(`
 	</aside>
 </main>
 `)
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 }
 
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) {
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 	StreamRevisionHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, revHash)
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 }
 
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) string {
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 	WriteRevisionHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, revHash)
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 	qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 	return qs422016
-//line templates/http_readers.qtpl:36
+//line templates/http_readers.qtpl:28
 }
 
 // If `contents` == "", a helpful message is shown instead.
 
-//line templates/http_readers.qtpl:39
+//line templates/http_readers.qtpl:31
 func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) {
-//line templates/http_readers.qtpl:39
+//line templates/http_readers.qtpl:31
 	qw422016.N().S(`
 <main>
 `)
-//line templates/http_readers.qtpl:41
+//line templates/http_readers.qtpl:33
 	streamnavHTML(qw422016, rq, hyphaName, "page")
-//line templates/http_readers.qtpl:41
+//line templates/http_readers.qtpl:33
 	qw422016.N().S(`
 	<article>
 		`)
-//line templates/http_readers.qtpl:43
+//line templates/http_readers.qtpl:35
 	qw422016.N().S(naviTitle)
-//line templates/http_readers.qtpl:43
+//line templates/http_readers.qtpl:35
 	qw422016.N().S(`
 		`)
-//line templates/http_readers.qtpl:44
+//line templates/http_readers.qtpl:36
 	if contents == "" {
-//line templates/http_readers.qtpl:44
+//line templates/http_readers.qtpl:36
 		qw422016.N().S(`
 			<p>This hypha has no text. Why not <a href="/edit/`)
-//line templates/http_readers.qtpl:45
+//line templates/http_readers.qtpl:37
 		qw422016.E().S(hyphaName)
-//line templates/http_readers.qtpl:45
+//line templates/http_readers.qtpl:37
 		qw422016.N().S(`">create it</a>?</p>
 		`)
-//line templates/http_readers.qtpl:46
+//line templates/http_readers.qtpl:38
 	} else {
-//line templates/http_readers.qtpl:46
+//line templates/http_readers.qtpl:38
 		qw422016.N().S(`
 			`)
-//line templates/http_readers.qtpl:47
+//line templates/http_readers.qtpl:39
 		qw422016.N().S(contents)
-//line templates/http_readers.qtpl:47
+//line templates/http_readers.qtpl:39
 		qw422016.N().S(`
 		`)
-//line templates/http_readers.qtpl:48
+//line templates/http_readers.qtpl:40
 	}
-//line templates/http_readers.qtpl:48
+//line templates/http_readers.qtpl:40
 	qw422016.N().S(`
 	</article>
 	<section class="prevnext">
 		`)
-//line templates/http_readers.qtpl:51
+//line templates/http_readers.qtpl:43
 	if prevHyphaName != "" {
-//line templates/http_readers.qtpl:51
+//line templates/http_readers.qtpl:43
 		qw422016.N().S(`
 		<a class="prevnext__el prevnext__prev" href="/page/`)
-//line templates/http_readers.qtpl:52
+//line templates/http_readers.qtpl:44
 		qw422016.E().S(prevHyphaName)
-//line templates/http_readers.qtpl:52
+//line templates/http_readers.qtpl:44
 		qw422016.N().S(`">← `)
-//line templates/http_readers.qtpl:52
+//line templates/http_readers.qtpl:44
 		qw422016.E().S(path.Base(prevHyphaName))
-//line templates/http_readers.qtpl:52
+//line templates/http_readers.qtpl:44
 		qw422016.N().S(`</a>
 		`)
-//line templates/http_readers.qtpl:53
+//line templates/http_readers.qtpl:45
 	}
-//line templates/http_readers.qtpl:53
+//line templates/http_readers.qtpl:45
 	qw422016.N().S(`
 		`)
-//line templates/http_readers.qtpl:54
+//line templates/http_readers.qtpl:46
 	if nextHyphaName != "" {
-//line templates/http_readers.qtpl:54
+//line templates/http_readers.qtpl:46
 		qw422016.N().S(`
 		<a class="prevnext__el prevnext__next" href="/page/`)
-//line templates/http_readers.qtpl:55
+//line templates/http_readers.qtpl:47
 		qw422016.E().S(nextHyphaName)
-//line templates/http_readers.qtpl:55
+//line templates/http_readers.qtpl:47
 		qw422016.N().S(`">`)
-//line templates/http_readers.qtpl:55
+//line templates/http_readers.qtpl:47
 		qw422016.E().S(path.Base(nextHyphaName))
-//line templates/http_readers.qtpl:55
+//line templates/http_readers.qtpl:47
 		qw422016.N().S(` →</a>
 		`)
-//line templates/http_readers.qtpl:56
+//line templates/http_readers.qtpl:48
 	}
-//line templates/http_readers.qtpl:56
+//line templates/http_readers.qtpl:48
 	qw422016.N().S(`
 	</section>
 	<hr class="page-separator"/>
 `)
-//line templates/http_readers.qtpl:59
+//line templates/http_readers.qtpl:51
 	if u := user.FromRequest(rq).OrAnon(); !user.AuthUsed || u.Group > user.UserAnon {
-//line templates/http_readers.qtpl:59
+//line templates/http_readers.qtpl:51
 		qw422016.N().S(`
 	<form action="/upload-binary/`)
-//line templates/http_readers.qtpl:60
+//line templates/http_readers.qtpl:52
 		qw422016.E().S(hyphaName)
-//line templates/http_readers.qtpl:60
+//line templates/http_readers.qtpl:52
 		qw422016.N().S(`"
 			method="post" enctype="multipart/form-data">
 		<label for="upload-binary__input">Upload a new attachment</label>
@@ -248,44 +244,44 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi
 	</form>
 	<hr/>
 `)
-//line templates/http_readers.qtpl:68
+//line templates/http_readers.qtpl:60
 	}
-//line templates/http_readers.qtpl:68
+//line templates/http_readers.qtpl:60
 	qw422016.N().S(`
 	<aside>
 		`)
-//line templates/http_readers.qtpl:70
+//line templates/http_readers.qtpl:62
 	qw422016.N().S(tree)
-//line templates/http_readers.qtpl:70
+//line templates/http_readers.qtpl:62
 	qw422016.N().S(`
 	</aside>
 </main>
 `)
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 }
 
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) {
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 	StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName)
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 }
 
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) string {
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 	WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName)
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 	qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 	return qs422016
-//line templates/http_readers.qtpl:73
+//line templates/http_readers.qtpl:65
 }

From ce8da047eaa9c5d5d7882261fd074d98302d79d1 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 29 Nov 2020 22:09:02 +0500
Subject: [PATCH 03/50] Do not show login link for wikis with no auth

---
 templates/common.qtpl    |  2 +
 templates/common.qtpl.go | 84 ++++++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/templates/common.qtpl b/templates/common.qtpl
index 321da84..29673cc 100644
--- a/templates/common.qtpl
+++ b/templates/common.qtpl
@@ -40,6 +40,7 @@ var navEntries = []navEntry{
 {% endfunc %}
 
 {% func userMenuHTML(u *user.User) %}
+	{% if user.AuthUsed %}
 			<li class="navlinks__user">
 			{% if u.Group == user.UserAnon %}
 				<a href="/login">Login</a>
@@ -47,5 +48,6 @@ var navEntries = []navEntry{
 				<a href="/page/{%s util.UserTree %}/{%s u.Name %}">{%s u.Name %}</a>
 			{% endif %}
 			</li>
+	{% endif %}
 {% endfunc %}
 
diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go
index de53098..b2791b8 100644
--- a/templates/common.qtpl.go
+++ b/templates/common.qtpl.go
@@ -140,63 +140,73 @@ func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string
 func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) {
 //line templates/common.qtpl:42
 	qw422016.N().S(`
+	`)
+//line templates/common.qtpl:43
+	if user.AuthUsed {
+//line templates/common.qtpl:43
+		qw422016.N().S(`
 			<li class="navlinks__user">
 			`)
-//line templates/common.qtpl:44
-	if u.Group == user.UserAnon {
-//line templates/common.qtpl:44
-		qw422016.N().S(`
+//line templates/common.qtpl:45
+		if u.Group == user.UserAnon {
+//line templates/common.qtpl:45
+			qw422016.N().S(`
 				<a href="/login">Login</a>
 			`)
-//line templates/common.qtpl:46
-	} else {
-//line templates/common.qtpl:46
-		qw422016.N().S(`
+//line templates/common.qtpl:47
+		} else {
+//line templates/common.qtpl:47
+			qw422016.N().S(`
 				<a href="/page/`)
-//line templates/common.qtpl:47
-		qw422016.E().S(util.UserTree)
-//line templates/common.qtpl:47
-		qw422016.N().S(`/`)
-//line templates/common.qtpl:47
-		qw422016.E().S(u.Name)
-//line templates/common.qtpl:47
-		qw422016.N().S(`">`)
-//line templates/common.qtpl:47
-		qw422016.E().S(u.Name)
-//line templates/common.qtpl:47
-		qw422016.N().S(`</a>
+//line templates/common.qtpl:48
+			qw422016.E().S(util.UserTree)
+//line templates/common.qtpl:48
+			qw422016.N().S(`/`)
+//line templates/common.qtpl:48
+			qw422016.E().S(u.Name)
+//line templates/common.qtpl:48
+			qw422016.N().S(`">`)
+//line templates/common.qtpl:48
+			qw422016.E().S(u.Name)
+//line templates/common.qtpl:48
+			qw422016.N().S(`</a>
 			`)
-//line templates/common.qtpl:48
-	}
-//line templates/common.qtpl:48
-	qw422016.N().S(`
+//line templates/common.qtpl:49
+		}
+//line templates/common.qtpl:49
+		qw422016.N().S(`
 			</li>
+	`)
+//line templates/common.qtpl:51
+	}
+//line templates/common.qtpl:51
+	qw422016.N().S(`
 `)
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 }
 
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 func writeuserMenuHTML(qq422016 qtio422016.Writer, u *user.User) {
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 	streamuserMenuHTML(qw422016, u)
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 	qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 }
 
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 func userMenuHTML(u *user.User) string {
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 	writeuserMenuHTML(qb422016, u)
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 	qs422016 := string(qb422016.B)
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 	return qs422016
-//line templates/common.qtpl:50
+//line templates/common.qtpl:52
 }

From a885253d128683e6bbe654a301af00df96bde45d Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Tue, 1 Dec 2020 01:33:15 +0500
Subject: [PATCH 04/50] Fix uploading attachments on wikis with no auth

---
 http_mutators.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http_mutators.go b/http_mutators.go
index 232fed3..1283f59 100644
--- a/http_mutators.go
+++ b/http_mutators.go
@@ -174,7 +174,7 @@ func handlerUploadBinary(w http.ResponseWriter, rq *http.Request) {
 	log.Println(rq.URL)
 	var (
 		hyphaName = HyphaNameFromRq(rq, "upload-binary")
-		u         = user.FromRequest(rq)
+		u         = user.FromRequest(rq).OrAnon()
 	)
 	if !u.CanProceed("upload-binary") {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to upload attachments.")

From c89b0702ab49beb5bdb68d70b298fec6ca6cfa48 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Tue, 1 Dec 2020 15:05:57 +0500
Subject: [PATCH 05/50] Handle relative paths in img

---
 markup/img.go         | 2 +-
 templates/default.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/markup/img.go b/markup/img.go
index 6445ed1..9539498 100644
--- a/markup/img.go
+++ b/markup/img.go
@@ -218,7 +218,7 @@ func (img *Img) checkLinks() map[string]bool {
 	}
 	HyphaIterate(func(hyphaName string) {
 		for _, entry := range img.entries {
-			if hyphaName == entry.trimmedPath {
+			if hyphaName == xclCanonicalName(img.hyphaName, entry.trimmedPath) {
 				m[entry.trimmedPath] = true
 			}
 		}
diff --git a/templates/default.css b/templates/default.css
index f79a0a8..5d5c6e2 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -26,7 +26,7 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .transclusion code, .transclusion .codeblock {background-color:#ddd;}
 .transclusion {background-color:#eee; border-radius: .25rem; }
 .transclusion__content > *:not(.binary-container) {margin: 0.5rem; }
-.transclusion__link {display: block; text-align: right; font-style: italic; margin-top: 0.5rem; color: black; text-decoration: none;}
+.transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; color: black; text-decoration: none;}
 .transclusion__link::before {content: "⇐ ";}
 
 .binary-container_with-img img,

From 5269411ea2e88d37bbb9c758cec387e0151be85e Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Tue, 8 Dec 2020 14:04:24 +0500
Subject: [PATCH 06/50] Move /history/ and /recent-changes handlers to their
 own file

---
 http_history.go         | 48 +++++++++++++++++++++++++++++++++++++++++
 http_readers.go         | 18 ----------------
 main.go                 | 24 ++++-----------------
 templates/asset.qtpl.go |  2 +-
 4 files changed, 53 insertions(+), 39 deletions(-)
 create mode 100644 http_history.go

diff --git a/http_history.go b/http_history.go
new file mode 100644
index 0000000..8bec1ae
--- /dev/null
+++ b/http_history.go
@@ -0,0 +1,48 @@
+package main
+
+import (
+	"log"
+	"net/http"
+	"strconv"
+	"strings"
+
+	"github.com/bouncepaw/mycorrhiza/history"
+	"github.com/bouncepaw/mycorrhiza/templates"
+	"github.com/bouncepaw/mycorrhiza/util"
+)
+
+func init() {
+	http.HandleFunc("/history/", handlerHistory)
+	http.HandleFunc("/recent-changes/", handlerRecentChanges)
+}
+
+// handlerHistory lists all revisions of a hypha
+func handlerHistory(w http.ResponseWriter, rq *http.Request) {
+	log.Println(rq.URL)
+	hyphaName := HyphaNameFromRq(rq, "history")
+	var list string
+
+	// History can be found for files that do not exist anymore.
+	revs, err := history.Revisions(hyphaName)
+	if err == nil {
+		list = history.HistoryWithRevisions(hyphaName, revs)
+	}
+	log.Println("Found", len(revs), "revisions for", hyphaName)
+
+	util.HTTP200Page(w,
+		base(hyphaName, templates.HistoryHTML(rq, hyphaName, list)))
+}
+
+// Recent changes
+func handlerRecentChanges(w http.ResponseWriter, rq *http.Request) {
+	log.Println(rq.URL)
+	var (
+		noPrefix = strings.TrimPrefix(rq.URL.String(), "/recent-changes/")
+		n, err   = strconv.Atoi(noPrefix)
+	)
+	if err == nil && n < 101 {
+		util.HTTP200Page(w, base(strconv.Itoa(n)+" recent changes", history.RecentChanges(n)))
+	} else {
+		http.Redirect(w, rq, "/recent-changes/20", http.StatusSeeOther)
+	}
+}
diff --git a/http_readers.go b/http_readers.go
index e9bf8dc..6f7c58e 100644
--- a/http_readers.go
+++ b/http_readers.go
@@ -20,7 +20,6 @@ func init() {
 	http.HandleFunc("/page/", handlerPage)
 	http.HandleFunc("/text/", handlerText)
 	http.HandleFunc("/binary/", handlerBinary)
-	http.HandleFunc("/history/", handlerHistory)
 	http.HandleFunc("/rev/", handlerRevision)
 }
 
@@ -53,23 +52,6 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
 	w.Write([]byte(base(hyphaName, page)))
 }
 
-// handlerHistory lists all revisions of a hypha
-func handlerHistory(w http.ResponseWriter, rq *http.Request) {
-	log.Println(rq.URL)
-	hyphaName := HyphaNameFromRq(rq, "history")
-	var list string
-
-	// History can be found for files that do not exist anymore.
-	revs, err := history.Revisions(hyphaName)
-	if err == nil {
-		list = history.HistoryWithRevisions(hyphaName, revs)
-	}
-	log.Println("Found", len(revs), "revisions for", hyphaName)
-
-	util.HTTP200Page(w,
-		base(hyphaName, templates.HistoryHTML(rq, hyphaName, list)))
-}
-
 // handlerText serves raw source text of the hypha.
 func handlerText(w http.ResponseWriter, rq *http.Request) {
 	log.Println(rq.URL)
diff --git a/main.go b/main.go
index 51d7610..1215861 100644
--- a/main.go
+++ b/main.go
@@ -10,8 +10,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"strconv"
-	"strings"
 
 	"github.com/bouncepaw/mycorrhiza/history"
 	"github.com/bouncepaw/mycorrhiza/templates"
@@ -91,20 +89,6 @@ func handlerRandom(w http.ResponseWriter, rq *http.Request) {
 	http.Redirect(w, rq, "/page/"+randomHyphaName, http.StatusSeeOther)
 }
 
-// Recent changes
-func handlerRecentChanges(w http.ResponseWriter, rq *http.Request) {
-	log.Println(rq.URL)
-	var (
-		noPrefix = strings.TrimPrefix(rq.URL.String(), "/recent-changes/")
-		n, err   = strconv.Atoi(noPrefix)
-	)
-	if err == nil && n < 101 {
-		util.HTTP200Page(w, base(strconv.Itoa(n)+" recent changes", history.RecentChanges(n)))
-	} else {
-		http.Redirect(w, rq, "/recent-changes/20", http.StatusSeeOther)
-	}
-}
-
 func handlerStyle(w http.ResponseWriter, rq *http.Request) {
 	log.Println(rq.URL)
 	if _, err := os.Stat(WikiDir + "/static/common.css"); err == nil {
@@ -128,14 +112,14 @@ func main() {
 
 	history.Start(WikiDir)
 
-	http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(WikiDir+"/static"))))
-	// See http_readers.go for /page/, /text/, /binary/, /history/.
-	// See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/.
+	// See http_readers.go for /page/, /text/, /binary/
+	// See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/
 	// See http_auth.go for /login, /login-data, /logout, /logout-confirm
+	// See http_history.go for /history/, /recent-changes
 	http.HandleFunc("/list", handlerList)
 	http.HandleFunc("/reindex", handlerReindex)
 	http.HandleFunc("/random", handlerRandom)
-	http.HandleFunc("/recent-changes/", handlerRecentChanges)
+	http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(WikiDir+"/static"))))
 	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, rq *http.Request) {
 		http.ServeFile(w, rq, WikiDir+"/static/favicon.ico")
 	})
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 655f800..16def29 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -51,7 +51,7 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .transclusion code, .transclusion .codeblock {background-color:#ddd;}
 .transclusion {background-color:#eee; border-radius: .25rem; }
 .transclusion__content > *:not(.binary-container) {margin: 0.5rem; }
-.transclusion__link {display: block; text-align: right; font-style: italic; margin-top: 0.5rem; color: black; text-decoration: none;}
+.transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; color: black; text-decoration: none;}
 .transclusion__link::before {content: "⇐ ";}
 
 .binary-container_with-img img,

From 8810e9891d0eacb43de97a71693c58aa442fc467 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Tue, 8 Dec 2020 20:15:32 +0500
Subject: [PATCH 07/50] Implement RSS, Atom and JSON feeds and add a new flag

---
 flag.go                          |   9 ++-
 go.mod                           |   1 +
 go.sum                           |   2 +
 history/history.go               | 105 ++++++++++++++++++++-----------
 history/information.go           |  48 ++++++++++++++
 http_history.go                  |  29 +++++++++
 templates/asset.qtpl.go          |   1 +
 templates/default.css            |   1 +
 templates/recent_changes.qtpl    |   2 +
 templates/recent_changes.qtpl.go |  62 +++++++++---------
 util/util.go                     |   1 +
 11 files changed, 194 insertions(+), 67 deletions(-)

diff --git a/flag.go b/flag.go
index 8a9857a..2bd83ff 100644
--- a/flag.go
+++ b/flag.go
@@ -10,8 +10,9 @@ import (
 )
 
 func init() {
-	flag.StringVar(&util.ServerPort, "port", "1737", "Port to serve the wiki at")
-	flag.StringVar(&util.HomePage, "home", "home", "The home page")
+	flag.StringVar(&util.URL, "url", "http://0.0.0.0:$port", "URL at which your wiki can be found. Used to generate feeds")
+	flag.StringVar(&util.ServerPort, "port", "1737", "Port to serve the wiki at using HTTP")
+	flag.StringVar(&util.HomePage, "home", "home", "The home page name")
 	flag.StringVar(&util.SiteTitle, "title", "🍄", "How to call your wiki in the navititle")
 	flag.StringVar(&util.UserTree, "user-tree", "u", "Hypha which is a superhypha of all user pages")
 	flag.StringVar(&util.AuthMethod, "auth-method", "none", "What auth method to use. Variants: \"none\", \"fixed\"")
@@ -34,6 +35,10 @@ func parseCliArgs() {
 		log.Fatal(err)
 	}
 
+	if util.URL == "http://0.0.0.0:$port" {
+		util.URL = "http://0.0.0.0:" + util.ServerPort
+	}
+
 	if !isCanonicalName(util.HomePage) {
 		log.Fatal("Error: you must use a proper name for the homepage")
 	}
diff --git a/go.mod b/go.mod
index 995478b..b5d6fc3 100644
--- a/go.mod
+++ b/go.mod
@@ -4,5 +4,6 @@ go 1.14
 
 require (
 	github.com/adrg/xdg v0.2.2
+	github.com/gorilla/feeds v1.1.1
 	github.com/valyala/quicktemplate v1.6.3
 )
diff --git a/go.sum b/go.sum
index dbbc51b..284389c 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ github.com/adrg/xdg v0.2.2 h1:A7ZHKRz5KGOLJX/bg7IPzStryhvCzAE1wX+KWawPiAo=
 github.com/adrg/xdg v0.2.2/go.mod h1:7I2hH/IT30IsupOpKZ5ue7/qNi3CoKzD6tL3HwpaRMQ=
 github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY=
+github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
 github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/history/history.go b/history/history.go
index 247b4c5..dcd6268 100644
--- a/history/history.go
+++ b/history/history.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -13,6 +14,8 @@ import (
 	"github.com/bouncepaw/mycorrhiza/util"
 )
 
+var renameMsgPattern = regexp.MustCompile(`^Rename ‘(.*)’ to ‘.*’`)
+
 // Start initializes git credentials.
 func Start(wikiDir string) {
 	_, err := gitsh("config", "user.name", "wikimind")
@@ -27,10 +30,46 @@ func Start(wikiDir string) {
 
 // Revision represents a revision, duh. Hash is usually short. Username is extracted from email.
 type Revision struct {
-	Hash     string
-	Username string
-	Time     time.Time
-	Message  string
+	Hash              string
+	Username          string
+	Time              time.Time
+	Message           string
+	hyphaeAffectedBuf []string
+}
+
+// determine what hyphae were affected by this revision
+func (rev *Revision) hyphaeAffected() (hyphae []string) {
+	if nil != rev.hyphaeAffectedBuf {
+		return rev.hyphaeAffectedBuf
+	}
+	hyphae = make([]string, 0)
+	var (
+		// List of files affected by this revision, one per line.
+		out, err = gitsh("diff-tree", "--no-commit-id", "--name-only", "-r", rev.Hash)
+		// set is used to determine if a certain hypha has been already noted (hyphae are stored in 2 files at most currently).
+		set       = make(map[string]bool)
+		isNewName = func(hyphaName string) bool {
+			if _, present := set[hyphaName]; present {
+				return false
+			}
+			set[hyphaName] = true
+			return true
+		}
+	)
+	if err != nil {
+		return hyphae
+	}
+	for _, filename := range strings.Split(out.String(), "\n") {
+		if strings.IndexRune(filename, '.') >= 0 {
+			dotPos := strings.LastIndexByte(filename, '.')
+			hyphaName := string([]byte(filename)[0:dotPos]) // is it safe?
+			if isNewName(hyphaName) {
+				hyphae = append(hyphae, hyphaName)
+			}
+		}
+	}
+	rev.hyphaeAffectedBuf = hyphae
+	return hyphae
 }
 
 // TimeString returns a human readable time representation.
@@ -40,42 +79,38 @@ func (rev Revision) TimeString() string {
 
 // HyphaeLinks returns a comma-separated list of hyphae that were affected by this revision as HTML string.
 func (rev Revision) HyphaeLinks() (html string) {
-	// diff-tree --no-commit-id --name-only -r
-	var (
-		// List of files affected by this revision, one per line.
-		out, err = gitsh("diff-tree", "--no-commit-id", "--name-only", "-r", rev.Hash)
-		// set is used to determine if a certain hypha has been already noted (hyphae are stored in 2 files at most).
-		set       = make(map[string]bool)
-		isNewName = func(hyphaName string) bool {
-			if _, present := set[hyphaName]; present {
-				return false
-			} else {
-				set[hyphaName] = true
-				return true
-			}
-		}
-	)
-	if err != nil {
-		return ""
-	}
-	for _, filename := range strings.Split(out.String(), "\n") {
-		// If filename has an ampersand:
-		if strings.IndexRune(filename, '.') >= 0 {
-			// Remove ampersanded suffix from filename:
-			ampersandPos := strings.LastIndexByte(filename, '.')
-			hyphaName := string([]byte(filename)[0:ampersandPos]) // is it safe?
-			if isNewName(hyphaName) {
-				// Entries are separated by commas
-				if len(set) > 1 {
-					html += `<span aria-hidden="true">, </span>`
-				}
-				html += fmt.Sprintf(`<a href="/page/%[1]s">%[1]s</a>`, hyphaName)
-			}
+	hyphae := rev.hyphaeAffected()
+	for i, hyphaName := range hyphae {
+		if i > 0 {
+			html += `<span aria-hidden="true">, </span>`
 		}
+		html += fmt.Sprintf(`<a href="/page/%[1]s">%[1]s</a>`, hyphaName)
 	}
 	return html
 }
 
+func (rev *Revision) descriptionForFeed() (html string) {
+	return fmt.Sprintf(
+		`<p>%s</p>
+<p><b>Hyphae affected:</b> %s</p>`, rev.Message, rev.HyphaeLinks())
+}
+
+// Try and guess what link is the most important by looking at the message.
+func (rev *Revision) bestLink() string {
+	var (
+		revs      = rev.hyphaeAffected()
+		renameRes = renameMsgPattern.FindStringSubmatch(rev.Message)
+	)
+	switch {
+	case renameRes != nil:
+		return "/page/" + renameRes[1]
+	case len(revs) == 0:
+		return ""
+	default:
+		return "/page/" + revs[0]
+	}
+}
+
 func (rev Revision) RecentChangesEntry() (html string) {
 	if user.AuthUsed && rev.Username != "anon" {
 		return fmt.Sprintf(`
diff --git a/history/information.go b/history/information.go
index 80d5b5d..82c0eb3 100644
--- a/history/information.go
+++ b/history/information.go
@@ -11,8 +11,56 @@ import (
 
 	"github.com/bouncepaw/mycorrhiza/templates"
 	"github.com/bouncepaw/mycorrhiza/util"
+	"github.com/gorilla/feeds"
 )
 
+func recentChangesFeed() *feeds.Feed {
+	feed := &feeds.Feed{
+		Title:       "Recent changes",
+		Link:        &feeds.Link{Href: util.URL},
+		Description: "List of 30 recent changes on the wiki",
+		Author:      &feeds.Author{Name: "Wikimind", Email: "wikimind@mycorrhiza"},
+		Updated:     time.Now(),
+	}
+	var (
+		out, err = gitsh(
+			"log", "--oneline", "--no-merges",
+			"--pretty=format:\"%h\t%ae\t%at\t%s\"",
+			"--max-count=30",
+		)
+		revs []Revision
+	)
+	if err == nil {
+		for _, line := range strings.Split(out.String(), "\n") {
+			revs = append(revs, parseRevisionLine(line))
+		}
+	}
+	for _, rev := range revs {
+		feed.Add(&feeds.Item{
+			Title:       rev.Message,
+			Author:      &feeds.Author{Name: rev.Username},
+			Id:          rev.Hash,
+			Description: rev.descriptionForFeed(),
+			Created:     rev.Time,
+			Updated:     rev.Time,
+			Link:        &feeds.Link{Href: util.URL + rev.bestLink()},
+		})
+	}
+	return feed
+}
+
+func RecentChangesRSS() (string, error) {
+	return recentChangesFeed().ToRss()
+}
+
+func RecentChangesAtom() (string, error) {
+	return recentChangesFeed().ToAtom()
+}
+
+func RecentChangesJSON() (string, error) {
+	return recentChangesFeed().ToJSON()
+}
+
 func RecentChanges(n int) string {
 	var (
 		out, err = gitsh(
diff --git a/http_history.go b/http_history.go
index 8bec1ae..de010d5 100644
--- a/http_history.go
+++ b/http_history.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"net/http"
 	"strconv"
@@ -14,6 +15,9 @@ import (
 func init() {
 	http.HandleFunc("/history/", handlerHistory)
 	http.HandleFunc("/recent-changes/", handlerRecentChanges)
+	http.HandleFunc("/recent-changes-rss", handlerRecentChangesRSS)
+	http.HandleFunc("/recent-changes-atom", handlerRecentChangesAtom)
+	http.HandleFunc("/recent-changes-json", handlerRecentChangesJSON)
 }
 
 // handlerHistory lists all revisions of a hypha
@@ -46,3 +50,28 @@ func handlerRecentChanges(w http.ResponseWriter, rq *http.Request) {
 		http.Redirect(w, rq, "/recent-changes/20", http.StatusSeeOther)
 	}
 }
+
+func genericHandlerOfFeeds(w http.ResponseWriter, rq *http.Request, f func() (string, error), name string) {
+	log.Println(rq.URL)
+	if content, err := f(); err != nil {
+		w.Header().Set("Content-Type", "text/plain;charset=utf-8")
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprint(w, "An error while generating "+name+": "+err.Error())
+	} else {
+		w.Header().Set("Content-Type", "application/rss+xml")
+		w.WriteHeader(http.StatusOK)
+		fmt.Fprint(w, content)
+	}
+}
+
+func handlerRecentChangesRSS(w http.ResponseWriter, rq *http.Request) {
+	genericHandlerOfFeeds(w, rq, history.RecentChangesRSS, "RSS")
+}
+
+func handlerRecentChangesAtom(w http.ResponseWriter, rq *http.Request) {
+	genericHandlerOfFeeds(w, rq, history.RecentChangesAtom, "Atom")
+}
+
+func handlerRecentChangesJSON(w http.ResponseWriter, rq *http.Request) {
+	genericHandlerOfFeeds(w, rq, history.RecentChangesJSON, "JSON feed")
+}
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 16def29..a90d0ab 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -39,6 +39,7 @@ textarea {font-size:15px;}
 .edit {height:100%;}
 .edit-form {height:90%;}
 .edit-form textarea {width:100%;height:90%;}
+.icon {margin-right: .25rem; vertical-align: bottom; }
 
 main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
diff --git a/templates/default.css b/templates/default.css
index 5d5c6e2..a7c0f07 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -14,6 +14,7 @@ textarea {font-size:15px;}
 .edit {height:100%;}
 .edit-form {height:90%;}
 .edit-form textarea {width:100%;height:90%;}
+.icon {margin-right: .25rem; vertical-align: bottom; }
 
 main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
diff --git a/templates/recent_changes.qtpl b/templates/recent_changes.qtpl
index 738f39a..2980fd4 100644
--- a/templates/recent_changes.qtpl
+++ b/templates/recent_changes.qtpl
@@ -18,6 +18,8 @@
 		recent changes
 	</nav>
 
+	<p><img class="icon" width="20" height="20" src="https://upload.wikimedia.org/wikipedia/commons/4/46/Generic_Feed-icon.svg">Subscribe via <a href="/recent-changes-rss">RSS</a>, <a href="/recent-changes-atom">Atom</a> or <a href="/recent-changes-json">JSON feed</a>.</p>
+
 	{% comment %}
 		Here I am, willing to add some accesibility using ARIA. Turns out,
 		role="feed" is not supported in any screen reader as of September
diff --git a/templates/recent_changes.qtpl.go b/templates/recent_changes.qtpl.go
index 8268ef1..329ccc5 100644
--- a/templates/recent_changes.qtpl.go
+++ b/templates/recent_changes.qtpl.go
@@ -77,81 +77,83 @@ func StreamRecentChangesHTML(qw422016 *qt422016.Writer, changes []string, n int)
 		recent changes
 	</nav>
 
+	<p><img class="icon" width="20" height="20" src="https://upload.wikimedia.org/wikipedia/commons/4/46/Generic_Feed-icon.svg">Subscribe via <a href="/recent-changes-rss">RSS</a>, <a href="/recent-changes-atom">Atom</a> or <a href="/recent-changes-json">JSON feed</a>.</p>
+
 	`)
-//line templates/recent_changes.qtpl:26
+//line templates/recent_changes.qtpl:28
 	qw422016.N().S(`
 
 	<section class="recent-changes__list" role="feed">
 	`)
-//line templates/recent_changes.qtpl:29
+//line templates/recent_changes.qtpl:31
 	if len(changes) == 0 {
-//line templates/recent_changes.qtpl:29
+//line templates/recent_changes.qtpl:31
 		qw422016.N().S(`
 		<p>Could not find any recent changes.</p>
 	`)
-//line templates/recent_changes.qtpl:31
+//line templates/recent_changes.qtpl:33
 	} else {
-//line templates/recent_changes.qtpl:31
+//line templates/recent_changes.qtpl:33
 		qw422016.N().S(`
 		`)
-//line templates/recent_changes.qtpl:32
+//line templates/recent_changes.qtpl:34
 		for i, entry := range changes {
-//line templates/recent_changes.qtpl:32
+//line templates/recent_changes.qtpl:34
 			qw422016.N().S(`
 		<ul class="recent-changes__entry rc-entry" role="article"
 		    aria-setsize="`)
-//line templates/recent_changes.qtpl:34
+//line templates/recent_changes.qtpl:36
 			qw422016.N().D(n)
-//line templates/recent_changes.qtpl:34
+//line templates/recent_changes.qtpl:36
 			qw422016.N().S(`" aria-posinset="`)
-//line templates/recent_changes.qtpl:34
+//line templates/recent_changes.qtpl:36
 			qw422016.N().D(i)
-//line templates/recent_changes.qtpl:34
+//line templates/recent_changes.qtpl:36
 			qw422016.N().S(`">
 			 `)
-//line templates/recent_changes.qtpl:35
+//line templates/recent_changes.qtpl:37
 			qw422016.N().S(entry)
-//line templates/recent_changes.qtpl:35
+//line templates/recent_changes.qtpl:37
 			qw422016.N().S(`
 		</ul>
 		`)
-//line templates/recent_changes.qtpl:37
+//line templates/recent_changes.qtpl:39
 		}
-//line templates/recent_changes.qtpl:37
+//line templates/recent_changes.qtpl:39
 		qw422016.N().S(`
 	`)
-//line templates/recent_changes.qtpl:38
+//line templates/recent_changes.qtpl:40
 	}
-//line templates/recent_changes.qtpl:38
+//line templates/recent_changes.qtpl:40
 	qw422016.N().S(`
 	</section>
 </main>
 `)
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 }
 
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 func WriteRecentChangesHTML(qq422016 qtio422016.Writer, changes []string, n int) {
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 	StreamRecentChangesHTML(qw422016, changes, n)
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 	qt422016.ReleaseWriter(qw422016)
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 }
 
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 func RecentChangesHTML(changes []string, n int) string {
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 	WriteRecentChangesHTML(qb422016, changes, n)
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 	qs422016 := string(qb422016.B)
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 	return qs422016
-//line templates/recent_changes.qtpl:41
+//line templates/recent_changes.qtpl:43
 }
diff --git a/util/util.go b/util/util.go
index 745bf96..032e9f7 100644
--- a/util/util.go
+++ b/util/util.go
@@ -8,6 +8,7 @@ import (
 )
 
 var (
+	URL                  string
 	ServerPort           string
 	HomePage             string
 	SiteTitle            string

From 37eb3d1c772dd60cbf7ec9fb1bd8996e0dbb5223 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Tue, 8 Dec 2020 20:26:18 +0500
Subject: [PATCH 08/50] Update README.md

---
 README.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 784c616..69e179b 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,8 @@ Options:
         Port to serve the wiki at (default "1737")
   -title string
         How to call your wiki in the navititle (default "🍄")
+  -url string
+        URL at which your wiki can be found. Used to generate feeds (default "http://0.0.0.0:$port")
   -user-tree string
         Hypha which is a superhypha of all user pages (default "u")
 ```
@@ -37,16 +39,16 @@ Options:
 * Responsive design
 * Works in text browsers
 * Wiki pages (called hyphae) are written in mycomarkup
-* Everything is stored as simple files, no database required. You can run a wiki on almost any directory and get something to work with.
-* Page trees
+* Everything is stored as simple files, no database required. You can run a wiki on almost any directory and get something to work with
+* Page trees; links to previous and next pages
 * Changes are saved to git
 * List of hyphae page
 * History page
 * Random page
-* Recent changes page
+* Recent changes page; RSS, Atom and JSON feeds available
 * Hyphae can be deleted (while still preserving history)
 * Hyphae can be renamed (recursive renaming of subhyphae is also supported)
-* Light on resources: I run a home wiki on this engine 24/7 at an [Orange π Lite](http://www.orangepi.org/orangepilite/).
+* Light on resources: I run a home wiki on this engine 24/7 at an [Orange π Lite](http://www.orangepi.org/orangepilite/)
 * Authorization with pre-set credentials
 
 ## Contributing

From 8ac27fc38572f8a7ba35c6a95ca49ec20c07145a Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Tue, 15 Dec 2020 23:59:36 +0500
Subject: [PATCH 09/50] Improve links visually

---
 main.go                                 |  30 ++++
 markup/lexer.go                         |  28 +++-
 markup/link.go                          |   9 +-
 markup/mycomarkup.go                    |  14 +-
 templates/asset.qtpl                    |  18 +++
 templates/asset.qtpl.go                 | 180 +++++++++++++++++++++++-
 templates/default.css                   |   6 +-
 templates/icon/gemini-protocol-icon.svg |   1 +
 templates/icon/gopher-protocol-icon.svg |  11 ++
 templates/icon/http-protocol-icon.svg   |   1 +
 templates/icon/mailto-protocol-icon.svg |   1 +
 11 files changed, 287 insertions(+), 12 deletions(-)
 create mode 100644 templates/icon/gemini-protocol-icon.svg
 create mode 100644 templates/icon/gopher-protocol-icon.svg
 create mode 100644 templates/icon/http-protocol-icon.svg
 create mode 100644 templates/icon/mailto-protocol-icon.svg

diff --git a/main.go b/main.go
index 1215861..d368bb0 100644
--- a/main.go
+++ b/main.go
@@ -4,12 +4,14 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"log"
 	"math/rand"
 	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"
 
 	"github.com/bouncepaw/mycorrhiza/history"
 	"github.com/bouncepaw/mycorrhiza/templates"
@@ -99,6 +101,33 @@ func handlerStyle(w http.ResponseWriter, rq *http.Request) {
 	}
 }
 
+func handlerIcon(w http.ResponseWriter, rq *http.Request) {
+	iconName := strings.TrimPrefix(rq.URL.Path, "/static/icon/")
+	if iconName == "https" {
+		iconName = "http"
+	}
+	files, err := ioutil.ReadDir(WikiDir + "/static/icon")
+	if err == nil {
+		for _, f := range files {
+			if strings.HasPrefix(f.Name(), iconName+"-protocol-icon") {
+				http.ServeFile(w, rq, WikiDir+"/static/icon/"+f.Name())
+				return
+			}
+		}
+	}
+	w.Header().Set("Content-Type", "image/svg+xml")
+	switch iconName {
+	case "gemini":
+		w.Write([]byte(templates.IconGemini()))
+	case "mailto":
+		w.Write([]byte(templates.IconMailto()))
+	case "gopher":
+		w.Write([]byte(templates.IconGopher()))
+	default:
+		w.Write([]byte(templates.IconHTTP()))
+	}
+}
+
 func main() {
 	log.Println("Running MycorrhizaWiki β")
 	parseCliArgs()
@@ -124,6 +153,7 @@ func main() {
 		http.ServeFile(w, rq, WikiDir+"/static/favicon.ico")
 	})
 	http.HandleFunc("/static/common.css", handlerStyle)
+	http.HandleFunc("/static/icon/", handlerIcon)
 	http.HandleFunc("/", func(w http.ResponseWriter, rq *http.Request) {
 		http.Redirect(w, rq, "/page/"+util.HomePage, http.StatusSeeOther)
 	})
diff --git a/markup/lexer.go b/markup/lexer.go
index 08476d6..9ff58f5 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -59,6 +59,9 @@ func geminiLineToAST(line string, state *GemLexerState, ast *[]Line) {
 			addLine(state.buf + "</ol>")
 		case "pre":
 			state.buf += "\n"
+		case "launchpad":
+			state.where = ""
+			addLine(state.buf + "</ul>")
 		}
 		return
 	}
@@ -80,6 +83,8 @@ func geminiLineToAST(line string, state *GemLexerState, ast *[]Line) {
 		goto listState
 	case "number":
 		goto numberState
+	case "launchpad":
+		goto launchpadState
 	default:
 		goto normalState
 	}
@@ -135,6 +140,23 @@ numberState:
 	}
 	return
 
+launchpadState:
+	switch {
+	case startsWith("=>"):
+		href, text, class := Rocketlink(line, state.name)
+		state.buf += fmt.Sprintf(`	<li class="launchpad__entry"><a class="rocketlink %s" href="%s">%s</a></li>`, class, href, text)
+	case startsWith("```"):
+		state.where = "pre"
+		addLine(state.buf + "</ul>")
+		state.id++
+		state.buf = fmt.Sprintf("<pre id='%d' alt='%s' class='codeblock'><code>", state.id, strings.TrimPrefix(line, "```"))
+	default:
+		state.where = ""
+		addLine(state.buf + "</ul>")
+		goto normalState
+	}
+	return
+
 normalState:
 	state.id++
 	switch {
@@ -168,9 +190,9 @@ normalState:
 		addLine(fmt.Sprintf(
 			"<blockquote id='%d'>%s</blockquote>", state.id, remover(">")(line)))
 	case startsWith("=>"):
-		href, text, class := Rocketlink(line, state.name)
-		addLine(fmt.Sprintf(
-			`<p><a id='%d' class='rocketlink %s' href="%s">%s</a></p>`, state.id, class, href, text))
+		state.where = "launchpad"
+		state.buf = fmt.Sprintf("<ul class='launchpad' id='%d'>\n", state.id)
+		goto launchpadState
 
 	case startsWith("<="):
 		addLine(parseTransclusion(line, state.name))
diff --git a/markup/link.go b/markup/link.go
index eb52c63..ef91e68 100644
--- a/markup/link.go
+++ b/markup/link.go
@@ -1,6 +1,7 @@
 package markup
 
 import (
+	"fmt"
 	"path"
 	"strings"
 )
@@ -19,7 +20,13 @@ func LinkParts(addr, display, hyphaName string) (href, text, class string) {
 
 	switch {
 	case strings.ContainsRune(addr, ':'):
-		return addr, text, "wikilink_external"
+		pos := strings.IndexRune(addr, ':')
+		destination := addr[:pos]
+		text = addr[pos+1:]
+		if strings.HasPrefix(text, "//") && len(text) > 2 {
+			text = text[2:]
+		}
+		return addr, text + fmt.Sprintf(`<img class="wikilink__destination-type" src="/static/icon/%s" width="16" height="16"/>`, destination), "wikilink_external"
 	case strings.HasPrefix(addr, "/"):
 		return addr, text, class
 	case strings.HasPrefix(addr, "./"):
diff --git a/markup/mycomarkup.go b/markup/mycomarkup.go
index fa47e2b..f3fb7a2 100644
--- a/markup/mycomarkup.go
+++ b/markup/mycomarkup.go
@@ -11,11 +11,6 @@ type MycoDoc struct {
 	// data
 	hyphaName string
 	contents  string
-
-	// state
-	recursionDepth int
-
-	// results
 }
 
 // Constructor
@@ -27,10 +22,17 @@ func Doc(hyphaName, contents string) *MycoDoc {
 }
 
 // AsHtml returns an html representation of the document
-func (md *MycoDoc) AsHtml() string {
+func (md *MycoDoc) AsHTML() string {
 	return ""
 }
 
+// OpenGraphHTML returns an html representation of og: meta tags.
+func (md *MycoDoc) OpenGraphHTML() string {
+	return ""
+}
+
+/* The rest of this file is currently unused. TODO: use it I guess */
+
 type BlockType int
 
 const (
diff --git a/templates/asset.qtpl b/templates/asset.qtpl
index 91e873f..2e6b4f2 100644
--- a/templates/asset.qtpl
+++ b/templates/asset.qtpl
@@ -1,3 +1,21 @@
 {% func DefaultCSS() %}
 {% cat "default.css" %}
 {% endfunc %}
+
+Next three are from https://remixicon.com/
+{% func IconHTTP() %}
+{% cat "icon/http-protocol-icon.svg" %}
+{% endfunc %}
+
+{% func IconGemini() %}
+{% cat "icon/gemini-protocol-icon.svg" %}
+{% endfunc %}
+
+{% func IconMailto() %}
+{% cat "icon/mailto-protocol-icon.svg" %}
+{% endfunc %}
+
+This is a modified version of https://www.svgrepo.com/svg/232085/rat
+{% func IconGopher() %}
+{% cat "icon/gopher-protocol-icon.svg" %}
+{% endfunc %}
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index a90d0ab..dc09918 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -45,7 +45,8 @@ main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
 .wikilink_new {color:#a55858;}
 .wikilink_new:visited {color:#a55858;}
-.wikilink_external::after {content:"🌐"; margin-left: .5rem; font-size: small; text-decoration: none; align: bottom;}
+.wikilink__destination-type {display: inline; margin-left: .5rem; vertical-align: sub; }
+
 article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
 article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
 .codeblock code {padding:0; font-size:15px;}
@@ -55,6 +56,9 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; color: black; text-decoration: none;}
 .transclusion__link::before {content: "⇐ ";}
 
+.launchpad { position: relative; list-style: none; }
+.launchpad li::before { content: '⇒'; position: absolute; left: 0; }
+
 .binary-container_with-img img,
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
@@ -121,3 +125,177 @@ func DefaultCSS() string {
 	return qs422016
 //line templates/asset.qtpl:3
 }
+
+// Next three are from https://remixicon.com/
+
+//line templates/asset.qtpl:6
+func StreamIconHTTP(qw422016 *qt422016.Writer) {
+//line templates/asset.qtpl:6
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:7
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
+`)
+//line templates/asset.qtpl:7
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:8
+}
+
+//line templates/asset.qtpl:8
+func WriteIconHTTP(qq422016 qtio422016.Writer) {
+//line templates/asset.qtpl:8
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line templates/asset.qtpl:8
+	StreamIconHTTP(qw422016)
+//line templates/asset.qtpl:8
+	qt422016.ReleaseWriter(qw422016)
+//line templates/asset.qtpl:8
+}
+
+//line templates/asset.qtpl:8
+func IconHTTP() string {
+//line templates/asset.qtpl:8
+	qb422016 := qt422016.AcquireByteBuffer()
+//line templates/asset.qtpl:8
+	WriteIconHTTP(qb422016)
+//line templates/asset.qtpl:8
+	qs422016 := string(qb422016.B)
+//line templates/asset.qtpl:8
+	qt422016.ReleaseByteBuffer(qb422016)
+//line templates/asset.qtpl:8
+	return qs422016
+//line templates/asset.qtpl:8
+}
+
+//line templates/asset.qtpl:10
+func StreamIconGemini(qw422016 *qt422016.Writer) {
+//line templates/asset.qtpl:10
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:11
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M15.502 20A6.523 6.523 0 0 1 12 23.502 6.523 6.523 0 0 1 8.498 20h2.26c.326.489.747.912 1.242 1.243.495-.33.916-.754 1.243-1.243h2.259zM18 14.805l2 2.268V19H4v-1.927l2-2.268V9c0-3.483 2.504-6.447 6-7.545C15.496 2.553 18 5.517 18 9v5.805zM17.27 17L16 15.56V9c0-2.318-1.57-4.43-4-5.42C9.57 4.57 8 6.681 8 9v6.56L6.73 17h10.54zM12 11a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/></svg>
+`)
+//line templates/asset.qtpl:11
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:12
+}
+
+//line templates/asset.qtpl:12
+func WriteIconGemini(qq422016 qtio422016.Writer) {
+//line templates/asset.qtpl:12
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line templates/asset.qtpl:12
+	StreamIconGemini(qw422016)
+//line templates/asset.qtpl:12
+	qt422016.ReleaseWriter(qw422016)
+//line templates/asset.qtpl:12
+}
+
+//line templates/asset.qtpl:12
+func IconGemini() string {
+//line templates/asset.qtpl:12
+	qb422016 := qt422016.AcquireByteBuffer()
+//line templates/asset.qtpl:12
+	WriteIconGemini(qb422016)
+//line templates/asset.qtpl:12
+	qs422016 := string(qb422016.B)
+//line templates/asset.qtpl:12
+	qt422016.ReleaseByteBuffer(qb422016)
+//line templates/asset.qtpl:12
+	return qs422016
+//line templates/asset.qtpl:12
+}
+
+//line templates/asset.qtpl:14
+func StreamIconMailto(qw422016 *qt422016.Writer) {
+//line templates/asset.qtpl:14
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:15
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm17 4.238l-7.928 7.1L4 7.216V19h16V7.238zM4.511 5l7.55 6.662L19.502 5H4.511z"/></svg>
+`)
+//line templates/asset.qtpl:15
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:16
+}
+
+//line templates/asset.qtpl:16
+func WriteIconMailto(qq422016 qtio422016.Writer) {
+//line templates/asset.qtpl:16
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line templates/asset.qtpl:16
+	StreamIconMailto(qw422016)
+//line templates/asset.qtpl:16
+	qt422016.ReleaseWriter(qw422016)
+//line templates/asset.qtpl:16
+}
+
+//line templates/asset.qtpl:16
+func IconMailto() string {
+//line templates/asset.qtpl:16
+	qb422016 := qt422016.AcquireByteBuffer()
+//line templates/asset.qtpl:16
+	WriteIconMailto(qb422016)
+//line templates/asset.qtpl:16
+	qs422016 := string(qb422016.B)
+//line templates/asset.qtpl:16
+	qt422016.ReleaseByteBuffer(qb422016)
+//line templates/asset.qtpl:16
+	return qs422016
+//line templates/asset.qtpl:16
+}
+
+// This is a modified version of https://www.svgrepo.com/svg/232085/rat
+
+//line templates/asset.qtpl:19
+func StreamIconGopher(qw422016 *qt422016.Writer) {
+//line templates/asset.qtpl:19
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:20
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="24" height="24">
+<path d="M447.238,204.944v-70.459c0-8.836-7.164-16-16-16c-34.051,0-64.414,21.118-75.079,55.286
+C226.094,41.594,0,133.882,0,319.435c0,0.071,0.01,0.14,0.011,0.21c0.116,44.591,36.423,80.833,81.04,80.833h171.203
+c8.836,0,16-7.164,16-16c0-8.836-7.164-16-16-16H81.051c-21.441,0-39.7-13.836-46.351-33.044H496c8.836,0,16-7.164,16-16
+C512,271.82,486.82,228.692,447.238,204.944z M415.238,153.216v37.805c-10.318-2.946-19.556-4.305-29.342-4.937
+C390.355,168.611,402.006,157.881,415.238,153.216z M295.484,303.435L295.484,303.435c-7.562-41.495-43.948-73.062-87.593-73.062
+c-8.836,0-16,7.164-16,16c0,8.836,7.164,16,16,16c25.909,0,47.826,17.364,54.76,41.062H32.722
+c14.415-159.15,218.064-217.856,315.136-90.512c3.545,4.649,9.345,6.995,15.124,6.118
+c55.425-8.382,107.014,29.269,115.759,84.394H295.484z"/>
+<circle cx="415.238" cy="260.05" r="21.166"/>
+</svg>
+`)
+//line templates/asset.qtpl:20
+	qw422016.N().S(`
+`)
+//line templates/asset.qtpl:21
+}
+
+//line templates/asset.qtpl:21
+func WriteIconGopher(qq422016 qtio422016.Writer) {
+//line templates/asset.qtpl:21
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line templates/asset.qtpl:21
+	StreamIconGopher(qw422016)
+//line templates/asset.qtpl:21
+	qt422016.ReleaseWriter(qw422016)
+//line templates/asset.qtpl:21
+}
+
+//line templates/asset.qtpl:21
+func IconGopher() string {
+//line templates/asset.qtpl:21
+	qb422016 := qt422016.AcquireByteBuffer()
+//line templates/asset.qtpl:21
+	WriteIconGopher(qb422016)
+//line templates/asset.qtpl:21
+	qs422016 := string(qb422016.B)
+//line templates/asset.qtpl:21
+	qt422016.ReleaseByteBuffer(qb422016)
+//line templates/asset.qtpl:21
+	return qs422016
+//line templates/asset.qtpl:21
+}
diff --git a/templates/default.css b/templates/default.css
index a7c0f07..bc1c814 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -20,7 +20,8 @@ main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
 .wikilink_new {color:#a55858;}
 .wikilink_new:visited {color:#a55858;}
-.wikilink_external::after {content:"🌐"; margin-left: .5rem; font-size: small; text-decoration: none; align: bottom;}
+.wikilink__destination-type {display: inline; margin-left: .5rem; vertical-align: sub; }
+
 article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
 article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
 .codeblock code {padding:0; font-size:15px;}
@@ -30,6 +31,9 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; color: black; text-decoration: none;}
 .transclusion__link::before {content: "⇐ ";}
 
+.launchpad { position: relative; list-style: none; }
+.launchpad li::before { content: '⇒'; position: absolute; left: 0; }
+
 .binary-container_with-img img,
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
diff --git a/templates/icon/gemini-protocol-icon.svg b/templates/icon/gemini-protocol-icon.svg
new file mode 100644
index 0000000..70beccb
--- /dev/null
+++ b/templates/icon/gemini-protocol-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M15.502 20A6.523 6.523 0 0 1 12 23.502 6.523 6.523 0 0 1 8.498 20h2.26c.326.489.747.912 1.242 1.243.495-.33.916-.754 1.243-1.243h2.259zM18 14.805l2 2.268V19H4v-1.927l2-2.268V9c0-3.483 2.504-6.447 6-7.545C15.496 2.553 18 5.517 18 9v5.805zM17.27 17L16 15.56V9c0-2.318-1.57-4.43-4-5.42C9.57 4.57 8 6.681 8 9v6.56L6.73 17h10.54zM12 11a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/></svg>
diff --git a/templates/icon/gopher-protocol-icon.svg b/templates/icon/gopher-protocol-icon.svg
new file mode 100644
index 0000000..bce1a36
--- /dev/null
+++ b/templates/icon/gopher-protocol-icon.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="24" height="24">
+<path d="M447.238,204.944v-70.459c0-8.836-7.164-16-16-16c-34.051,0-64.414,21.118-75.079,55.286
+C226.094,41.594,0,133.882,0,319.435c0,0.071,0.01,0.14,0.011,0.21c0.116,44.591,36.423,80.833,81.04,80.833h171.203
+c8.836,0,16-7.164,16-16c0-8.836-7.164-16-16-16H81.051c-21.441,0-39.7-13.836-46.351-33.044H496c8.836,0,16-7.164,16-16
+C512,271.82,486.82,228.692,447.238,204.944z M415.238,153.216v37.805c-10.318-2.946-19.556-4.305-29.342-4.937
+C390.355,168.611,402.006,157.881,415.238,153.216z M295.484,303.435L295.484,303.435c-7.562-41.495-43.948-73.062-87.593-73.062
+c-8.836,0-16,7.164-16,16c0,8.836,7.164,16,16,16c25.909,0,47.826,17.364,54.76,41.062H32.722
+c14.415-159.15,218.064-217.856,315.136-90.512c3.545,4.649,9.345,6.995,15.124,6.118
+c55.425-8.382,107.014,29.269,115.759,84.394H295.484z"/>
+<circle cx="415.238" cy="260.05" r="21.166"/>
+</svg>
diff --git a/templates/icon/http-protocol-icon.svg b/templates/icon/http-protocol-icon.svg
new file mode 100644
index 0000000..d4af44a
--- /dev/null
+++ b/templates/icon/http-protocol-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
diff --git a/templates/icon/mailto-protocol-icon.svg b/templates/icon/mailto-protocol-icon.svg
new file mode 100644
index 0000000..424021c
--- /dev/null
+++ b/templates/icon/mailto-protocol-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm17 4.238l-7.928 7.1L4 7.216V19h16V7.238zM4.511 5l7.55 6.662L19.502 5H4.511z"/></svg>

From df26dfe511bc240fd337edeaa1ab9cc068f3d3a0 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Wed, 16 Dec 2020 00:05:51 +0500
Subject: [PATCH 10/50] Fix icons being escaped in paragraphs

---
 markup/lexer.go     |  4 ++--
 markup/link.go      | 10 +++++-----
 markup/paragraph.go |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/markup/lexer.go b/markup/lexer.go
index 9ff58f5..6ba3b94 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -143,8 +143,8 @@ numberState:
 launchpadState:
 	switch {
 	case startsWith("=>"):
-		href, text, class := Rocketlink(line, state.name)
-		state.buf += fmt.Sprintf(`	<li class="launchpad__entry"><a class="rocketlink %s" href="%s">%s</a></li>`, class, href, text)
+		href, text, class, icon := Rocketlink(line, state.name)
+		state.buf += fmt.Sprintf(`	<li class="launchpad__entry"><a class="rocketlink %s" href="%s">%s%s</a></li>`, class, href, text, icon)
 	case startsWith("```"):
 		state.where = "pre"
 		addLine(state.buf + "</ul>")
diff --git a/markup/link.go b/markup/link.go
index ef91e68..8aac40c 100644
--- a/markup/link.go
+++ b/markup/link.go
@@ -10,7 +10,7 @@ import (
 //
 // => addr display
 // [[addr|display]]
-func LinkParts(addr, display, hyphaName string) (href, text, class string) {
+func LinkParts(addr, display, hyphaName string) (href, text, class, icon string) {
 	if display == "" {
 		text = addr
 	} else {
@@ -26,9 +26,9 @@ func LinkParts(addr, display, hyphaName string) (href, text, class string) {
 		if strings.HasPrefix(text, "//") && len(text) > 2 {
 			text = text[2:]
 		}
-		return addr, text + fmt.Sprintf(`<img class="wikilink__destination-type" src="/static/icon/%s" width="16" height="16"/>`, destination), "wikilink_external"
+		return addr, text, "wikilink_external", fmt.Sprintf(`<img class="wikilink__destination-type" src="/static/icon/%s" width="16" height="16"/>`, destination)
 	case strings.HasPrefix(addr, "/"):
-		return addr, text, class
+		return addr, text, class, ""
 	case strings.HasPrefix(addr, "./"):
 		hyphaName = canonicalName(path.Join(hyphaName, addr[2:]))
 	case strings.HasPrefix(addr, "../"):
@@ -39,12 +39,12 @@ func LinkParts(addr, display, hyphaName string) (href, text, class string) {
 	if !HyphaExists(hyphaName) {
 		class += " wikilink_new"
 	}
-	return "/page/" + hyphaName, text, class
+	return "/page/" + hyphaName, text, class, ""
 }
 
 // Parse markup line starting with "=>" according to wikilink rules.
 // See http://localhost:1737/page/wikilink
-func Rocketlink(src, hyphaName string) (href, text, class string) {
+func Rocketlink(src, hyphaName string) (href, text, class, icon string) {
 	src = strings.TrimSpace(src[2:]) // Drop =>
 	if src == "" {
 		return
diff --git a/markup/paragraph.go b/markup/paragraph.go
index 8f90085..88d5e43 100644
--- a/markup/paragraph.go
+++ b/markup/paragraph.go
@@ -56,8 +56,8 @@ func getLinkNode(input *bytes.Buffer, hyphaName string) string {
 			currBuf.WriteByte(b)
 		}
 	}
-	href, text, class := LinkParts(addrBuf.String(), displayBuf.String(), hyphaName)
-	return fmt.Sprintf(`<a href="%s" class="%s">%s</a>`, href, class, html.EscapeString(text))
+	href, text, class, icon := LinkParts(addrBuf.String(), displayBuf.String(), hyphaName)
+	return fmt.Sprintf(`<a href="%s" class="%s">%s%s</a>`, href, class, html.EscapeString(text), icon)
 }
 
 // getTextNode splits the `input` into two parts `textNode` and `rest` by the first encountered rune that resembles a span tag. If there is none, `textNode = input`, `rest = ""`. It handles escaping with backslash.

From 7b9375da3961924261a653193daa71660569d7de Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 17 Dec 2020 17:59:59 +0500
Subject: [PATCH 11/50] Implement OpenGraph meta tags

---
 flag.go                      |   2 +-
 http_readers.go              |  19 +++--
 hypha.go                     |   6 ++
 markup/img.go                |  10 +++
 markup/lexer.go              |  15 ++--
 markup/mycomarkup.go         |  61 ++++++++++++++-
 markup/parser.go             |  19 +----
 markup/xclusion.go           |   9 ++-
 templates/http_stuff.qtpl    |   3 +-
 templates/http_stuff.qtpl.go | 141 +++++++++++++++++++----------------
 10 files changed, 183 insertions(+), 102 deletions(-)

diff --git a/flag.go b/flag.go
index 2bd83ff..551e0cf 100644
--- a/flag.go
+++ b/flag.go
@@ -10,7 +10,7 @@ import (
 )
 
 func init() {
-	flag.StringVar(&util.URL, "url", "http://0.0.0.0:$port", "URL at which your wiki can be found. Used to generate feeds")
+	flag.StringVar(&util.URL, "url", "http://0.0.0.0:$port", "URL at which your wiki can be found. Used to generate feeds and social media previews")
 	flag.StringVar(&util.ServerPort, "port", "1737", "Port to serve the wiki at using HTTP")
 	flag.StringVar(&util.HomePage, "home", "home", "The home page name")
 	flag.StringVar(&util.SiteTitle, "title", "🍄", "How to call your wiki in the navititle")
diff --git a/http_readers.go b/http_readers.go
index 6f7c58e..497a30f 100644
--- a/http_readers.go
+++ b/http_readers.go
@@ -36,7 +36,7 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
 		textContents, err = history.FileAtRevision(textPath, revHash)
 	)
 	if err == nil {
-		contents = markup.ToHtml(hyphaName, textContents)
+		contents = markup.Doc(hyphaName, textContents).AsHTML()
 	}
 	treeHTML, _, _ := tree.Tree(hyphaName, IterateHyphaNamesWith)
 	page := templates.RevisionHTML(
@@ -81,20 +81,27 @@ func handlerPage(w http.ResponseWriter, rq *http.Request) {
 		hyphaName         = HyphaNameFromRq(rq, "page")
 		data, hyphaExists = HyphaStorage[hyphaName]
 		contents          string
+		openGraph         string
 	)
 	if hyphaExists {
 		fileContentsT, errT := ioutil.ReadFile(data.textPath)
 		_, errB := os.Stat(data.binaryPath)
 		if errT == nil {
-			contents = markup.ToHtml(hyphaName, string(fileContentsT))
+			md := markup.Doc(hyphaName, string(fileContentsT))
+			contents = md.AsHTML()
+			openGraph = md.OpenGraphHTML()
 		}
 		if !os.IsNotExist(errB) {
 			contents = binaryHtmlBlock(hyphaName, data) + contents
 		}
 	}
 	treeHTML, prevHypha, nextHypha := tree.Tree(hyphaName, IterateHyphaNamesWith)
-	util.HTTP200Page(w, base(hyphaName, templates.PageHTML(rq, hyphaName,
-		naviTitle(hyphaName),
-		contents,
-		treeHTML, prevHypha, nextHypha)))
+	util.HTTP200Page(w,
+		templates.BaseHTML(
+			hyphaName,
+			templates.PageHTML(rq, hyphaName,
+				naviTitle(hyphaName),
+				contents,
+				treeHTML, prevHypha, nextHypha),
+			openGraph))
 }
diff --git a/hypha.go b/hypha.go
index e412c14..5280639 100644
--- a/hypha.go
+++ b/hypha.go
@@ -33,6 +33,12 @@ func init() {
 		return
 	}
 	markup.HyphaIterate = IterateHyphaNamesWith
+	markup.HyphaImageForOG = func(hyphaName string) string {
+		if hd, isOld := GetHyphaData(hyphaName); isOld && hd.binaryPath != "" {
+			return util.URL + "/binary/" + hyphaName
+		}
+		return util.URL + "/favicon.ico"
+	}
 }
 
 // GetHyphaData finds a hypha addressed by `hyphaName` and returns its `hyphaData`. `hyphaData` is set to a zero value if this hypha does not exist. `isOld` is false if this hypha does not exist.
diff --git a/markup/img.go b/markup/img.go
index 9539498..99c919b 100644
--- a/markup/img.go
+++ b/markup/img.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"regexp"
 	"strings"
+
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 var imgRe = regexp.MustCompile(`^img\s+{`)
@@ -184,6 +186,14 @@ func (img *Img) binaryPathFor(path string) string {
 	}
 }
 
+func (img *Img) ogBinaryPathFor(path string) string {
+	path = img.binaryPathFor(path)
+	if strings.HasPrefix(path, "/binary/") {
+		return util.URL + path
+	}
+	return path
+}
+
 func (img *Img) pagePathFor(path string) string {
 	path = strings.TrimSpace(path)
 	if strings.IndexRune(path, ':') != -1 || strings.IndexRune(path, '/') == 0 {
diff --git a/markup/lexer.go b/markup/lexer.go
index 6ba3b94..b1c3abc 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -9,6 +9,9 @@ import (
 // HyphaExists holds function that checks that a hypha is present.
 var HyphaExists func(string) bool
 
+//
+var HyphaImageForOG func(string) string
+
 // HyphaAccess holds function that accesses a hypha by its name.
 var HyphaAccess func(string) (rawText, binaryHtml string, err error)
 
@@ -29,21 +32,21 @@ type GemLexerState struct {
 
 type Line struct {
 	id int
-	// interface{} may be bad. What I need is a sum of string and Transclusion
+	// interface{} may be bad. TODO: a proper type
 	contents interface{}
 }
 
-func lex(name, content string) (ast []Line) {
-	var state = GemLexerState{name: name}
+func (md *MycoDoc) lex() (ast []Line) {
+	var state = GemLexerState{name: md.hyphaName}
 
-	for _, line := range append(strings.Split(content, "\n"), "") {
-		geminiLineToAST(line, &state, &ast)
+	for _, line := range append(strings.Split(md.contents, "\n"), "") {
+		lineToAST(line, &state, &ast)
 	}
 	return ast
 }
 
 // Lex `line` in markup and save it to `ast` using `state`.
-func geminiLineToAST(line string, state *GemLexerState, ast *[]Line) {
+func lineToAST(line string, state *GemLexerState, ast *[]Line) {
 	addLine := func(text interface{}) {
 		*ast = append(*ast, Line{id: state.id, contents: text})
 	}
diff --git a/markup/mycomarkup.go b/markup/mycomarkup.go
index f3fb7a2..656ca28 100644
--- a/markup/mycomarkup.go
+++ b/markup/mycomarkup.go
@@ -2,8 +2,12 @@
 package markup
 
 import (
+	"fmt"
 	"html"
+	"regexp"
 	"strings"
+
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 // A Mycomarkup-formatted document
@@ -11,24 +15,75 @@ type MycoDoc struct {
 	// data
 	hyphaName string
 	contents  string
+	// indicators
+	parsedAlready bool
+	// results
+	ast           []Line
+	html          string
+	firstImageURL string
+	description   string
 }
 
 // Constructor
 func Doc(hyphaName, contents string) *MycoDoc {
-	return &MycoDoc{
+	md := &MycoDoc{
 		hyphaName: hyphaName,
 		contents:  contents,
 	}
+	return md
+}
+
+func (md *MycoDoc) Lex(recursionLevel int) *MycoDoc {
+	if !md.parsedAlready {
+		md.ast = md.lex()
+	}
+	md.parsedAlready = true
+	return md
 }
 
 // AsHtml returns an html representation of the document
 func (md *MycoDoc) AsHTML() string {
-	return ""
+	md.html = Parse(md.Lex(0).ast, 0, 0, 0)
+	return md.html
 }
 
+// Used to clear opengraph description from html tags. This method is usually bad because of dangers of malformed HTML, but I'm going to use it only for Mycorrhiza-generated HTML, so it's okay. The question mark is required; without it the whole string is eaten away.
+var htmlTagRe = regexp.MustCompile(`<.*?>`)
+
 // OpenGraphHTML returns an html representation of og: meta tags.
 func (md *MycoDoc) OpenGraphHTML() string {
-	return ""
+	md.ogFillVars()
+	return strings.Join([]string{
+		ogTag("title", md.hyphaName),
+		ogTag("type", "article"),
+		ogTag("image", md.firstImageURL),
+		ogTag("url", util.URL+"/page/"+md.hyphaName),
+		ogTag("determiner", ""),
+		ogTag("description", htmlTagRe.ReplaceAllString(md.description, "")),
+	}, "\n")
+}
+
+func (md *MycoDoc) ogFillVars() *MycoDoc {
+	foundDesc := false
+	md.firstImageURL = HyphaImageForOG(md.hyphaName)
+	for _, line := range md.ast {
+		switch v := line.contents.(type) {
+		case string:
+			if !foundDesc {
+				md.description = v
+				foundDesc = true
+			}
+		case Img:
+			if len(v.entries) > 0 {
+				md.firstImageURL = v.entries[0].path.String()
+			}
+		}
+	}
+	return md
+}
+
+func ogTag(property, content string) string {
+	return fmt.Sprintf(`<meta property="og:%s" content="%s"/>`, property, content)
 }
 
 /* The rest of this file is currently unused. TODO: use it I guess */
diff --git a/markup/parser.go b/markup/parser.go
index 23887d1..50ff158 100644
--- a/markup/parser.go
+++ b/markup/parser.go
@@ -1,35 +1,24 @@
 package markup
 
-import ()
-
 const maxRecursionLevel = 3
 
-type GemParserState struct {
-	recursionLevel int
-}
-
-func Parse(ast []Line, from, to int, state GemParserState) (html string) {
-	if state.recursionLevel > maxRecursionLevel {
+func Parse(ast []Line, from, to int, recursionLevel int) (html string) {
+	if recursionLevel > maxRecursionLevel {
 		return "Transclusion depth limit"
 	}
 	for _, line := range ast {
 		if line.id >= from && (line.id <= to || to == 0) || line.id == -1 {
 			switch v := line.contents.(type) {
 			case Transclusion:
-				html += Transclude(v, state)
+				html += Transclude(v, recursionLevel)
 			case Img:
 				html += v.ToHtml()
 			case string:
 				html += v
 			default:
-				html += "Unknown"
+				html += "<b class='error'>Unknown element.</b>"
 			}
 		}
 	}
 	return html
 }
-
-func ToHtml(name, text string) string {
-	state := GemParserState{}
-	return Parse(lex(name, text), 0, 0, state)
-}
diff --git a/markup/xclusion.go b/markup/xclusion.go
index b4a4370..a5df6c8 100644
--- a/markup/xclusion.go
+++ b/markup/xclusion.go
@@ -17,14 +17,14 @@ type Transclusion struct {
 }
 
 // Transclude transcludes `xcl` and returns html representation.
-func Transclude(xcl Transclusion, state GemParserState) (html string) {
-	state.recursionLevel++
+func Transclude(xcl Transclusion, recursionLevel int) (html string) {
+	recursionLevel++
 	tmptOk := `<section class="transclusion transclusion_ok">
 	<a class="transclusion__link" href="/page/%s">%s</a>
 	<div class="transclusion__content">%s</div>
 </section>`
 	tmptFailed := `<section class="transclusion transclusion_failed">
-	<p>Failed to transclude <a href="/page/%s">%s</a></p>
+	<p class="error">Hypha <a class="wikilink_new" href="/page/%s">%s</a> does not exist</p>
 </section>`
 	if xcl.from == xclError || xcl.to == xclError || xcl.from > xcl.to {
 		return fmt.Sprintf(tmptFailed, xcl.name, xcl.name)
@@ -34,7 +34,8 @@ func Transclude(xcl Transclusion, state GemParserState) (html string) {
 	if err != nil {
 		return fmt.Sprintf(tmptFailed, xcl.name, xcl.name)
 	}
-	xclText := Parse(lex(xcl.name, rawText), xcl.from, xcl.to, state)
+	md := Doc(xcl.name, rawText)
+	xclText := Parse(md.lex(), xcl.from, xcl.to, recursionLevel)
 	return fmt.Sprintf(tmptOk, xcl.name, xcl.name, binaryHtml+xclText)
 }
 
diff --git a/templates/http_stuff.qtpl b/templates/http_stuff.qtpl
index 9bacf51..3a88e2f 100644
--- a/templates/http_stuff.qtpl
+++ b/templates/http_stuff.qtpl
@@ -1,10 +1,11 @@
-{% func BaseHTML(title, body string) %}
+{% func BaseHTML(title, body string, headElements ...string) %}
 <!doctype html>
 <html>
 	<head>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<link rel="stylesheet" type="text/css" href="/static/common.css">
 		<title>{%s title %}</title>
+		{% for _, el := range headElements %}{%s= el %}{% endfor %}
 	</head>
 	<body>
 		{%s= body %}
diff --git a/templates/http_stuff.qtpl.go b/templates/http_stuff.qtpl.go
index 8fa0096..1e2bd99 100644
--- a/templates/http_stuff.qtpl.go
+++ b/templates/http_stuff.qtpl.go
@@ -18,7 +18,7 @@ var (
 )
 
 //line templates/http_stuff.qtpl:1
-func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string) {
+func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, headElements ...string) {
 //line templates/http_stuff.qtpl:1
 	qw422016.N().S(`
 <!doctype html>
@@ -31,55 +31,64 @@ func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string) {
 	qw422016.E().S(title)
 //line templates/http_stuff.qtpl:7
 	qw422016.N().S(`</title>
+		`)
+//line templates/http_stuff.qtpl:8
+	for _, el := range headElements {
+//line templates/http_stuff.qtpl:8
+		qw422016.N().S(el)
+//line templates/http_stuff.qtpl:8
+	}
+//line templates/http_stuff.qtpl:8
+	qw422016.N().S(`
 	</head>
 	<body>
 		`)
-//line templates/http_stuff.qtpl:10
+//line templates/http_stuff.qtpl:11
 	qw422016.N().S(body)
-//line templates/http_stuff.qtpl:10
+//line templates/http_stuff.qtpl:11
 	qw422016.N().S(`
 	</body>
 </html>
 `)
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
 }
 
-//line templates/http_stuff.qtpl:13
-func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string) {
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
+func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string, headElements ...string) {
+//line templates/http_stuff.qtpl:14
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:13
-	StreamBaseHTML(qw422016, title, body)
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
+	StreamBaseHTML(qw422016, title, body, headElements...)
+//line templates/http_stuff.qtpl:14
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
 }
 
-//line templates/http_stuff.qtpl:13
-func BaseHTML(title, body string) string {
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
+func BaseHTML(title, body string, headElements ...string) string {
+//line templates/http_stuff.qtpl:14
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:13
-	WriteBaseHTML(qb422016, title, body)
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
+	WriteBaseHTML(qb422016, title, body, headElements...)
+//line templates/http_stuff.qtpl:14
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
 	return qs422016
-//line templates/http_stuff.qtpl:13
+//line templates/http_stuff.qtpl:14
 }
 
-//line templates/http_stuff.qtpl:15
+//line templates/http_stuff.qtpl:16
 func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:15
+//line templates/http_stuff.qtpl:16
 	qw422016.N().S(`
 <main>
 	<h1>List of hyphae</h1>
 	<p>This wiki has `)
-//line templates/http_stuff.qtpl:18
+//line templates/http_stuff.qtpl:19
 	qw422016.N().D(pageCount)
-//line templates/http_stuff.qtpl:18
+//line templates/http_stuff.qtpl:19
 	qw422016.N().S(` hyphae.</p>
 	<table>
 		<thead>
@@ -90,105 +99,105 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int)
 		</thead>
 		<tbody>
 			`)
-//line templates/http_stuff.qtpl:27
+//line templates/http_stuff.qtpl:28
 	qw422016.N().S(tbody)
-//line templates/http_stuff.qtpl:27
+//line templates/http_stuff.qtpl:28
 	qw422016.N().S(`
 		</tbody>
 	</table>
 </main>
 `)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 }
 
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	StreamHyphaListHTML(qw422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 }
 
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 func HyphaListHTML(tbody string, pageCount int) string {
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	WriteHyphaListHTML(qb422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	return qs422016
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 }
 
-//line templates/http_stuff.qtpl:33
+//line templates/http_stuff.qtpl:34
 func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:33
+//line templates/http_stuff.qtpl:34
 	qw422016.N().S(`
 			<tr>
 				<td><a href="/page/`)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:36
 	qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:36
 	qw422016.N().S(`">`)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:36
 	qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:36
 	qw422016.N().S(`</a></td>
 			`)
-//line templates/http_stuff.qtpl:36
+//line templates/http_stuff.qtpl:37
 	if binaryPresent {
-//line templates/http_stuff.qtpl:36
+//line templates/http_stuff.qtpl:37
 		qw422016.N().S(`
 				<td>`)
-//line templates/http_stuff.qtpl:37
+//line templates/http_stuff.qtpl:38
 		qw422016.E().S(binaryMime)
-//line templates/http_stuff.qtpl:37
+//line templates/http_stuff.qtpl:38
 		qw422016.N().S(`</td>
 			`)
-//line templates/http_stuff.qtpl:38
+//line templates/http_stuff.qtpl:39
 	} else {
-//line templates/http_stuff.qtpl:38
+//line templates/http_stuff.qtpl:39
 		qw422016.N().S(`
 				<td></td>
 			`)
-//line templates/http_stuff.qtpl:40
+//line templates/http_stuff.qtpl:41
 	}
-//line templates/http_stuff.qtpl:40
+//line templates/http_stuff.qtpl:41
 	qw422016.N().S(`
 			</tr>
 `)
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 }
 
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 	StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 }
 
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string {
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 	WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 	return qs422016
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:43
 }

From e8f9bf608ff85324d2e113b47b48f19ee146c4a1 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 17 Dec 2020 18:33:07 +0500
Subject: [PATCH 12/50] Draw rocketlink arrows with svg

---
 templates/asset.qtpl.go | 4 ++--
 templates/default.css   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index dc09918..0be6bb6 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -56,8 +56,8 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; color: black; text-decoration: none;}
 .transclusion__link::before {content: "⇐ ";}
 
-.launchpad { position: relative; list-style: none; }
-.launchpad li::before { content: '⇒'; position: absolute; left: 0; }
+/* Derived from https://commons.wikimedia.org/wiki/File:U%2B21D2.svg */
+.launchpad__entry { list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1.0' width='25' height='12'%3E%3Cg transform='scale(0.7,0.8) translate(-613.21429,-421)'%3E%3Cpath d='M 638.06773,429.49751 L 631.01022,436.87675 L 630.1898,436.02774 L 632.416,433.30375 L 613.46876,433.30375 L 613.46876,431.66382 L 633.82089,431.66382 L 635.57789,429.5261 L 633.79229,427.35979 L 613.46876,427.35979 L 613.46876,425.71985 L 632.416,425.71985 L 630.1898,422.99587 L 631.01022,422.08788 L 638.06773,429.49751 z '/%3E%3C/g%3E%3C/svg%3E"); }
 
 .binary-container_with-img img,
 .binary-container_with-video video,
diff --git a/templates/default.css b/templates/default.css
index bc1c814..edddd1a 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -31,8 +31,8 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; color: black; text-decoration: none;}
 .transclusion__link::before {content: "⇐ ";}
 
-.launchpad { position: relative; list-style: none; }
-.launchpad li::before { content: '⇒'; position: absolute; left: 0; }
+/* Derived from https://commons.wikimedia.org/wiki/File:U%2B21D2.svg */
+.launchpad__entry { list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1.0' width='25' height='12'%3E%3Cg transform='scale(0.7,0.8) translate(-613.21429,-421)'%3E%3Cpath d='M 638.06773,429.49751 L 631.01022,436.87675 L 630.1898,436.02774 L 632.416,433.30375 L 613.46876,433.30375 L 613.46876,431.66382 L 633.82089,431.66382 L 635.57789,429.5261 L 633.79229,427.35979 L 613.46876,427.35979 L 613.46876,425.71985 L 632.416,425.71985 L 630.1898,422.99587 L 631.01022,422.08788 L 638.06773,429.49751 z '/%3E%3C/g%3E%3C/svg%3E"); }
 
 .binary-container_with-img img,
 .binary-container_with-video video,

From 598a87f878f462ea7514828566bf58c6b6579d2e Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 17 Dec 2020 19:58:11 +0500
Subject: [PATCH 13/50] Fix incorrect display text in links

---
 markup/link.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/markup/link.go b/markup/link.go
index 8aac40c..1c358be 100644
--- a/markup/link.go
+++ b/markup/link.go
@@ -22,9 +22,11 @@ func LinkParts(addr, display, hyphaName string) (href, text, class, icon string)
 	case strings.ContainsRune(addr, ':'):
 		pos := strings.IndexRune(addr, ':')
 		destination := addr[:pos]
-		text = addr[pos+1:]
-		if strings.HasPrefix(text, "//") && len(text) > 2 {
-			text = text[2:]
+		if display == "" {
+			text = addr[pos+1:]
+			if strings.HasPrefix(text, "//") && len(text) > 2 {
+				text = text[2:]
+			}
 		}
 		return addr, text, "wikilink_external", fmt.Sprintf(`<img class="wikilink__destination-type" src="/static/icon/%s" width="16" height="16"/>`, destination)
 	case strings.HasPrefix(addr, "/"):

From 30c95dd0378e7fdf427428a2a49e7e4d6e92dcb8 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Tue, 29 Dec 2020 13:10:11 +0500
Subject: [PATCH 14/50] Add robots.txt

---
 main.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/main.go b/main.go
index d368bb0..0caa1d5 100644
--- a/main.go
+++ b/main.go
@@ -128,6 +128,17 @@ func handlerIcon(w http.ResponseWriter, rq *http.Request) {
 	}
 }
 
+func handlerRobotsTxt(w http.ResponseWriter, rq *http.Request) {
+	w.Header().Set("Content-Type", "text/plain")
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte(
+		`User-agent: *
+Allow: /page/
+Allow: /recent-changes
+Disallow: /
+Crawl-delay: 5`))
+}
+
 func main() {
 	log.Println("Running MycorrhizaWiki β")
 	parseCliArgs()
@@ -157,5 +168,6 @@ func main() {
 	http.HandleFunc("/", func(w http.ResponseWriter, rq *http.Request) {
 		http.Redirect(w, rq, "/page/"+util.HomePage, http.StatusSeeOther)
 	})
+	http.HandleFunc("/robots.txt", handlerRobotsTxt)
 	log.Fatal(http.ListenAndServe("0.0.0.0:"+util.ServerPort, nil))
 }

From 4d2be01b8594489a353486a0087affc4b0c169d4 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Fri, 1 Jan 2021 09:07:56 +0500
Subject: [PATCH 15/50] Add tables to mycomarkup

---
 markup/lexer.go         |  15 ++-
 markup/parser.go        |   2 +
 markup/table.go         | 215 ++++++++++++++++++++++++++++++++++++++++
 metarrhiza              |   2 +-
 templates/asset.qtpl.go |   4 +
 templates/default.css   |   4 +
 6 files changed, 240 insertions(+), 2 deletions(-)
 create mode 100644 markup/table.go

diff --git a/markup/lexer.go b/markup/lexer.go
index b1c3abc..b69a3cf 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -27,7 +27,8 @@ type GemLexerState struct {
 	id  int
 	buf string
 	// Temporaries
-	img *Img
+	img   *Img
+	table *Table
 }
 
 type Line struct {
@@ -80,6 +81,8 @@ func lineToAST(line string, state *GemLexerState, ast *[]Line) {
 	switch state.where {
 	case "img":
 		goto imgState
+	case "table":
+		goto tableState
 	case "pre":
 		goto preformattedState
 	case "list":
@@ -99,6 +102,13 @@ imgState:
 	}
 	return
 
+tableState:
+	if shouldGoBackToNormal := state.table.Process(line); shouldGoBackToNormal {
+		state.where = ""
+		addLine(*state.table)
+	}
+	return
+
 preformattedState:
 	switch {
 	case startsWith("```"):
@@ -209,6 +219,9 @@ normalState:
 			state.where = "img"
 			state.img = img
 		}
+	case MatchesTable(line):
+		state.where = "table"
+		state.table = TableFromFirstLine(line, state.name)
 	default:
 		addLine(fmt.Sprintf("<p id='%d'>%s</p>", state.id, ParagraphToHtml(state.name, line)))
 	}
diff --git a/markup/parser.go b/markup/parser.go
index 50ff158..665f8ba 100644
--- a/markup/parser.go
+++ b/markup/parser.go
@@ -13,6 +13,8 @@ func Parse(ast []Line, from, to int, recursionLevel int) (html string) {
 				html += Transclude(v, recursionLevel)
 			case Img:
 				html += v.ToHtml()
+			case Table:
+				html += v.asHtml()
 			case string:
 				html += v
 			default:
diff --git a/markup/table.go b/markup/table.go
new file mode 100644
index 0000000..f6c6886
--- /dev/null
+++ b/markup/table.go
@@ -0,0 +1,215 @@
+package markup
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+	"unicode"
+	// "github.com/bouncepaw/mycorrhiza/util"
+)
+
+var tableRe = regexp.MustCompile(`^table\s+{`)
+
+func MatchesTable(line string) bool {
+	return tableRe.MatchString(line)
+}
+
+func TableFromFirstLine(line, hyphaName string) *Table {
+	return &Table{
+		hyphaName: hyphaName,
+		caption:   line[strings.IndexRune(line, '{')+1:],
+		rows:      make([]*tableRow, 0),
+	}
+}
+
+func (t *Table) Process(line string) (shouldGoBackToNormal bool) {
+	if strings.TrimSpace(line) == "}" && !t.inMultiline {
+		return true
+	}
+	if !t.inMultiline {
+		t.pushRow()
+	}
+	var (
+		escaping           bool
+		lookingForNonSpace = !t.inMultiline
+		countingColspan    bool
+	)
+	for i, r := range line {
+		switch {
+		case lookingForNonSpace && unicode.IsSpace(r):
+		case lookingForNonSpace && (r == '!' || r == '|'):
+			t.currCellMarker = r
+			t.currColspan = 1
+			lookingForNonSpace = false
+			countingColspan = true
+		case lookingForNonSpace:
+			t.currCellMarker = '^' // ^ represents implicit |, not part of syntax
+			t.currColspan = 1
+			lookingForNonSpace = false
+			t.currCellBuilder.WriteRune(r)
+
+		case escaping:
+			t.currCellBuilder.WriteRune(r)
+
+		case t.inMultiline && r == '}':
+			t.inMultiline = false
+		case t.inMultiline && i == len(line)-1:
+			t.currCellBuilder.WriteRune('\n')
+		case t.inMultiline:
+			t.currCellBuilder.WriteRune(r)
+
+			// Not in multiline:
+		case (r == '|' || r == '!') && !countingColspan:
+			t.pushCell()
+			t.currCellMarker = r
+			t.currColspan = 1
+			countingColspan = true
+		case r == t.currCellMarker && (r == '|' || r == '!') && countingColspan:
+			t.currColspan++
+		case r == '{':
+			t.inMultiline = true
+			countingColspan = false
+		case i == len(line)-1:
+			t.pushCell()
+		default:
+			t.currCellBuilder.WriteRune(r)
+			countingColspan = false
+		}
+	}
+	return false
+}
+
+type Table struct {
+	// data
+	hyphaName string
+	caption   string
+	rows      []*tableRow
+	// state
+	inMultiline bool
+	// tmp
+	currCellMarker  rune
+	currColspan     uint
+	currCellBuilder strings.Builder
+}
+
+func (t *Table) pushRow() {
+	t.rows = append(t.rows, &tableRow{
+		cells: make([]*tableCell, 0),
+	})
+}
+
+func (t *Table) pushCell() {
+	tc := &tableCell{
+		content: t.currCellBuilder.String(),
+		colspan: t.currColspan,
+	}
+	switch t.currCellMarker {
+	case '|', '^':
+		tc.kind = tableCellDatum
+	case '!':
+		tc.kind = tableCellHeader
+	}
+	// We expect the table to have at least one row ready, so no nil-checking
+	tr := t.rows[len(t.rows)-1]
+	tr.cells = append(tr.cells, tc)
+	t.currCellBuilder = strings.Builder{}
+}
+
+func (t *Table) asHtml() (html string) {
+	if t.caption != "" {
+		html += fmt.Sprintf("<caption>%s</caption>", t.caption)
+	}
+	if len(t.rows) > 0 && t.rows[0].looksLikeThead() {
+		html += fmt.Sprintf("<thead>%s</thead>", t.rows[0].asHtml(t.hyphaName))
+		t.rows = t.rows[1:]
+	}
+	html += "\n<tbody>\n"
+	for _, tr := range t.rows {
+		html += tr.asHtml(t.hyphaName)
+	}
+	return fmt.Sprintf(`<table>%s</tbody></table>`, html)
+}
+
+type tableRow struct {
+	cells []*tableCell
+}
+
+func (tr *tableRow) asHtml(hyphaName string) (html string) {
+	for _, tc := range tr.cells {
+		html += tc.asHtml(hyphaName)
+	}
+	return fmt.Sprintf("<tr>%s</tr>\n", html)
+}
+
+// Most likely, rows with more than two header cells are theads. I allow one extra datum cell for tables like this:
+// |   ! a ! b
+// ! c | d | e
+// ! f | g | h
+func (tr *tableRow) looksLikeThead() bool {
+	var (
+		headerAmount = 0
+		datumAmount  = 0
+	)
+	for _, tc := range tr.cells {
+		switch tc.kind {
+		case tableCellHeader:
+			headerAmount++
+		case tableCellDatum:
+			datumAmount++
+		}
+	}
+	return headerAmount >= 2 && datumAmount <= 1
+}
+
+type tableCell struct {
+	kind    tableCellKind
+	colspan uint
+	content string
+}
+
+func (tc *tableCell) asHtml(hyphaName string) string {
+	return fmt.Sprintf(
+		"<%[1]s %[2]s>%[3]s</%[1]s>\n",
+		tc.kind.tagName(),
+		tc.colspanAttribute(),
+		tc.contentAsHtml(hyphaName),
+	)
+}
+
+func (tc *tableCell) colspanAttribute() string {
+	if tc.colspan <= 1 {
+		return ""
+	}
+	return fmt.Sprintf(`colspan="%d"`, tc.colspan)
+}
+
+func (tc *tableCell) contentAsHtml(hyphaName string) (html string) {
+	for _, line := range strings.Split(tc.content, "\n") {
+		if line = strings.TrimSpace(line); line != "" {
+			if html != "" {
+				html += `<br>`
+			}
+			html += ParagraphToHtml(hyphaName, line)
+		}
+	}
+	return html
+}
+
+type tableCellKind int
+
+const (
+	tableCellUnknown tableCellKind = iota
+	tableCellHeader
+	tableCellDatum
+)
+
+func (tck tableCellKind) tagName() string {
+	switch tck {
+	case tableCellHeader:
+		return "th"
+	case tableCellDatum:
+		return "td"
+	default:
+		return "p"
+	}
+}
diff --git a/metarrhiza b/metarrhiza
index 7828352..95f48bf 160000
--- a/metarrhiza
+++ b/metarrhiza
@@ -1 +1 @@
-Subproject commit 7828352598c19afe5f2e13df0219656ac7b44c9c
+Subproject commit 95f48bfd7a7cfef17d56cef207a770767d727950
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 0be6bb6..b0416a1 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -93,6 +93,10 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 .history-entry__time { font-weight: bold; }
 .history-entry__author { font-style: italic; }
 
+table { background-color: #eee; border: #ddd 1px solid; border-radius: .25rem;
+min-width: 4rem; }
+td { padding: .25rem; border: #ddd 1px solid; }
+caption { caption-side: top; font-size: small; }
 `)
 //line templates/asset.qtpl:2
 	qw422016.N().S(`
diff --git a/templates/default.css b/templates/default.css
index edddd1a..1c041f9 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -68,3 +68,7 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 .history-entry__time { font-weight: bold; }
 .history-entry__author { font-style: italic; }
 
+table { background-color: #eee; border: #ddd 1px solid; border-radius: .25rem;
+min-width: 4rem; }
+td { padding: .25rem; border: #ddd 1px solid; }
+caption { caption-side: top; font-size: small; }

From 301592ad7d73d08a1eba206624402e06bee43ef7 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 3 Jan 2021 01:52:23 +0500
Subject: [PATCH 16/50] Start implementing memdb-driven hyphae

---
 .gitignore     |  1 -
 go.mod         |  1 +
 go.sum         |  8 ++++++
 hypha/count.go | 33 ++++++++++++++++++++++
 hypha/hypha.go | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 hypha/count.go
 create mode 100644 hypha/hypha.go

diff --git a/.gitignore b/.gitignore
index db5b71e..c450f48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-hypha
 mycorrhiza
diff --git a/go.mod b/go.mod
index b5d6fc3..c785b3a 100644
--- a/go.mod
+++ b/go.mod
@@ -5,5 +5,6 @@ go 1.14
 require (
 	github.com/adrg/xdg v0.2.2
 	github.com/gorilla/feeds v1.1.1
+	github.com/hashicorp/go-memdb v1.3.0
 	github.com/valyala/quicktemplate v1.6.3
 )
diff --git a/go.sum b/go.sum
index 284389c..9b58270 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,14 @@ github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY=
 github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
+github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE=
+github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-memdb v1.3.0 h1:xdXq34gBOMEloa9rlGStLxmfX/dyIK8htOv36dQUwHU=
+github.com/hashicorp/go-memdb v1.3.0/go.mod h1:Mluclgwib3R93Hk5fxEfiRhB+6Dar64wWh71LpNSe3g=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/hypha/count.go b/hypha/count.go
new file mode 100644
index 0000000..3c9aef4
--- /dev/null
+++ b/hypha/count.go
@@ -0,0 +1,33 @@
+package hypha
+
+import (
+	"sync"
+)
+
+type count struct {
+	value uint
+	sync.Mutex
+}
+
+// Count is a global variable. Its value is number of all existing hyphae. Hypha mutators are expected to manipulate the value. It is concurrent-safe.
+var Count = count{}
+
+// Increment the value of Count.
+func (c *count) Increment() {
+	c.Lock()
+	c.value++
+	c.Unlock()
+}
+
+// Decrement the value of Count.
+func (c *count) Decrement() {
+	c.Lock()
+	c.value--
+	c.Unlock()
+}
+
+// Get value of Count.
+func (c *count) Value() uint {
+	// it is concurrent-safe to not lock here, right?
+	return c.value
+}
diff --git a/hypha/hypha.go b/hypha/hypha.go
new file mode 100644
index 0000000..2ca5ffc
--- /dev/null
+++ b/hypha/hypha.go
@@ -0,0 +1,76 @@
+package hypha
+
+import (
+	"errors"
+
+	"github.com/hashicorp/go-memdb"
+)
+
+type Hypha struct {
+	Name       string
+	Exists     bool
+	TextPath   string
+	BinaryPath string
+	OutLinks   []string
+	BackLinks  []string
+}
+
+func AddHypha(h Hypha) error {
+	return errors.New("Not implemented")
+}
+
+// Create the DB schema
+var schema = &memdb.DBSchema{
+	Tables: map[string]*memdb.TableSchema{
+		"hyphae": &memdb.TableSchema{
+			Name: "hyphae",
+			Indexes: map[string]*memdb.IndexSchema{
+				"name": &memdb.IndexSchema{
+					Name:    "name",
+					Unique:  true,
+					Indexer: &memdb.StringFieldIndex{Field: "Name"},
+				},
+				"exists": &memdb.IndexSchema{
+					Name:       "exists",
+					Unique:     false,
+					AllowEmpty: true,
+					Indexer:    &memdb.BoolFieldIndex{Field: "Exists"},
+				},
+				"text-path": &memdb.IndexSchema{
+					Name:       "text-path",
+					Unique:     true,
+					AllowEmpty: true,
+					Indexer:    &memdb.StringFieldIndex{Field: "TextPath"},
+				},
+				"binary-path": &memdb.IndexSchema{
+					Name:       "binary-path",
+					Unique:     true,
+					AllowEmpty: true,
+					Indexer:    &memdb.StringFieldIndex{Field: "BinaryPath"},
+				},
+				"out-links": &memdb.IndexSchema{
+					Name:       "out-links",
+					Unique:     false,
+					AllowEmpty: true,
+					Indexer:    &memdb.StringSliceFieldIndex{Field: "OutLinks"},
+				},
+				"back-links": &memdb.IndexSchema{
+					Name:       "back-links",
+					Unique:     false,
+					AllowEmpty: true,
+					Indexer:    &memdb.StringSliceFieldIndex{Field: "BackLinks"},
+				},
+			},
+		},
+	},
+}
+
+var db *memdb.MemDB
+
+func init() {
+	var err error
+	db, err = memdb.NewMemDB(schema)
+	if err != nil {
+		panic(err)
+	}
+}

From 1d5e2e515ca70a749b1985389c9960f43ffb02c9 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 3 Jan 2021 02:25:04 +0500
Subject: [PATCH 17/50] Fix anon hypha deletion bug and start using
 hypha.Count()

---
 history/operations.go      |  1 +
 http_mutators.go           |  2 +-
 hypha.go                   |  6 +++++-
 hypha/count.go             | 33 ------------------------------
 hyphae/count.go            | 31 ++++++++++++++++++++++++++++
 {hypha => hyphae}/hypha.go | 41 +++++++++++++++++---------------------
 main.go                    |  9 +++++----
 7 files changed, 61 insertions(+), 62 deletions(-)
 delete mode 100644 hypha/count.go
 create mode 100644 hyphae/count.go
 rename {hypha => hyphae}/hypha.go (53%)

diff --git a/history/operations.go b/history/operations.go
index e16c367..fdc64af 100644
--- a/history/operations.go
+++ b/history/operations.go
@@ -121,6 +121,7 @@ func (hop *HistoryOp) WithMsg(userMsg string) *HistoryOp {
 
 // WithUser sets a user for the commit.
 func (hop *HistoryOp) WithUser(u *user.User) *HistoryOp {
+	u = u.OrAnon()
 	if u.Group != user.UserAnon {
 		hop.name = u.Name
 		hop.email = u.Name + "@mycorrhiza"
diff --git a/http_mutators.go b/http_mutators.go
index 1283f59..f1cd5da 100644
--- a/http_mutators.go
+++ b/http_mutators.go
@@ -96,7 +96,7 @@ func handlerDeleteConfirm(w http.ResponseWriter, rq *http.Request) {
 		hyphaData, isOld = HyphaStorage[hyphaName]
 		u                = user.FromRequest(rq)
 	)
-	if !u.CanProceed("delete-confirm") {
+	if !user.CanProceed(rq, "delete-confirm") {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a moderator to delete pages.")
 		log.Println("Rejected", rq.URL)
 		return
diff --git a/hypha.go b/hypha.go
index 5280639..c9f2612 100644
--- a/hypha.go
+++ b/hypha.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/bouncepaw/mycorrhiza/history"
+	"github.com/bouncepaw/mycorrhiza/hyphae"
 	"github.com/bouncepaw/mycorrhiza/markup"
 	"github.com/bouncepaw/mycorrhiza/user"
 	"github.com/bouncepaw/mycorrhiza/util"
@@ -84,6 +85,7 @@ func uploadHelp(hop *history.HistoryOp, hyphaName, ext string, data []byte, u *u
 	// New hyphae must be added to the hypha storage
 	if !isOld {
 		HyphaStorage[hyphaName] = hyphaData
+		hyphae.IncrementCount()
 	}
 	*originalFullPath = fullPath
 	return hop.WithFiles(fullPath).
@@ -121,6 +123,7 @@ func (hd *HyphaData) DeleteHypha(hyphaName string, u *user.User) *history.Histor
 		Apply()
 	if len(hop.Errs) == 0 {
 		delete(HyphaStorage, hyphaName)
+		hyphae.DecrementCount()
 	}
 	return hop
 }
@@ -218,7 +221,7 @@ func binaryHtmlBlock(hyphaName string, hd *HyphaData) string {
 	default:
 		return fmt.Sprintf(`
 		<div class="binary-container binary-container_with-nothing">
-			<p>This hypha's media cannot be rendered. Access it <a href="/binary/%s">directly</a></p>
+			<p>This hypha's media cannot be rendered. <a href="/binary/%s">Download it</a></p>
 		</div>
 		`, hyphaName)
 	}
@@ -250,6 +253,7 @@ func Index(path string) {
 			} else {
 				hyphaData = &HyphaData{}
 				HyphaStorage[hyphaName] = hyphaData
+				hyphae.IncrementCount()
 			}
 			if isText {
 				hyphaData.textPath = hyphaPartPath
diff --git a/hypha/count.go b/hypha/count.go
deleted file mode 100644
index 3c9aef4..0000000
--- a/hypha/count.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package hypha
-
-import (
-	"sync"
-)
-
-type count struct {
-	value uint
-	sync.Mutex
-}
-
-// Count is a global variable. Its value is number of all existing hyphae. Hypha mutators are expected to manipulate the value. It is concurrent-safe.
-var Count = count{}
-
-// Increment the value of Count.
-func (c *count) Increment() {
-	c.Lock()
-	c.value++
-	c.Unlock()
-}
-
-// Decrement the value of Count.
-func (c *count) Decrement() {
-	c.Lock()
-	c.value--
-	c.Unlock()
-}
-
-// Get value of Count.
-func (c *count) Value() uint {
-	// it is concurrent-safe to not lock here, right?
-	return c.value
-}
diff --git a/hyphae/count.go b/hyphae/count.go
new file mode 100644
index 0000000..2c1d5f1
--- /dev/null
+++ b/hyphae/count.go
@@ -0,0 +1,31 @@
+package hyphae
+
+import (
+	"sync"
+)
+
+// Its value is number of all existing hyphae. Hypha mutators are expected to manipulate the value. It is concurrent-safe.
+var count = struct {
+	value int
+	sync.Mutex
+}{}
+
+// Increment the value of hyphae count.
+func IncrementCount() {
+	count.Lock()
+	count.value++
+	count.Unlock()
+}
+
+// Decrement the value of hyphae count.
+func DecrementCount() {
+	count.Lock()
+	count.value--
+	count.Unlock()
+}
+
+// Count how many hyphae there are.
+func Count() int {
+	// it is concurrent-safe to not lock here, right?
+	return count.value
+}
diff --git a/hypha/hypha.go b/hyphae/hypha.go
similarity index 53%
rename from hypha/hypha.go
rename to hyphae/hypha.go
index 2ca5ffc..be82302 100644
--- a/hypha/hypha.go
+++ b/hyphae/hypha.go
@@ -1,4 +1,4 @@
-package hypha
+package hyphae
 
 import (
 	"errors"
@@ -25,40 +25,35 @@ var schema = &memdb.DBSchema{
 		"hyphae": &memdb.TableSchema{
 			Name: "hyphae",
 			Indexes: map[string]*memdb.IndexSchema{
-				"name": &memdb.IndexSchema{
-					Name:    "name",
+				"id": &memdb.IndexSchema{
+					Name:    "id",
 					Unique:  true,
 					Indexer: &memdb.StringFieldIndex{Field: "Name"},
 				},
 				"exists": &memdb.IndexSchema{
-					Name:       "exists",
-					Unique:     false,
-					AllowEmpty: true,
-					Indexer:    &memdb.BoolFieldIndex{Field: "Exists"},
+					Name:    "exists",
+					Unique:  false,
+					Indexer: &memdb.BoolFieldIndex{Field: "Exists"},
 				},
 				"text-path": &memdb.IndexSchema{
-					Name:       "text-path",
-					Unique:     true,
-					AllowEmpty: true,
-					Indexer:    &memdb.StringFieldIndex{Field: "TextPath"},
+					Name:    "text-path",
+					Unique:  true,
+					Indexer: &memdb.StringFieldIndex{Field: "TextPath"},
 				},
 				"binary-path": &memdb.IndexSchema{
-					Name:       "binary-path",
-					Unique:     true,
-					AllowEmpty: true,
-					Indexer:    &memdb.StringFieldIndex{Field: "BinaryPath"},
+					Name:    "binary-path",
+					Unique:  true,
+					Indexer: &memdb.StringFieldIndex{Field: "BinaryPath"},
 				},
 				"out-links": &memdb.IndexSchema{
-					Name:       "out-links",
-					Unique:     false,
-					AllowEmpty: true,
-					Indexer:    &memdb.StringSliceFieldIndex{Field: "OutLinks"},
+					Name:    "out-links",
+					Unique:  false,
+					Indexer: &memdb.StringSliceFieldIndex{Field: "OutLinks"},
 				},
 				"back-links": &memdb.IndexSchema{
-					Name:       "back-links",
-					Unique:     false,
-					AllowEmpty: true,
-					Indexer:    &memdb.StringSliceFieldIndex{Field: "BackLinks"},
+					Name:    "back-links",
+					Unique:  false,
+					Indexer: &memdb.StringSliceFieldIndex{Field: "BackLinks"},
 				},
 			},
 		},
diff --git a/main.go b/main.go
index 0caa1d5..ae1aa0f 100644
--- a/main.go
+++ b/main.go
@@ -14,6 +14,7 @@ import (
 	"strings"
 
 	"github.com/bouncepaw/mycorrhiza/history"
+	"github.com/bouncepaw/mycorrhiza/hyphae"
 	"github.com/bouncepaw/mycorrhiza/templates"
 	"github.com/bouncepaw/mycorrhiza/user"
 	"github.com/bouncepaw/mycorrhiza/util"
@@ -50,7 +51,7 @@ func handlerList(w http.ResponseWriter, rq *http.Request) {
 	log.Println(rq.URL)
 	var (
 		tbody     string
-		pageCount = len(HyphaStorage)
+		pageCount = hyphae.Count()
 	)
 	for hyphaName, data := range HyphaStorage {
 		tbody += templates.HyphaListRowHTML(hyphaName, ExtensionToMime(filepath.Ext(data.binaryPath)), data.binaryPath != "")
@@ -73,14 +74,14 @@ func handlerReindex(w http.ResponseWriter, rq *http.Request) {
 	log.Println("Wiki storage directory is", WikiDir)
 	log.Println("Start indexing hyphae...")
 	Index(WikiDir)
-	log.Println("Indexed", len(HyphaStorage), "hyphae")
+	log.Println("Indexed", hyphae.Count(), "hyphae")
 }
 
 // Redirect to a random hypha.
 func handlerRandom(w http.ResponseWriter, rq *http.Request) {
 	log.Println(rq.URL)
 	var randomHyphaName string
-	i := rand.Intn(len(HyphaStorage))
+	i := rand.Intn(hyphae.Count())
 	for hyphaName := range HyphaStorage {
 		if i == 0 {
 			randomHyphaName = hyphaName
@@ -148,7 +149,7 @@ func main() {
 	log.Println("Wiki storage directory is", WikiDir)
 	log.Println("Start indexing hyphae...")
 	Index(WikiDir)
-	log.Println("Indexed", len(HyphaStorage), "hyphae")
+	log.Println("Indexed", hyphae.Count(), "hyphae")
 
 	history.Start(WikiDir)
 

From 987dc5b20ff984e254114ebb13fc0cbbe7b040ae Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Mon, 4 Jan 2021 01:39:54 +0500
Subject: [PATCH 18/50] Support consecutive lines in paragraphs

---
 markup/lexer.go | 32 ++++++++++++++++++++++++++++++--
 metarrhiza      |  2 +-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/markup/lexer.go b/markup/lexer.go
index b69a3cf..4dae95b 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -51,6 +51,13 @@ func lineToAST(line string, state *GemLexerState, ast *[]Line) {
 	addLine := func(text interface{}) {
 		*ast = append(*ast, Line{id: state.id, contents: text})
 	}
+	addParagraphIfNeeded := func() {
+		if state.where == "p" {
+			state.where = ""
+			addLine(fmt.Sprintf("<p id='%d'>%s</p>", state.id, strings.ReplaceAll(ParagraphToHtml(state.name, state.buf), "\n", "<br>")))
+			state.buf = ""
+		}
+	}
 
 	// Process empty lines depending on the current state
 	if "" == strings.TrimSpace(line) {
@@ -66,6 +73,8 @@ func lineToAST(line string, state *GemLexerState, ast *[]Line) {
 		case "launchpad":
 			state.where = ""
 			addLine(state.buf + "</ul>")
+		case "p":
+			addParagraphIfNeeded()
 		}
 		return
 	}
@@ -91,7 +100,7 @@ func lineToAST(line string, state *GemLexerState, ast *[]Line) {
 		goto numberState
 	case "launchpad":
 		goto launchpadState
-	default:
+	default: // "p" or ""
 		goto normalState
 	}
 
@@ -175,43 +184,57 @@ normalState:
 	switch {
 
 	case startsWith("```"):
+		addParagraphIfNeeded()
 		state.where = "pre"
 		state.buf = fmt.Sprintf("<pre id='%d' alt='%s' class='codeblock'><code>", state.id, strings.TrimPrefix(line, "```"))
 	case startsWith("* "):
+		addParagraphIfNeeded()
 		state.where = "list"
 		state.buf = fmt.Sprintf("<ul id='%d'>\n", state.id)
 		goto listState
 	case startsWith("*. "):
+		addParagraphIfNeeded()
 		state.where = "number"
 		state.buf = fmt.Sprintf("<ol id='%d'>\n", state.id)
 		goto numberState
 
 	case startsWith("###### "):
+		addParagraphIfNeeded()
 		addHeading(6)
 	case startsWith("##### "):
+		addParagraphIfNeeded()
 		addHeading(5)
 	case startsWith("#### "):
+		addParagraphIfNeeded()
 		addHeading(4)
 	case startsWith("### "):
+		addParagraphIfNeeded()
 		addHeading(3)
 	case startsWith("## "):
+		addParagraphIfNeeded()
 		addHeading(2)
 	case startsWith("# "):
+		addParagraphIfNeeded()
 		addHeading(1)
 
 	case startsWith(">"):
+		addParagraphIfNeeded()
 		addLine(fmt.Sprintf(
 			"<blockquote id='%d'>%s</blockquote>", state.id, remover(">")(line)))
 	case startsWith("=>"):
+		addParagraphIfNeeded()
 		state.where = "launchpad"
 		state.buf = fmt.Sprintf("<ul class='launchpad' id='%d'>\n", state.id)
 		goto launchpadState
 
 	case startsWith("<="):
+		addParagraphIfNeeded()
 		addLine(parseTransclusion(line, state.name))
 	case line == "----":
+		addParagraphIfNeeded()
 		*ast = append(*ast, Line{id: -1, contents: "<hr/>"})
 	case MatchesImg(line):
+		addParagraphIfNeeded()
 		img, shouldGoBackToNormal := ImgFromFirstLine(line, state.name)
 		if shouldGoBackToNormal {
 			addLine(*img)
@@ -220,9 +243,14 @@ normalState:
 			state.img = img
 		}
 	case MatchesTable(line):
+		addParagraphIfNeeded()
 		state.where = "table"
 		state.table = TableFromFirstLine(line, state.name)
+
+	case state.where == "p":
+		state.buf += "\n" + line
 	default:
-		addLine(fmt.Sprintf("<p id='%d'>%s</p>", state.id, ParagraphToHtml(state.name, line)))
+		state.where = "p"
+		state.buf = line
 	}
 }
diff --git a/metarrhiza b/metarrhiza
index 95f48bf..b67144c 160000
--- a/metarrhiza
+++ b/metarrhiza
@@ -1 +1 @@
-Subproject commit 95f48bfd7a7cfef17d56cef207a770767d727950
+Subproject commit b67144cc770900104a652483c11cabfecc7325aa

From bee862563d8f1f02ef121ea257768abae7917940 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Mon, 4 Jan 2021 02:10:33 +0500
Subject: [PATCH 19/50] Auto-detect links

---
 hyphae/hypha.go         | 21 +++++++++++++++++----
 markup/paragraph.go     | 26 +++++++++++++++++++++-----
 templates/asset.qtpl.go |  2 +-
 templates/default.css   |  2 +-
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/hyphae/hypha.go b/hyphae/hypha.go
index be82302..e129355 100644
--- a/hyphae/hypha.go
+++ b/hyphae/hypha.go
@@ -1,8 +1,6 @@
 package hyphae
 
 import (
-	"errors"
-
 	"github.com/hashicorp/go-memdb"
 )
 
@@ -15,8 +13,23 @@ type Hypha struct {
 	BackLinks  []string
 }
 
-func AddHypha(h Hypha) error {
-	return errors.New("Not implemented")
+// AddHypha adds a hypha named `name` with such `textPath` and `binaryPath`. Both paths can be empty. Does //not// check for hypha's existence beforehand. Count is handled.
+func AddHypha(name, textPath, binaryPath string) {
+	txn := db.Txn(true)
+	txn.Insert("hyphae",
+		&Hypha{
+			Name:       name,
+			TextPath:   textPath,
+			BinaryPath: binaryPath,
+			OutLinks:   make([]string, 0),
+			BackLinks:  make([]string, 0),
+		})
+	txn.Commit()
+	IncrementCount()
+}
+
+// DeleteHypha clears both paths and all out-links from the named hypha and marks it as non-existent. It does not actually delete it from the memdb. Count is handled.
+func DeleteHypha(name string) {
 }
 
 // Create the DB schema
diff --git a/markup/paragraph.go b/markup/paragraph.go
index 88d5e43..9148501 100644
--- a/markup/paragraph.go
+++ b/markup/paragraph.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"html"
 	"strings"
+	"unicode"
 )
 
 type spanTokenType int
@@ -34,8 +35,10 @@ func tagFromState(stt spanTokenType, tagState map[spanTokenType]bool, tagName, o
 	}
 }
 
-func getLinkNode(input *bytes.Buffer, hyphaName string) string {
-	input.Next(2)
+func getLinkNode(input *bytes.Buffer, hyphaName string, isBracketedLink bool) string {
+	if isBracketedLink {
+		input.Next(2) // drop those [[
+	}
 	var (
 		escaping   = false
 		addrBuf    = bytes.Buffer{}
@@ -47,11 +50,13 @@ func getLinkNode(input *bytes.Buffer, hyphaName string) string {
 		if escaping {
 			currBuf.WriteByte(b)
 			escaping = false
-		} else if b == '|' && currBuf == &addrBuf {
+		} else if isBracketedLink && b == '|' && currBuf == &addrBuf {
 			currBuf = &displayBuf
-		} else if b == ']' && bytes.HasPrefix(input.Bytes(), []byte{']'}) {
+		} else if isBracketedLink && b == ']' && bytes.HasPrefix(input.Bytes(), []byte{']'}) {
 			input.Next(1)
 			break
+		} else if !isBracketedLink && unicode.IsSpace(rune(b)) {
+			break
 		} else {
 			currBuf.WriteByte(b)
 		}
@@ -65,6 +70,12 @@ func getTextNode(input *bytes.Buffer) string {
 	var (
 		textNodeBuffer = bytes.Buffer{}
 		escaping       = false
+		startsWith     = func(t string) bool {
+			return bytes.HasPrefix(input.Bytes(), []byte(t))
+		}
+		couldBeLinkStart = func() bool {
+			return startsWith("https://") || startsWith("http://") || startsWith("gemini://") || startsWith("gopher://") || startsWith("ftp://")
+		}
 	)
 	// Always read the first byte in advance to avoid endless loops that kill computers (sad experience)
 	if input.Len() != 0 {
@@ -82,6 +93,9 @@ func getTextNode(input *bytes.Buffer) string {
 		} else if strings.IndexByte("/*`^,![~", b) >= 0 {
 			input.UnreadByte()
 			break
+		} else if couldBeLinkStart() {
+			textNodeBuffer.WriteByte(b)
+			break
 		} else {
 			textNodeBuffer.WriteByte(b)
 		}
@@ -132,7 +146,9 @@ func ParagraphToHtml(hyphaName, input string) string {
 			ret.WriteString(tagFromState(spanMark, tagState, "s", "~~"))
 			p.Next(2)
 		case startsWith("[["):
-			ret.WriteString(getLinkNode(p, hyphaName))
+			ret.WriteString(getLinkNode(p, hyphaName, true))
+		case startsWith("https://"), startsWith("http://"), startsWith("gemini://"), startsWith("gopher://"), startsWith("ftp://"):
+			ret.WriteString(getLinkNode(p, hyphaName, false))
 		default:
 			ret.WriteString(html.EscapeString(getTextNode(p)))
 		}
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index b0416a1..a6cf70f 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -45,7 +45,7 @@ main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
 .wikilink_new {color:#a55858;}
 .wikilink_new:visited {color:#a55858;}
-.wikilink__destination-type {display: inline; margin-left: .5rem; vertical-align: sub; }
+.wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
 
 article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
 article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
diff --git a/templates/default.css b/templates/default.css
index 1c041f9..0d3ef7b 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -20,7 +20,7 @@ main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
 .wikilink_new {color:#a55858;}
 .wikilink_new:visited {color:#a55858;}
-.wikilink__destination-type {display: inline; margin-left: .5rem; vertical-align: sub; }
+.wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
 
 article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
 article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}

From 184aa1ae322211aa8f1d7b7fb933bcbf5038570a Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Mon, 4 Jan 2021 02:18:23 +0500
Subject: [PATCH 20/50] Support mycomarkup in blockquotes

---
 markup/lexer.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/markup/lexer.go b/markup/lexer.go
index 4dae95b..24aaee5 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -219,8 +219,13 @@ normalState:
 
 	case startsWith(">"):
 		addParagraphIfNeeded()
-		addLine(fmt.Sprintf(
-			"<blockquote id='%d'>%s</blockquote>", state.id, remover(">")(line)))
+		addLine(
+			fmt.Sprintf(
+				"<blockquote id='%d'>%s</blockquote>",
+				state.id,
+				ParagraphToHtml(state.name, remover(">")(line)),
+			),
+		)
 	case startsWith("=>"):
 		addParagraphIfNeeded()
 		state.where = "launchpad"

From b1f33c872c63e9cfa240a033df88f7c1e33b94f2 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 10 Jan 2021 01:49:48 +0500
Subject: [PATCH 21/50] Make account system concurrent-safe and refactor it a
 little

---
 flag.go                        |   2 +-
 go.mod                         |   1 +
 go.sum                         |  11 ++
 history/operations.go          |   3 +-
 http_mutators.go               |   6 +-
 hyphae/hypha.go                |  55 +---------
 markup/paragraph.go            |   5 +-
 storage/storage.go             |  65 ++++++++++++
 templates/auth.qtpl            |   4 +-
 templates/auth.qtpl.go         |   4 +-
 templates/common.qtpl          |   9 +-
 templates/common.qtpl.go       | 139 ++++++++++++-------------
 templates/http_readers.qtpl    |   2 +-
 templates/http_readers.qtpl.go |   2 +-
 user/{fs.go => files.go}       |  66 +++++++-----
 user/group.go                  |  70 -------------
 user/net.go                    |  75 ++++++++++++++
 user/user.go                   | 180 ++++++++++-----------------------
 user/users.go                  |  44 ++++++++
 19 files changed, 385 insertions(+), 358 deletions(-)
 create mode 100644 storage/storage.go
 rename user/{fs.go => files.go} (55%)
 delete mode 100644 user/group.go
 create mode 100644 user/net.go
 create mode 100644 user/users.go

diff --git a/flag.go b/flag.go
index 551e0cf..c2cb461 100644
--- a/flag.go
+++ b/flag.go
@@ -51,7 +51,7 @@ func parseCliArgs() {
 	case "none":
 	case "fixed":
 		user.AuthUsed = true
-		user.PopulateFixedUserStorage()
+		user.ReadUsersFromFilesystem()
 	default:
 		log.Fatal("Error: unknown auth method:", util.AuthMethod)
 	}
diff --git a/go.mod b/go.mod
index c785b3a..2d5ea15 100644
--- a/go.mod
+++ b/go.mod
@@ -6,5 +6,6 @@ require (
 	github.com/adrg/xdg v0.2.2
 	github.com/gorilla/feeds v1.1.1
 	github.com/hashicorp/go-memdb v1.3.0
+	github.com/kr/pretty v0.2.1 // indirect
 	github.com/valyala/quicktemplate v1.6.3
 )
diff --git a/go.sum b/go.sum
index 9b58270..b20873b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,7 @@
 github.com/adrg/xdg v0.2.2 h1:A7ZHKRz5KGOLJX/bg7IPzStryhvCzAE1wX+KWawPiAo=
 github.com/adrg/xdg v0.2.2/go.mod h1:7I2hH/IT30IsupOpKZ5ue7/qNi3CoKzD6tL3HwpaRMQ=
 github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY=
 github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
@@ -8,14 +9,22 @@ github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrh
 github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-memdb v1.3.0 h1:xdXq34gBOMEloa9rlGStLxmfX/dyIK8htOv36dQUwHU=
 github.com/hashicorp/go-memdb v1.3.0/go.mod h1:Mluclgwib3R93Hk5fxEfiRhB+6Dar64wWh71LpNSe3g=
+github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
@@ -29,5 +38,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/history/operations.go b/history/operations.go
index fdc64af..49195b6 100644
--- a/history/operations.go
+++ b/history/operations.go
@@ -121,8 +121,7 @@ func (hop *HistoryOp) WithMsg(userMsg string) *HistoryOp {
 
 // WithUser sets a user for the commit.
 func (hop *HistoryOp) WithUser(u *user.User) *HistoryOp {
-	u = u.OrAnon()
-	if u.Group != user.UserAnon {
+	if u.Group != "anon" {
 		hop.name = u.Name
 		hop.email = u.Name + "@mycorrhiza"
 	}
diff --git a/http_mutators.go b/http_mutators.go
index f1cd5da..6927e7f 100644
--- a/http_mutators.go
+++ b/http_mutators.go
@@ -44,7 +44,7 @@ func handlerRenameConfirm(w http.ResponseWriter, rq *http.Request) {
 		newName          = CanonicalName(rq.PostFormValue("new-name"))
 		_, newNameIsUsed = HyphaStorage[newName]
 		recursive        = rq.PostFormValue("recursive") == "true"
-		u                = user.FromRequest(rq).OrAnon()
+		u                = user.FromRequest(rq)
 	)
 	switch {
 	case !u.CanProceed("rename-confirm"):
@@ -151,7 +151,7 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) {
 	var (
 		hyphaName = HyphaNameFromRq(rq, "upload-text")
 		textData  = rq.PostFormValue("text")
-		u         = user.FromRequest(rq).OrAnon()
+		u         = user.FromRequest(rq)
 	)
 	if ok := user.CanProceed(rq, "upload-text"); !ok {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to edit pages.")
@@ -174,7 +174,7 @@ func handlerUploadBinary(w http.ResponseWriter, rq *http.Request) {
 	log.Println(rq.URL)
 	var (
 		hyphaName = HyphaNameFromRq(rq, "upload-binary")
-		u         = user.FromRequest(rq).OrAnon()
+		u         = user.FromRequest(rq)
 	)
 	if !u.CanProceed("upload-binary") {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to upload attachments.")
diff --git a/hyphae/hypha.go b/hyphae/hypha.go
index e129355..366fd5a 100644
--- a/hyphae/hypha.go
+++ b/hyphae/hypha.go
@@ -1,7 +1,7 @@
 package hyphae
 
 import (
-	"github.com/hashicorp/go-memdb"
+	"github.com/bouncepaw/mycorrhiza/storage"
 )
 
 type Hypha struct {
@@ -15,7 +15,7 @@ type Hypha struct {
 
 // AddHypha adds a hypha named `name` with such `textPath` and `binaryPath`. Both paths can be empty. Does //not// check for hypha's existence beforehand. Count is handled.
 func AddHypha(name, textPath, binaryPath string) {
-	txn := db.Txn(true)
+	txn := storage.DB.Txn(true)
 	txn.Insert("hyphae",
 		&Hypha{
 			Name:       name,
@@ -31,54 +31,3 @@ func AddHypha(name, textPath, binaryPath string) {
 // DeleteHypha clears both paths and all out-links from the named hypha and marks it as non-existent. It does not actually delete it from the memdb. Count is handled.
 func DeleteHypha(name string) {
 }
-
-// Create the DB schema
-var schema = &memdb.DBSchema{
-	Tables: map[string]*memdb.TableSchema{
-		"hyphae": &memdb.TableSchema{
-			Name: "hyphae",
-			Indexes: map[string]*memdb.IndexSchema{
-				"id": &memdb.IndexSchema{
-					Name:    "id",
-					Unique:  true,
-					Indexer: &memdb.StringFieldIndex{Field: "Name"},
-				},
-				"exists": &memdb.IndexSchema{
-					Name:    "exists",
-					Unique:  false,
-					Indexer: &memdb.BoolFieldIndex{Field: "Exists"},
-				},
-				"text-path": &memdb.IndexSchema{
-					Name:    "text-path",
-					Unique:  true,
-					Indexer: &memdb.StringFieldIndex{Field: "TextPath"},
-				},
-				"binary-path": &memdb.IndexSchema{
-					Name:    "binary-path",
-					Unique:  true,
-					Indexer: &memdb.StringFieldIndex{Field: "BinaryPath"},
-				},
-				"out-links": &memdb.IndexSchema{
-					Name:    "out-links",
-					Unique:  false,
-					Indexer: &memdb.StringSliceFieldIndex{Field: "OutLinks"},
-				},
-				"back-links": &memdb.IndexSchema{
-					Name:    "back-links",
-					Unique:  false,
-					Indexer: &memdb.StringSliceFieldIndex{Field: "BackLinks"},
-				},
-			},
-		},
-	},
-}
-
-var db *memdb.MemDB
-
-func init() {
-	var err error
-	db, err = memdb.NewMemDB(schema)
-	if err != nil {
-		panic(err)
-	}
-}
diff --git a/markup/paragraph.go b/markup/paragraph.go
index 9148501..bcb1c84 100644
--- a/markup/paragraph.go
+++ b/markup/paragraph.go
@@ -120,6 +120,9 @@ func ParagraphToHtml(hyphaName, input string) string {
 		startsWith = func(t string) bool {
 			return bytes.HasPrefix(p.Bytes(), []byte(t))
 		}
+		noTagsActive = func() bool {
+			return !(tagState[spanItalic] || tagState[spanBold] || tagState[spanMono] || tagState[spanSuper] || tagState[spanSub] || tagState[spanMark] || tagState[spanLink])
+		}
 	)
 
 	for p.Len() != 0 {
@@ -147,7 +150,7 @@ func ParagraphToHtml(hyphaName, input string) string {
 			p.Next(2)
 		case startsWith("[["):
 			ret.WriteString(getLinkNode(p, hyphaName, true))
-		case startsWith("https://"), startsWith("http://"), startsWith("gemini://"), startsWith("gopher://"), startsWith("ftp://"):
+		case (startsWith("https://") || startsWith("http://") || startsWith("gemini://") || startsWith("gopher://") || startsWith("ftp://")) && noTagsActive():
 			ret.WriteString(getLinkNode(p, hyphaName, false))
 		default:
 			ret.WriteString(html.EscapeString(getTextNode(p)))
diff --git a/storage/storage.go b/storage/storage.go
new file mode 100644
index 0000000..528c109
--- /dev/null
+++ b/storage/storage.go
@@ -0,0 +1,65 @@
+package storage
+
+import (
+	"github.com/hashicorp/go-memdb"
+)
+
+// Create the DB schema
+var schema = &memdb.DBSchema{
+	Tables: map[string]*memdb.TableSchema{
+		"hyphae": &memdb.TableSchema{
+			Name: "hyphae",
+			Indexes: map[string]*memdb.IndexSchema{
+				"id": &memdb.IndexSchema{
+					Name:    "id",
+					Unique:  true,
+					Indexer: &memdb.StringFieldIndex{Field: "Name"},
+				},
+				"exists": &memdb.IndexSchema{
+					Name:    "exists",
+					Unique:  false,
+					Indexer: &memdb.BoolFieldIndex{Field: "Exists"},
+				},
+				"out-links": &memdb.IndexSchema{
+					Name:    "out-links",
+					Unique:  false,
+					Indexer: &memdb.StringSliceFieldIndex{Field: "OutLinks"},
+				},
+				"back-links": &memdb.IndexSchema{
+					Name:    "back-links",
+					Unique:  false,
+					Indexer: &memdb.StringSliceFieldIndex{Field: "BackLinks"},
+				},
+			},
+		},
+	},
+}
+
+var DB *memdb.MemDB
+
+func init() {
+	var err error
+	DB, err = memdb.NewMemDB(schema)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func ForEveryRecord(table string, λ func(obj interface{})) error {
+	txn := DB.Txn(false)
+	defer txn.Abort()
+
+	it, err := txn.Get(table, "id")
+	if err != nil {
+		return err
+	}
+
+	for obj := it.Next(); obj != nil; obj = it.Next() {
+		λ(obj)
+	}
+
+	return nil
+}
+
+func TxnW() *memdb.Txn { return DB.Txn(true) }
+func TxnR() *memdb.Txn { return DB.Txn(false) }
diff --git a/templates/auth.qtpl b/templates/auth.qtpl
index bbb7d25..32ab3d8 100644
--- a/templates/auth.qtpl
+++ b/templates/auth.qtpl
@@ -6,7 +6,7 @@
 	{% if user.AuthUsed %}
 		<h1>Login</h1>
 		<form method="post" action="/login-data" id="login-form" enctype="multipart/form-data">
-			<p>Use the data you were given by the administrator.</p>
+			<p>Use the data you were given by an administrator.</p>
 			<fieldset>
 				<legend>Username</legend>
 				<input type="text" required autofocus name="username" autocomplete="on">
@@ -15,7 +15,7 @@
 				<legend>Password</legend>
 				<input type="password" required name="password" autocomplete="on">
 			</fieldset>
-			<p>By submitting this form you give this wiki a permission to store cookies in your browser. It lets the engine associate your edits with you.</p>
+			<p>By submitting this form you give this wiki a permission to store cookies in your browser. It lets the engine associate your edits with you. You will stay logged in until you log out.</p>
 			<input type="submit">
 			<a href="/">Cancel</a>
 		</form>
diff --git a/templates/auth.qtpl.go b/templates/auth.qtpl.go
index 27d13fe..ed88d8d 100644
--- a/templates/auth.qtpl.go
+++ b/templates/auth.qtpl.go
@@ -33,7 +33,7 @@ func StreamLoginHTML(qw422016 *qt422016.Writer) {
 		qw422016.N().S(`
 		<h1>Login</h1>
 		<form method="post" action="/login-data" id="login-form" enctype="multipart/form-data">
-			<p>Use the data you were given by the administrator.</p>
+			<p>Use the data you were given by an administrator.</p>
 			<fieldset>
 				<legend>Username</legend>
 				<input type="text" required autofocus name="username" autocomplete="on">
@@ -42,7 +42,7 @@ func StreamLoginHTML(qw422016 *qt422016.Writer) {
 				<legend>Password</legend>
 				<input type="password" required name="password" autocomplete="on">
 			</fieldset>
-			<p>By submitting this form you give this wiki a permission to store cookies in your browser. It lets the engine associate your edits with you.</p>
+			<p>By submitting this form you give this wiki a permission to store cookies in your browser. It lets the engine associate your edits with you. You will stay logged in until you log out.</p>
 			<input type="submit">
 			<a href="/">Cancel</a>
 		</form>
diff --git a/templates/common.qtpl b/templates/common.qtpl
index 29673cc..a288422 100644
--- a/templates/common.qtpl
+++ b/templates/common.qtpl
@@ -20,9 +20,10 @@ var navEntries = []navEntry{
 %}
 
 {% func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) %}
-{% code
-	u := user.FromRequest(rq).OrAnon()
+{% code 
+	u := user.FromRequest(rq)
 %}
+
 	<nav class="navlinks">
 		<ul>
 		{%- for _, entry := range navEntries -%}
@@ -30,7 +31,7 @@ var navEntries = []navEntry{
 			<li><b>{%s revisionHash[0] %}</b></li>
 		{%- elseif navType == entry.path -%}
 			<li><b>{%s entry.title %}</b></li>
-		{%- elseif entry.path != "revision" && u.Group.CanAccessRoute(entry.path) -%}
+		{%- elseif entry.path != "revision" && u.CanProceed(entry.path) -%}
 			<li><a href="/{%s entry.path %}/{%s hyphaName %}">{%s entry.title %}</a></li>
 		{%- endif -%}
 		{%- endfor -%}
@@ -42,7 +43,7 @@ var navEntries = []navEntry{
 {% func userMenuHTML(u *user.User) %}
 	{% if user.AuthUsed %}
 			<li class="navlinks__user">
-			{% if u.Group == user.UserAnon %}
+			{% if u.Group == "anon" %}
 				<a href="/login">Login</a>
 			{% else %}
 				<a href="/page/{%s util.UserTree %}/{%s u.Name %}">{%s u.Name %}</a>
diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go
index b2791b8..7965baa 100644
--- a/templates/common.qtpl.go
+++ b/templates/common.qtpl.go
@@ -50,163 +50,164 @@ func streamnavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navTy
 	qw422016.N().S(`
 `)
 //line templates/common.qtpl:24
-	u := user.FromRequest(rq).OrAnon()
+	u := user.FromRequest(rq)
 
 //line templates/common.qtpl:25
 	qw422016.N().S(`
+
 	<nav class="navlinks">
 		<ul>
 `)
-//line templates/common.qtpl:28
+//line templates/common.qtpl:29
 	for _, entry := range navEntries {
-//line templates/common.qtpl:29
+//line templates/common.qtpl:30
 		if navType == "revision" && entry.path == "revision" {
-//line templates/common.qtpl:29
-			qw422016.N().S(`			<li><b>`)
 //line templates/common.qtpl:30
+			qw422016.N().S(`			<li><b>`)
+//line templates/common.qtpl:31
 			qw422016.E().S(revisionHash[0])
-//line templates/common.qtpl:30
+//line templates/common.qtpl:31
 			qw422016.N().S(`</b></li>
 `)
-//line templates/common.qtpl:31
+//line templates/common.qtpl:32
 		} else if navType == entry.path {
-//line templates/common.qtpl:31
+//line templates/common.qtpl:32
 			qw422016.N().S(`			<li><b>`)
-//line templates/common.qtpl:32
+//line templates/common.qtpl:33
 			qw422016.E().S(entry.title)
-//line templates/common.qtpl:32
+//line templates/common.qtpl:33
 			qw422016.N().S(`</b></li>
 `)
-//line templates/common.qtpl:33
-		} else if entry.path != "revision" && u.Group.CanAccessRoute(entry.path) {
-//line templates/common.qtpl:33
+//line templates/common.qtpl:34
+		} else if entry.path != "revision" && u.CanProceed(entry.path) {
+//line templates/common.qtpl:34
 			qw422016.N().S(`			<li><a href="/`)
-//line templates/common.qtpl:34
+//line templates/common.qtpl:35
 			qw422016.E().S(entry.path)
-//line templates/common.qtpl:34
+//line templates/common.qtpl:35
 			qw422016.N().S(`/`)
-//line templates/common.qtpl:34
+//line templates/common.qtpl:35
 			qw422016.E().S(hyphaName)
-//line templates/common.qtpl:34
+//line templates/common.qtpl:35
 			qw422016.N().S(`">`)
-//line templates/common.qtpl:34
+//line templates/common.qtpl:35
 			qw422016.E().S(entry.title)
-//line templates/common.qtpl:34
+//line templates/common.qtpl:35
 			qw422016.N().S(`</a></li>
 `)
-//line templates/common.qtpl:35
+//line templates/common.qtpl:36
 		}
-//line templates/common.qtpl:36
+//line templates/common.qtpl:37
 	}
-//line templates/common.qtpl:36
+//line templates/common.qtpl:37
 	qw422016.N().S(`		`)
-//line templates/common.qtpl:37
+//line templates/common.qtpl:38
 	qw422016.N().S(userMenuHTML(u))
-//line templates/common.qtpl:37
+//line templates/common.qtpl:38
 	qw422016.N().S(`
 		</ul>
 	</nav>
 `)
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 }
 
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 func writenavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) {
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 	streamnavHTML(qw422016, rq, hyphaName, navType, revisionHash...)
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 	qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 }
 
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string {
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 	writenavHTML(qb422016, rq, hyphaName, navType, revisionHash...)
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 	qs422016 := string(qb422016.B)
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 	return qs422016
-//line templates/common.qtpl:40
+//line templates/common.qtpl:41
 }
 
-//line templates/common.qtpl:42
+//line templates/common.qtpl:43
 func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) {
-//line templates/common.qtpl:42
+//line templates/common.qtpl:43
 	qw422016.N().S(`
 	`)
-//line templates/common.qtpl:43
+//line templates/common.qtpl:44
 	if user.AuthUsed {
-//line templates/common.qtpl:43
+//line templates/common.qtpl:44
 		qw422016.N().S(`
 			<li class="navlinks__user">
 			`)
-//line templates/common.qtpl:45
-		if u.Group == user.UserAnon {
-//line templates/common.qtpl:45
+//line templates/common.qtpl:46
+		if u.Group == "anon" {
+//line templates/common.qtpl:46
 			qw422016.N().S(`
 				<a href="/login">Login</a>
 			`)
-//line templates/common.qtpl:47
+//line templates/common.qtpl:48
 		} else {
-//line templates/common.qtpl:47
+//line templates/common.qtpl:48
 			qw422016.N().S(`
 				<a href="/page/`)
-//line templates/common.qtpl:48
+//line templates/common.qtpl:49
 			qw422016.E().S(util.UserTree)
-//line templates/common.qtpl:48
+//line templates/common.qtpl:49
 			qw422016.N().S(`/`)
-//line templates/common.qtpl:48
+//line templates/common.qtpl:49
 			qw422016.E().S(u.Name)
-//line templates/common.qtpl:48
+//line templates/common.qtpl:49
 			qw422016.N().S(`">`)
-//line templates/common.qtpl:48
+//line templates/common.qtpl:49
 			qw422016.E().S(u.Name)
-//line templates/common.qtpl:48
+//line templates/common.qtpl:49
 			qw422016.N().S(`</a>
 			`)
-//line templates/common.qtpl:49
+//line templates/common.qtpl:50
 		}
-//line templates/common.qtpl:49
+//line templates/common.qtpl:50
 		qw422016.N().S(`
 			</li>
 	`)
-//line templates/common.qtpl:51
+//line templates/common.qtpl:52
 	}
-//line templates/common.qtpl:51
+//line templates/common.qtpl:52
 	qw422016.N().S(`
 `)
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 }
 
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 func writeuserMenuHTML(qq422016 qtio422016.Writer, u *user.User) {
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 	streamuserMenuHTML(qw422016, u)
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 	qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 }
 
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 func userMenuHTML(u *user.User) string {
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 	writeuserMenuHTML(qb422016, u)
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 	qs422016 := string(qb422016.B)
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 	return qs422016
-//line templates/common.qtpl:52
+//line templates/common.qtpl:53
 }
diff --git a/templates/http_readers.qtpl b/templates/http_readers.qtpl
index ca58c7c..54b0a5a 100644
--- a/templates/http_readers.qtpl
+++ b/templates/http_readers.qtpl
@@ -48,7 +48,7 @@ If `contents` == "", a helpful message is shown instead.
 		{% endif %}
 	</section>
 	<hr class="page-separator"/>
-{% if u := user.FromRequest(rq).OrAnon(); !user.AuthUsed || u.Group > user.UserAnon %}
+{% if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" %}
 	<form action="/upload-binary/{%s hyphaName %}"
 			method="post" enctype="multipart/form-data">
 		<label for="upload-binary__input">Upload a new attachment</label>
diff --git a/templates/http_readers.qtpl.go b/templates/http_readers.qtpl.go
index 95e85f5..1bf5e48 100644
--- a/templates/http_readers.qtpl.go
+++ b/templates/http_readers.qtpl.go
@@ -228,7 +228,7 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi
 	<hr class="page-separator"/>
 `)
 //line templates/http_readers.qtpl:51
-	if u := user.FromRequest(rq).OrAnon(); !user.AuthUsed || u.Group > user.UserAnon {
+	if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" {
 //line templates/http_readers.qtpl:51
 		qw422016.N().S(`
 	<form action="/upload-binary/`)
diff --git a/user/fs.go b/user/files.go
similarity index 55%
rename from user/fs.go
rename to user/files.go
index f47c423..3235497 100644
--- a/user/fs.go
+++ b/user/files.go
@@ -10,53 +10,55 @@ import (
 	"github.com/bouncepaw/mycorrhiza/util"
 )
 
-func PopulateFixedUserStorage() {
+// ReadUsersFromFilesystem reads all user information from filesystem and stores it internally. Call it during initialization.
+func ReadUsersFromFilesystem() {
+	rememberUsers(usersFromFixedCredentials())
+	readTokensToUsers()
+}
+
+func usersFromFixedCredentials() []*User {
+	var users []*User
 	contents, err := ioutil.ReadFile(util.FixedCredentialsPath)
 	if err != nil {
 		log.Fatal(err)
 	}
-	err = json.Unmarshal(contents, &UserStorage.Users)
+	err = json.Unmarshal(contents, &users)
 	if err != nil {
 		log.Fatal(err)
 	}
-	for _, user := range UserStorage.Users {
-		user.Group = groupFromString(user.GroupString)
-	}
-	log.Println("Found", len(UserStorage.Users), "fixed users")
+	log.Println("Found", len(users), "fixed users")
+	return users
+}
 
-	contents, err = ioutil.ReadFile(tokenStoragePath())
+func rememberUsers(uu []*User) {
+	// uu is used to not shadow the `users` in `users.go`.
+	for _, user := range uu {
+		users.Store(user.Name, user)
+	}
+}
+
+func readTokensToUsers() {
+	contents, err := ioutil.ReadFile(tokenStoragePath())
 	if os.IsNotExist(err) {
 		return
 	}
 	if err != nil {
 		log.Fatal(err)
 	}
+
 	var tmp map[string]string
 	err = json.Unmarshal(contents, &tmp)
 	if err != nil {
 		log.Fatal(err)
 	}
+
 	for token, username := range tmp {
-		user := UserStorage.userByName(username)
-		UserStorage.Tokens[token] = user
+		commenceSession(username, token)
 	}
 	log.Println("Found", len(tmp), "active sessions")
 }
 
-func dumpTokens() {
-	tmp := make(map[string]string)
-	for token, user := range UserStorage.Tokens {
-		tmp[token] = user.Name
-	}
-	blob, err := json.Marshal(tmp)
-	if err != nil {
-		log.Println(err)
-	} else {
-		ioutil.WriteFile(tokenStoragePath(), blob, 0644)
-	}
-}
-
-// Return path to tokens.json.
+// Return path to tokens.json. Creates folders if needed.
 func tokenStoragePath() string {
 	dir, err := xdg.DataFile("mycorrhiza/tokens.json")
 	if err != nil {
@@ -67,3 +69,21 @@ func tokenStoragePath() string {
 	}
 	return dir
 }
+
+func dumpTokens() {
+	tmp := make(map[string]string)
+
+	tokens.Range(func(k, v interface{}) bool {
+		token := k.(string)
+		username := v.(string)
+		tmp[token] = username
+		return true
+	})
+
+	blob, err := json.Marshal(tmp)
+	if err != nil {
+		log.Println(err)
+	} else {
+		ioutil.WriteFile(tokenStoragePath(), blob, 0644)
+	}
+}
diff --git a/user/group.go b/user/group.go
deleted file mode 100644
index 6a9a296..0000000
--- a/user/group.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package user
-
-import (
-	"log"
-	"net/http"
-)
-
-func groupFromString(s string) UserGroup {
-	switch s {
-	case "admin":
-		return UserAdmin
-	case "moderator":
-		return UserModerator
-	case "trusted":
-		return UserTrusted
-	case "editor":
-		return UserEditor
-	default:
-		log.Fatal("Unknown user group", s)
-		return UserAnon
-	}
-}
-
-// UserGroup represents a group that a user is part of.
-type UserGroup int
-
-const (
-	// UserAnon is the default user group which all unauthorized visitors have.
-	UserAnon UserGroup = iota
-	// UserEditor is a user who can edit and upload stuff.
-	UserEditor
-	// UserTrusted is a trusted editor who can also rename stuff.
-	UserTrusted
-	// UserModerator is a moderator who can also delete stuff.
-	UserModerator
-	// UserAdmin can do everything.
-	UserAdmin
-)
-
-var minimalRights = map[string]UserGroup{
-	"edit":           UserEditor,
-	"upload-binary":  UserEditor,
-	"upload-text":    UserEditor,
-	"rename-ask":     UserTrusted,
-	"rename-confirm": UserTrusted,
-	"delete-ask":     UserModerator,
-	"delete-confirm": UserModerator,
-	"reindex":        UserAdmin,
-}
-
-func (ug UserGroup) CanAccessRoute(route string) bool {
-	if !AuthUsed {
-		return true
-	}
-	if minimalRight, ok := minimalRights[route]; ok {
-		if ug >= minimalRight {
-			return true
-		}
-		return false
-	}
-	return true
-}
-
-func CanProceed(rq *http.Request, route string) bool {
-	return FromRequest(rq).OrAnon().CanProceed(route)
-}
-
-func (u *User) CanProceed(route string) bool {
-	return u.Group.CanAccessRoute(route)
-}
diff --git a/user/net.go b/user/net.go
new file mode 100644
index 0000000..55b08e1
--- /dev/null
+++ b/user/net.go
@@ -0,0 +1,75 @@
+package user
+
+import (
+	"log"
+	"net/http"
+	"time"
+
+	"github.com/bouncepaw/mycorrhiza/util"
+)
+
+// CanProceed returns `true` if the user in `rq` has enough rights to access `route`.
+func CanProceed(rq *http.Request, route string) bool {
+	return FromRequest(rq).CanProceed(route)
+}
+
+// FromRequest returns user from `rq`. If there is no user, an anon user is returned instead.
+func FromRequest(rq *http.Request) *User {
+	cookie, err := rq.Cookie("mycorrhiza_token")
+	if err != nil {
+		return emptyUser()
+	}
+	return userByToken(cookie.Value)
+}
+
+// LogoutFromRequest logs the user in `rq` out and rewrites the cookie in `w`.
+func LogoutFromRequest(w http.ResponseWriter, rq *http.Request) {
+	cookieFromUser, err := rq.Cookie("mycorrhiza_token")
+	if err == nil {
+		http.SetCookie(w, cookie("token", "", time.Unix(0, 0)))
+		terminateSession(cookieFromUser.Value)
+	}
+}
+
+// LoginDataHTTP logs such user in and returns string representation of an error if there is any.
+func LoginDataHTTP(w http.ResponseWriter, rq *http.Request, username, password string) string {
+	w.Header().Set("Content-Type", "text/html;charset=utf-8")
+	if !HasUsername(username) {
+		w.WriteHeader(http.StatusBadRequest)
+		log.Println("Unknown username", username, "was entered")
+		return "unknown username"
+	}
+	if !CredentialsOK(username, password) {
+		w.WriteHeader(http.StatusBadRequest)
+		log.Println("A wrong password was entered for username", username)
+		return "wrong password"
+	}
+	token, err := AddSession(username)
+	if err != nil {
+		log.Println(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return err.Error()
+	}
+	http.SetCookie(w, cookie("token", token, time.Now().Add(365*24*time.Hour)))
+	return ""
+}
+
+// AddSession saves a session for `username` and returns a token to use.
+func AddSession(username string) (string, error) {
+	token, err := util.RandomString(16)
+	if err == nil {
+		commenceSession(username, token)
+		log.Println("New token for", username, "is", token)
+	}
+	return token, err
+}
+
+// A handy cookie constructor
+func cookie(name_suffix, val string, t time.Time) *http.Cookie {
+	return &http.Cookie{
+		Name:    "mycorrhiza_" + name_suffix,
+		Value:   val,
+		Expires: t,
+		Path:    "/",
+	}
+}
diff --git a/user/user.go b/user/user.go
index 7169760..331c17f 100644
--- a/user/user.go
+++ b/user/user.go
@@ -1,138 +1,66 @@
 package user
 
 import (
-	"log"
-	"net/http"
-	"time"
-
-	"github.com/bouncepaw/mycorrhiza/util"
+	"sync"
 )
 
-func (u *User) OrAnon() *User {
-	if u == nil {
-		return &User{}
-	}
-	return u
-}
-
-func LogoutFromRequest(w http.ResponseWriter, rq *http.Request) {
-	cookieFromUser, err := rq.Cookie("mycorrhiza_token")
-	if err == nil {
-		http.SetCookie(w, cookie("token", "", time.Unix(0, 0)))
-		terminateSession(cookieFromUser.Value)
-	}
-}
-
-func (us *FixedUserStorage) userByToken(token string) *User {
-	if user, ok := us.Tokens[token]; ok {
-		return user
-	}
-	return nil
-}
-
-func (us *FixedUserStorage) userByName(username string) *User {
-	for _, user := range us.Users {
-		if user.Name == username {
-			return user
-		}
-	}
-	return nil
-}
-
-func FromRequest(rq *http.Request) *User {
-	cookie, err := rq.Cookie("mycorrhiza_token")
-	if err != nil {
-		return nil
-	}
-	return UserStorage.userByToken(cookie.Value).OrAnon()
-}
-
-func LoginDataHTTP(w http.ResponseWriter, rq *http.Request, username, password string) string {
-	w.Header().Set("Content-Type", "text/html;charset=utf-8")
-	if !HasUsername(username) {
-		w.WriteHeader(http.StatusBadRequest)
-		log.Println("Unknown username", username, "was entered")
-		return "unknown username"
-	}
-	if !CredentialsOK(username, password) {
-		w.WriteHeader(http.StatusBadRequest)
-		log.Println("A wrong password was entered for username", username)
-		return "wrong password"
-	}
-	token, err := AddSession(username)
-	if err != nil {
-		log.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		return err.Error()
-	}
-	http.SetCookie(w, cookie("token", token, time.Now().Add(14*24*time.Hour)))
-	return ""
-}
-
-// AddSession saves a session for `username` and returns a token to use.
-func AddSession(username string) (string, error) {
-	token, err := util.RandomString(16)
-	if err == nil {
-		for _, user := range UserStorage.Users {
-			if user.Name == username {
-				UserStorage.Tokens[token] = user
-				go dumpTokens()
-			}
-		}
-		log.Println("New token for", username, "is", token)
-	}
-	return token, err
-}
-
-func terminateSession(token string) {
-	delete(UserStorage.Tokens, token)
-	go dumpTokens()
-}
-
-func HasUsername(username string) bool {
-	for _, user := range UserStorage.Users {
-		if user.Name == username {
-			return true
-		}
-	}
-	return false
-}
-
-func CredentialsOK(username, password string) bool {
-	for _, user := range UserStorage.Users {
-		if user.Name == username && user.Password == password {
-			return true
-		}
-	}
-	return false
-}
-
-type FixedUserStorage struct {
-	Users  []*User
-	Tokens map[string]*User
-}
-
-var UserStorage = FixedUserStorage{Tokens: make(map[string]*User)}
-
-// AuthUsed shows if a method of authentication is used. You should set it by yourself.
-var AuthUsed bool
-
 // User is a user.
 type User struct {
 	// Name is a username. It must follow hypha naming rules.
-	Name string `json:"name"`
-	// Group the user is part of.
-	Group       UserGroup `json:"-"`
-	GroupString string    `json:"group"`
-	Password    string    `json:"password"`
+	Name     string `json:"name"`
+	Group    string `json:"group"`
+	Password string `json:"password"`
+	sync.RWMutex
 }
 
-// A handy cookie constructor
-func cookie(name_suffix, val string, t time.Time) *http.Cookie {
-	return &http.Cookie{
-		Name:    "mycorrhiza_" + name_suffix,
-		Value:   val,
-		Expires: t,
-		Path:    "/",
+// Route — Right (more is more right)
+var minimalRights = map[string]int{
+	"edit":           1,
+	"upload-binary":  1,
+	"upload-text":    1,
+	"rename-ask":     2,
+	"rename-confirm": 2,
+	"delete-ask":     3,
+	"delete-confirm": 3,
+	"reindex":        4,
+}
+
+// Group — Right
+var groupRight = map[string]int{
+	"anon":      0,
+	"editor":    1,
+	"trusted":   2,
+	"moderator": 3,
+	"admin":     4,
+}
+
+func emptyUser() *User {
+	return &User{
+		Name:     "anon",
+		Group:    "anon",
+		Password: "",
 	}
 }
+
+func (user *User) CanProceed(route string) bool {
+	if !AuthUsed {
+		return true
+	}
+
+	user.RLock()
+	defer user.RUnlock()
+
+	right, _ := groupRight[user.Group]
+	minimalRight, _ := minimalRights[route]
+	if right >= minimalRight {
+		return true
+	}
+	return false
+}
+
+func (user *User) isCorrectPassword(password string) bool {
+	user.RLock()
+	defer user.RUnlock()
+
+	return password == user.Password
+}
diff --git a/user/users.go b/user/users.go
new file mode 100644
index 0000000..58a174d
--- /dev/null
+++ b/user/users.go
@@ -0,0 +1,44 @@
+package user
+
+import (
+	"sync"
+)
+
+var AuthUsed bool
+var users sync.Map
+var tokens sync.Map
+
+func HasUsername(username string) bool {
+	_, has := users.Load(username)
+	return has
+}
+
+func CredentialsOK(username, password string) bool {
+	return userByName(username).isCorrectPassword(password)
+}
+
+func userByToken(token string) *User {
+	if usernameUntyped, ok := tokens.Load(token); ok {
+		username := usernameUntyped.(string)
+		return userByName(username)
+	}
+	return emptyUser()
+}
+
+func userByName(username string) *User {
+	if userUntyped, ok := users.Load(username); ok {
+		user := userUntyped.(*User)
+		return user
+	}
+	return emptyUser()
+}
+
+func commenceSession(username, token string) {
+	tokens.Store(token, username)
+	go dumpTokens()
+}
+
+func terminateSession(token string) {
+	tokens.Delete(token)
+	go dumpTokens()
+}

From d19adf6729a000b146eef9511ef153e49ca0ba0d Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 10 Jan 2021 16:58:02 +0500
Subject: [PATCH 22/50] Make navi-title better

---
 name.go                 | 15 +++++++++------
 templates/asset.qtpl.go |  1 +
 templates/default.css   |  1 +
 util/util.go            |  6 ++++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/name.go b/name.go
index 1ceb0ba..ac52a86 100644
--- a/name.go
+++ b/name.go
@@ -23,16 +23,19 @@ func CanonicalName(name string) string {
 func naviTitle(canonicalName string) string {
 	var (
 		html = fmt.Sprintf(`<h1 class="navi-title" id="navi-title">
-	<a href="/page/%s">%s</a>`, util.HomePage, util.SiteTitle)
+	<a href="/page/%s">%s</a><span aria-hidden="true" class="navi-title__colon">:&nbsp;</span>`, util.HomePage, util.SiteTitle)
 		prevAcc = `/page/`
 		parts   = strings.Split(canonicalName, "/")
 	)
-	for _, part := range parts {
-		html += fmt.Sprintf(`
-	<span aria-hidden="true">/</span>
-	<a href="%s">%s</a>`,
+	for i, part := range parts {
+		if i > 0 {
+			html += `<span aria-hidden="true" class="navi-title__separator">/</span>`
+		}
+		html += fmt.Sprintf(
+			`<a href="%s">%s</a>`,
 			prevAcc+part,
-			strings.Title(part))
+			util.BeautifulName(part),
+		)
 		prevAcc += part + "/"
 	}
 	return html + "</h1>"
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index a6cf70f..1a83ff5 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -63,6 +63,7 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
 .navi-title a {text-decoration:none;}
+.navi-title__separator { margin: 0 .25rem; }
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
 .img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
 .img-gallery img { max-width: 100%; max-height: 50vh; }
diff --git a/templates/default.css b/templates/default.css
index 0d3ef7b..8c17e5f 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -38,6 +38,7 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
 .navi-title a {text-decoration:none;}
+.navi-title__separator { margin: 0 .25rem; }
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
 .img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
 .img-gallery img { max-width: 100%; max-height: 50vh; }
diff --git a/util/util.go b/util/util.go
index 032e9f7..cdf0a6d 100644
--- a/util/util.go
+++ b/util/util.go
@@ -4,6 +4,7 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"net/http"
+	"path"
 	"strings"
 )
 
@@ -55,3 +56,8 @@ func RandomString(n int) (string, error) {
 	}
 	return hex.EncodeToString(bytes), nil
 }
+
+// Strip hypha name from all ancestor names, replace _ with spaces, title case
+func BeautifulName(uglyName string) string {
+	return strings.Title(strings.ReplaceAll(path.Base(uglyName), "_", " "))
+}

From 0c86b65e355649a295a5cb8a7bc8355d63695226 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 10 Jan 2021 17:44:27 +0500
Subject: [PATCH 23/50] Fix long link overflow

---
 templates/asset.qtpl.go | 1 +
 templates/default.css   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 1a83ff5..c74e613 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -47,6 +47,7 @@ blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
 .wikilink_new:visited {color:#a55858;}
 .wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
 
+article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; }
 article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
 article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
 .codeblock code {padding:0; font-size:15px;}
diff --git a/templates/default.css b/templates/default.css
index 8c17e5f..c0a3d7e 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -22,6 +22,7 @@ blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
 .wikilink_new:visited {color:#a55858;}
 .wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
 
+article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; }
 article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
 article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
 .codeblock code {padding:0; font-size:15px;}

From 09fa2b0716a9edd17cbf25674dfd3a2cfe8916f9 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 10 Jan 2021 18:01:38 +0500
Subject: [PATCH 24/50] Make some visual changes

---
 templates/asset.qtpl.go | 7 +++++--
 templates/default.css   | 7 +++++--
 tree/tree.go            | 4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index c74e613..f8e5ae7 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -32,7 +32,7 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) {
 *, *::before, *::after {box-sizing: border-box;}
 html {height:100%; padding:0; background-color:#ddd;
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
-body {height:100%; margin:0; font-size:16px; font-family:sans-serif;}
+body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:15px;}
@@ -47,7 +47,10 @@ blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
 .wikilink_new:visited {color:#a55858;}
 .wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
 
-article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; }
+article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
+article h1, article h2, article h3, article h4, article h5, article h6 { margin: 1.5rem 0 0 0; }
+article p { margin: .5rem 0; }
+article ul, ol { padding-left: 1.5rem; margin: .5rem 0; }
 article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
 article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
 .codeblock code {padding:0; font-size:15px;}
diff --git a/templates/default.css b/templates/default.css
index c0a3d7e..1a24275 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -7,7 +7,7 @@
 *, *::before, *::after {box-sizing: border-box;}
 html {height:100%; padding:0; background-color:#ddd;
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
-body {height:100%; margin:0; font-size:16px; font-family:sans-serif;}
+body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:15px;}
@@ -22,7 +22,10 @@ blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
 .wikilink_new:visited {color:#a55858;}
 .wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
 
-article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; }
+article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
+article h1, article h2, article h3, article h4, article h5, article h6 { margin: 1.5rem 0 0 0; }
+article p { margin: .5rem 0; }
+article ul, ol { padding-left: 1.5rem; margin: .5rem 0; }
 article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
 article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
 .codeblock code {padding:0; font-size:15px;}
diff --git a/tree/tree.go b/tree/tree.go
index 982fed7..476b540 100644
--- a/tree/tree.go
+++ b/tree/tree.go
@@ -5,6 +5,8 @@ import (
 	"path"
 	"sort"
 	"strings"
+
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 // If Name == "", the tree is empty.
@@ -23,7 +25,7 @@ type tree struct {
 func Tree(hyphaName string, hyphaIterator func(func(string))) (html, prev, next string) {
 	t := &tree{name: hyphaName, root: true, hyphaIterator: hyphaIterator}
 	t.fill()
-	return t.asHtml(), t.prevSibling, t.nextSibling
+	return t.asHtml(), util.BeautifulName(t.prevSibling), util.BeautifulName(t.nextSibling)
 }
 
 // subtree adds a descendant tree to `t` and returns that tree.

From cec494da30b85adb8a1f5322b57b8a27950cbc55 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 10 Jan 2021 18:33:36 +0500
Subject: [PATCH 25/50] Fix display text separators being recognised as table
 row separators

---
 markup/table.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/markup/table.go b/markup/table.go
index f6c6886..a4dca62 100644
--- a/markup/table.go
+++ b/markup/table.go
@@ -30,12 +30,18 @@ func (t *Table) Process(line string) (shouldGoBackToNormal bool) {
 		t.pushRow()
 	}
 	var (
+		inLink             bool
+		skipNext           bool
 		escaping           bool
 		lookingForNonSpace = !t.inMultiline
 		countingColspan    bool
 	)
 	for i, r := range line {
 		switch {
+		case skipNext:
+			skipNext = false
+			continue
+
 		case lookingForNonSpace && unicode.IsSpace(r):
 		case lookingForNonSpace && (r == '!' || r == '|'):
 			t.currCellMarker = r
@@ -50,6 +56,12 @@ func (t *Table) Process(line string) (shouldGoBackToNormal bool) {
 
 		case escaping:
 			t.currCellBuilder.WriteRune(r)
+		case inLink && r == ']' && len(line)-1 > i && line[i+1] == ']':
+			t.currCellBuilder.WriteString("]]")
+			inLink = false
+			skipNext = true
+		case inLink:
+			t.currCellBuilder.WriteRune(r)
 
 		case t.inMultiline && r == '}':
 			t.inMultiline = false
@@ -69,6 +81,10 @@ func (t *Table) Process(line string) (shouldGoBackToNormal bool) {
 		case r == '{':
 			t.inMultiline = true
 			countingColspan = false
+		case r == '[' && len(line)-1 > i && line[i+1] == '[':
+			t.currCellBuilder.WriteString("[[")
+			inLink = true
+			skipNext = true
 		case i == len(line)-1:
 			t.pushCell()
 		default:

From fe43c1e8f82d0b2525df0d5befbf35c30ccbf028 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Mon, 11 Jan 2021 21:13:41 +0500
Subject: [PATCH 26/50] Fix extra navigation links appearing

---
 util/util.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/util/util.go b/util/util.go
index cdf0a6d..a77e2eb 100644
--- a/util/util.go
+++ b/util/util.go
@@ -59,5 +59,8 @@ func RandomString(n int) (string, error) {
 
 // Strip hypha name from all ancestor names, replace _ with spaces, title case
 func BeautifulName(uglyName string) string {
+	if uglyName == "" {
+		return uglyName
+	}
 	return strings.Title(strings.ReplaceAll(path.Base(uglyName), "_", " "))
 }

From 012c6453c8dc4abfd1cea13ba4df1837e1338fa1 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 14 Jan 2021 16:39:54 +0500
Subject: [PATCH 27/50] Improve prev/next links

---
 templates/http_readers.qtpl    | 4 ++--
 templates/http_readers.qtpl.go | 4 ++--
 util/util.go                   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/templates/http_readers.qtpl b/templates/http_readers.qtpl
index 54b0a5a..6d7f861 100644
--- a/templates/http_readers.qtpl
+++ b/templates/http_readers.qtpl
@@ -41,10 +41,10 @@ If `contents` == "", a helpful message is shown instead.
 	</article>
 	<section class="prevnext">
 		{% if prevHyphaName != "" %}
-		<a class="prevnext__el prevnext__prev" href="/page/{%s prevHyphaName %}">← {%s path.Base(prevHyphaName) %}</a>
+		<a class="prevnext__el prevnext__prev" href="/page/{%s prevHyphaName %}" rel="prev">← {%s path.Base(prevHyphaName) %}</a>
 		{% endif %}
 		{% if nextHyphaName != "" %}
-		<a class="prevnext__el prevnext__next" href="/page/{%s nextHyphaName %}">{%s path.Base(nextHyphaName) %} →</a>
+		<a class="prevnext__el prevnext__next" href="/page/{%s nextHyphaName %}" rel="next">{%s path.Base(nextHyphaName) %} →</a>
 		{% endif %}
 	</section>
 	<hr class="page-separator"/>
diff --git a/templates/http_readers.qtpl.go b/templates/http_readers.qtpl.go
index 1bf5e48..bedfc91 100644
--- a/templates/http_readers.qtpl.go
+++ b/templates/http_readers.qtpl.go
@@ -195,7 +195,7 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi
 //line templates/http_readers.qtpl:44
 		qw422016.E().S(prevHyphaName)
 //line templates/http_readers.qtpl:44
-		qw422016.N().S(`">← `)
+		qw422016.N().S(`" rel="prev">← `)
 //line templates/http_readers.qtpl:44
 		qw422016.E().S(path.Base(prevHyphaName))
 //line templates/http_readers.qtpl:44
@@ -214,7 +214,7 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi
 //line templates/http_readers.qtpl:47
 		qw422016.E().S(nextHyphaName)
 //line templates/http_readers.qtpl:47
-		qw422016.N().S(`">`)
+		qw422016.N().S(`" rel="next">`)
 //line templates/http_readers.qtpl:47
 		qw422016.E().S(path.Base(nextHyphaName))
 //line templates/http_readers.qtpl:47
diff --git a/util/util.go b/util/util.go
index a77e2eb..e593f70 100644
--- a/util/util.go
+++ b/util/util.go
@@ -4,7 +4,6 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"net/http"
-	"path"
 	"strings"
 )
 
@@ -62,5 +61,5 @@ func BeautifulName(uglyName string) string {
 	if uglyName == "" {
 		return uglyName
 	}
-	return strings.Title(strings.ReplaceAll(path.Base(uglyName), "_", " "))
+	return strings.Title(strings.ReplaceAll(uglyName, "_", " "))
 }

From f96c470542a07a30c22f8e9ff10e5c9d729678a6 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 14 Jan 2021 16:51:17 +0500
Subject: [PATCH 28/50] Improve navititle

---
 name.go                 | 9 +++++++--
 templates/asset.qtpl.go | 6 +++++-
 templates/default.css   | 6 +++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/name.go b/name.go
index ac52a86..9d0bf08 100644
--- a/name.go
+++ b/name.go
@@ -23,17 +23,22 @@ func CanonicalName(name string) string {
 func naviTitle(canonicalName string) string {
 	var (
 		html = fmt.Sprintf(`<h1 class="navi-title" id="navi-title">
-	<a href="/page/%s">%s</a><span aria-hidden="true" class="navi-title__colon">:&nbsp;</span>`, util.HomePage, util.SiteTitle)
+	<a href="/page/%s">%s</a><span aria-hidden="true" class="navi-title__colon">:</span>`, util.HomePage, util.SiteTitle)
 		prevAcc = `/page/`
 		parts   = strings.Split(canonicalName, "/")
+		rel     = "up"
 	)
 	for i, part := range parts {
 		if i > 0 {
 			html += `<span aria-hidden="true" class="navi-title__separator">/</span>`
 		}
+		if i == len(parts)-1 {
+			rel = "bookmark"
+		}
 		html += fmt.Sprintf(
-			`<a href="%s">%s</a>`,
+			`<a href="%s" rel="%s">%s</a>`,
 			prevAcc+part,
+			rel,
 			util.BeautifulName(part),
 		)
 		prevAcc += part + "/"
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index f8e5ae7..ce8b514 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -66,8 +66,12 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .binary-container_with-img img,
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
-.navi-title a {text-decoration:none;}
+
+.navi-title { border-bottom: #eee 1px solid; padding-bottom: .5rem; margin-bottom: .25rem; }
+.navi-title a {text-decoration:none; }
 .navi-title__separator { margin: 0 .25rem; }
+.navi-title__colon { margin-right: .5rem; }
+
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
 .img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
 .img-gallery img { max-width: 100%; max-height: 50vh; }
diff --git a/templates/default.css b/templates/default.css
index 1a24275..44030bf 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -41,8 +41,12 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .binary-container_with-img img,
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
-.navi-title a {text-decoration:none;}
+
+.navi-title { border-bottom: #eee 1px solid; padding-bottom: .5rem; margin-bottom: .25rem; }
+.navi-title a {text-decoration:none; }
 .navi-title__separator { margin: 0 .25rem; }
+.navi-title__colon { margin-right: .5rem; }
+
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
 .img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
 .img-gallery img { max-width: 100%; max-height: 50vh; }

From 9fab393758f1100d8e79a9db35f0efc0a76dba5f Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 14 Jan 2021 16:56:47 +0500
Subject: [PATCH 29/50] Draw a better border around the upload attachment form

---
 templates/asset.qtpl.go        |  1 +
 templates/default.css          |  1 +
 templates/http_readers.qtpl    |  5 ++--
 templates/http_readers.qtpl.go | 47 +++++++++++++++++-----------------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index ce8b514..95106bc 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -71,6 +71,7 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .navi-title a {text-decoration:none; }
 .navi-title__separator { margin: 0 .25rem; }
 .navi-title__colon { margin-right: .5rem; }
+.upload-amnt { clear: both; border: #eee 1px solid; padding: .5rem; border-radius: .25rem; }
 
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
 .img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
diff --git a/templates/default.css b/templates/default.css
index 44030bf..b19484c 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -46,6 +46,7 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .navi-title a {text-decoration:none; }
 .navi-title__separator { margin: 0 .25rem; }
 .navi-title__colon { margin-right: .5rem; }
+.upload-amnt { clear: both; border: #eee 1px solid; padding: .5rem; border-radius: .25rem; }
 
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
 .img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
diff --git a/templates/http_readers.qtpl b/templates/http_readers.qtpl
index 6d7f861..cb63f5e 100644
--- a/templates/http_readers.qtpl
+++ b/templates/http_readers.qtpl
@@ -47,16 +47,15 @@ If `contents` == "", a helpful message is shown instead.
 		<a class="prevnext__el prevnext__next" href="/page/{%s nextHyphaName %}" rel="next">{%s path.Base(nextHyphaName) %} →</a>
 		{% endif %}
 	</section>
-	<hr class="page-separator"/>
 {% if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" %}
 	<form action="/upload-binary/{%s hyphaName %}"
-			method="post" enctype="multipart/form-data">
+			method="post" enctype="multipart/form-data"
+			class="upload-amnt">
 		<label for="upload-binary__input">Upload a new attachment</label>
 		<br>
 		<input type="file" id="upload-binary__input" name="binary"/>
 		<input type="submit"/>
 	</form>
-	<hr/>
 {% endif %}
 	<aside>
 		{%s= tree %}
diff --git a/templates/http_readers.qtpl.go b/templates/http_readers.qtpl.go
index bedfc91..f0c0826 100644
--- a/templates/http_readers.qtpl.go
+++ b/templates/http_readers.qtpl.go
@@ -225,63 +225,62 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi
 //line templates/http_readers.qtpl:48
 	qw422016.N().S(`
 	</section>
-	<hr class="page-separator"/>
 `)
-//line templates/http_readers.qtpl:51
+//line templates/http_readers.qtpl:50
 	if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" {
-//line templates/http_readers.qtpl:51
+//line templates/http_readers.qtpl:50
 		qw422016.N().S(`
 	<form action="/upload-binary/`)
-//line templates/http_readers.qtpl:52
+//line templates/http_readers.qtpl:51
 		qw422016.E().S(hyphaName)
-//line templates/http_readers.qtpl:52
+//line templates/http_readers.qtpl:51
 		qw422016.N().S(`"
-			method="post" enctype="multipart/form-data">
+			method="post" enctype="multipart/form-data"
+			class="upload-amnt">
 		<label for="upload-binary__input">Upload a new attachment</label>
 		<br>
 		<input type="file" id="upload-binary__input" name="binary"/>
 		<input type="submit"/>
 	</form>
-	<hr/>
 `)
-//line templates/http_readers.qtpl:60
+//line templates/http_readers.qtpl:59
 	}
-//line templates/http_readers.qtpl:60
+//line templates/http_readers.qtpl:59
 	qw422016.N().S(`
 	<aside>
 		`)
-//line templates/http_readers.qtpl:62
+//line templates/http_readers.qtpl:61
 	qw422016.N().S(tree)
-//line templates/http_readers.qtpl:62
+//line templates/http_readers.qtpl:61
 	qw422016.N().S(`
 	</aside>
 </main>
 `)
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 }
 
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) {
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 	StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName)
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 }
 
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) string {
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 	WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName)
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 	qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 	return qs422016
-//line templates/http_readers.qtpl:65
+//line templates/http_readers.qtpl:64
 }

From b4655dbe3359811c40e623092454e8d24b1044b2 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 14 Jan 2021 16:59:30 +0500
Subject: [PATCH 30/50] Make textarea have proportional font

---
 templates/asset.qtpl.go | 2 +-
 templates/default.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 95106bc..a7914c7 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -35,7 +35,7 @@ background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox=
 body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
-textarea {font-size:15px;}
+textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 .edit {height:100%;}
 .edit-form {height:90%;}
 .edit-form textarea {width:100%;height:90%;}
diff --git a/templates/default.css b/templates/default.css
index b19484c..c5676f5 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -10,7 +10,7 @@ background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox=
 body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
-textarea {font-size:15px;}
+textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 .edit {height:100%;}
 .edit-form {height:90%;}
 .edit-form textarea {width:100%;height:90%;}

From e73c3f8289c90d044b8b0c21062fbe6b982d9cbc Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Fri, 15 Jan 2021 19:10:08 +0500
Subject: [PATCH 31/50] Add dark theme

---
 templates/asset.qtpl.go               | 90 ++++++++++++++++++++-------
 templates/default.css                 | 88 +++++++++++++++++++-------
 templates/icon/http-protocol-icon.svg |  2 +-
 3 files changed, 136 insertions(+), 44 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index a7914c7..7ae2ff1 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -23,17 +23,18 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
 `)
 //line templates/asset.qtpl:2
-	qw422016.N().S(`@media screen and (min-width: 700px) {
-	main {margin: 0 auto; width: 700px;}
+	qw422016.N().S(`/* Layout stuff */
+@media screen and (min-width: 800px) {
+	main {margin: 0 auto; width: 800px;}
 }
-@media screen and (max-width: 700px) {
+@media screen and (max-width: 800px) {
 	main {margin: 0; width: 100%;}
 }
 *, *::before, *::after {box-sizing: border-box;}
-html {height:100%; padding:0; background-color:#ddd;
+html {height:100%; padding:0;
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
 body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
-main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-radius: 0 0 .25rem .25rem; }
+main {padding:1rem 2rem; border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 .edit {height:100%;}
@@ -42,22 +43,19 @@ textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;
 .icon {margin-right: .25rem; vertical-align: bottom; }
 
 main h1:not(.navi-title) {font-size:1.7rem;}
-blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
-.wikilink_new {color:#a55858;}
-.wikilink_new:visited {color:#a55858;}
+blockquote { margin-left: 0; padding-left: 1rem; }
 .wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
 
 article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
 article h1, article h2, article h3, article h4, article h5, article h6 { margin: 1.5rem 0 0 0; }
 article p { margin: .5rem 0; }
 article ul, ol { padding-left: 1.5rem; margin: .5rem 0; }
-article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
-article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
+article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
+article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
 .codeblock code {padding:0; font-size:15px;}
-.transclusion code, .transclusion .codeblock {background-color:#ddd;}
-.transclusion {background-color:#eee; border-radius: .25rem; }
+.transclusion { border-radius: .25rem; }
 .transclusion__content > *:not(.binary-container) {margin: 0.5rem; }
-.transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; color: black; text-decoration: none;}
+.transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; text-decoration: none;}
 .transclusion__link::before {content: "⇐ ";}
 
 /* Derived from https://commons.wikimedia.org/wiki/File:U%2B21D2.svg */
@@ -67,14 +65,15 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
 
-.navi-title { border-bottom: #eee 1px solid; padding-bottom: .5rem; margin-bottom: .25rem; }
+.navi-title { padding-bottom: .5rem; margin-bottom: .25rem; }
 .navi-title a {text-decoration:none; }
 .navi-title__separator { margin: 0 .25rem; }
 .navi-title__colon { margin-right: .5rem; }
-.upload-amnt { clear: both; border: #eee 1px solid; padding: .5rem; border-radius: .25rem; }
+.upload-amnt { clear: both; padding: .5rem; border-radius: .25rem; }
+aside { clear: both; }
 
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
-.img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
+.img-gallery_many-images { border-radius: .25rem; padding: .5rem; }
 .img-gallery img { max-width: 100%; max-height: 50vh; }
 figure { margin: 0; }
 figcaption { padding-bottom: .5rem; }
@@ -85,13 +84,13 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 #new-name {width:100%;}
 .navlinks__user {font-style:italic;}
 
-.rc-entry { display: grid; list-style-type: none; padding: .25rem; background-color: #eee; grid-template-columns: 1fr 1fr; }
+.rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; }
 .rc-entry__time { font-style: italic; }
 .rc-entry__hash { font-style: italic; text-align: right; }
 .rc-entry__links { grid-column: 1 / span 2; }
 .rc-entry__author { font-style: italic; }
 
-.prevnext__el { display: block-inline; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; background-color: #eee; border-radius: .25rem; }
+.prevnext__el { display: block-inline; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; border-radius: .25rem; }
 .prevnext__prev { float: left; }
 .prevnext__next { float: right; text-align: right; }
 
@@ -103,10 +102,57 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 .history-entry__time { font-weight: bold; }
 .history-entry__author { font-style: italic; }
 
-table { background-color: #eee; border: #ddd 1px solid; border-radius: .25rem;
-min-width: 4rem; }
-td { padding: .25rem; border: #ddd 1px solid; }
+table { border: #ddd 1px solid; border-radius: .25rem; min-width: 4rem; }
+td { padding: .25rem; }
 caption { caption-side: top; font-size: small; }
+
+/* Color stuff */
+svg path { fill: currentColor !important; }
+/* Lighter stuff #eee */
+article code,
+article .codeblock,
+.transclusion,
+.img-gallery_many-images,
+.rc-entry,
+.prevnext__el,
+table { background-color: #eee; }
+
+/* Other stuff */
+html { background-color: #ddd; }
+
+main { background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); }
+blockquote { border-left: 4px black solid; }
+.wikilink_new {color:#a55858;}
+.transclusion code, .transclusion .codeblock {background-color:#ddd;}
+.transclusion__link { color: black; }
+.wikilink_new:visited {color:#a55858;}
+.navi-title { border-bottom: #eee 1px solid; }
+.upload-amnt { border: #eee 1px solid; }
+td { border: #ddd 1px solid; }
+
+/* Dark theme! */
+@media (prefers-color-scheme: dark) {
+html { background-color: black; color: #ddd; }
+main,  article { background-color: #121212; }
+blockquote { border-left: 4px #ddd solid; }
+a, .wikilink_external { color: #22AA22; }
+a:visited, .wikilink_external:visited { color: #228822; }
+
+.transclusion .transclusion__link { color: #ddd; }
+article code, 
+article .codeblock, 
+.transclusion,
+.img-gallery_many-images,
+.rc-entry,
+.history__entry, 
+.prevnext__el, 
+.upload-amnt, 
+textarea,
+table { border: 0; background-color: #232323; color: #ddd; }
+.transclusion code,
+.transclusion .codeblock { background-color: #343434; }
+}
+
 `)
 //line templates/asset.qtpl:2
 	qw422016.N().S(`
@@ -148,7 +194,7 @@ func StreamIconHTTP(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
 `)
 //line templates/asset.qtpl:7
-	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" color="currentColor" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
 `)
 //line templates/asset.qtpl:7
 	qw422016.N().S(`
diff --git a/templates/default.css b/templates/default.css
index c5676f5..820d034 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -1,14 +1,15 @@
-@media screen and (min-width: 700px) {
-	main {margin: 0 auto; width: 700px;}
+/* Layout stuff */
+@media screen and (min-width: 800px) {
+	main {margin: 0 auto; width: 800px;}
 }
-@media screen and (max-width: 700px) {
+@media screen and (max-width: 800px) {
 	main {margin: 0; width: 100%;}
 }
 *, *::before, *::after {box-sizing: border-box;}
-html {height:100%; padding:0; background-color:#ddd;
+html {height:100%; padding:0;
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
 body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
-main {padding:1rem; background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-radius: 0 0 .25rem .25rem; }
+main {padding:1rem 2rem; border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 .edit {height:100%;}
@@ -17,22 +18,19 @@ textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;
 .icon {margin-right: .25rem; vertical-align: bottom; }
 
 main h1:not(.navi-title) {font-size:1.7rem;}
-blockquote {border-left: 4px black solid; margin-left: 0; padding-left: 1rem;}
-.wikilink_new {color:#a55858;}
-.wikilink_new:visited {color:#a55858;}
+blockquote { margin-left: 0; padding-left: 1rem; }
 .wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
 
 article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
 article h1, article h2, article h3, article h4, article h5, article h6 { margin: 1.5rem 0 0 0; }
 article p { margin: .5rem 0; }
 article ul, ol { padding-left: 1.5rem; margin: .5rem 0; }
-article code {background-color:#eee; padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
-article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
+article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
+article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25rem;}
 .codeblock code {padding:0; font-size:15px;}
-.transclusion code, .transclusion .codeblock {background-color:#ddd;}
-.transclusion {background-color:#eee; border-radius: .25rem; }
+.transclusion { border-radius: .25rem; }
 .transclusion__content > *:not(.binary-container) {margin: 0.5rem; }
-.transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; color: black; text-decoration: none;}
+.transclusion__link {display: block; text-align: right; font-style: italic; margin-top: .5rem; margin-right: .25rem; text-decoration: none;}
 .transclusion__link::before {content: "⇐ ";}
 
 /* Derived from https://commons.wikimedia.org/wiki/File:U%2B21D2.svg */
@@ -42,14 +40,15 @@ article pre.codeblock {background-color:#eee; padding:.5rem; white-space: pre-wr
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
 
-.navi-title { border-bottom: #eee 1px solid; padding-bottom: .5rem; margin-bottom: .25rem; }
+.navi-title { padding-bottom: .5rem; margin-bottom: .25rem; }
 .navi-title a {text-decoration:none; }
 .navi-title__separator { margin: 0 .25rem; }
 .navi-title__colon { margin-right: .5rem; }
-.upload-amnt { clear: both; border: #eee 1px solid; padding: .5rem; border-radius: .25rem; }
+.upload-amnt { clear: both; padding: .5rem; border-radius: .25rem; }
+aside { clear: both; }
 
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
-.img-gallery_many-images { background-color: #eee; border-radius: .25rem; padding: .5rem; }
+.img-gallery_many-images { border-radius: .25rem; padding: .5rem; }
 .img-gallery img { max-width: 100%; max-height: 50vh; }
 figure { margin: 0; }
 figcaption { padding-bottom: .5rem; }
@@ -60,13 +59,13 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 #new-name {width:100%;}
 .navlinks__user {font-style:italic;}
 
-.rc-entry { display: grid; list-style-type: none; padding: .25rem; background-color: #eee; grid-template-columns: 1fr 1fr; }
+.rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; }
 .rc-entry__time { font-style: italic; }
 .rc-entry__hash { font-style: italic; text-align: right; }
 .rc-entry__links { grid-column: 1 / span 2; }
 .rc-entry__author { font-style: italic; }
 
-.prevnext__el { display: block-inline; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; background-color: #eee; border-radius: .25rem; }
+.prevnext__el { display: block-inline; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; border-radius: .25rem; }
 .prevnext__prev { float: left; }
 .prevnext__next { float: right; text-align: right; }
 
@@ -78,7 +77,54 @@ nav ul li {list-style-type:none;margin-right:1rem;}
 .history-entry__time { font-weight: bold; }
 .history-entry__author { font-style: italic; }
 
-table { background-color: #eee; border: #ddd 1px solid; border-radius: .25rem;
-min-width: 4rem; }
-td { padding: .25rem; border: #ddd 1px solid; }
+table { border: #ddd 1px solid; border-radius: .25rem; min-width: 4rem; }
+td { padding: .25rem; }
 caption { caption-side: top; font-size: small; }
+
+/* Color stuff */
+svg path { fill: currentColor !important; }
+/* Lighter stuff #eee */
+article code,
+article .codeblock,
+.transclusion,
+.img-gallery_many-images,
+.rc-entry,
+.prevnext__el,
+table { background-color: #eee; }
+
+/* Other stuff */
+html { background-color: #ddd; }
+
+main { background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); }
+blockquote { border-left: 4px black solid; }
+.wikilink_new {color:#a55858;}
+.transclusion code, .transclusion .codeblock {background-color:#ddd;}
+.transclusion__link { color: black; }
+.wikilink_new:visited {color:#a55858;}
+.navi-title { border-bottom: #eee 1px solid; }
+.upload-amnt { border: #eee 1px solid; }
+td { border: #ddd 1px solid; }
+
+/* Dark theme! */
+@media (prefers-color-scheme: dark) {
+html { background-color: black; color: #ddd; }
+main,  article { background-color: #121212; }
+blockquote { border-left: 4px #ddd solid; }
+a, .wikilink_external { color: #22AA22; }
+a:visited, .wikilink_external:visited { color: #228822; }
+
+.transclusion .transclusion__link { color: #ddd; }
+article code, 
+article .codeblock, 
+.transclusion,
+.img-gallery_many-images,
+.rc-entry,
+.history__entry, 
+.prevnext__el, 
+.upload-amnt, 
+textarea,
+table { border: 0; background-color: #232323; color: #ddd; }
+.transclusion code,
+.transclusion .codeblock { background-color: #343434; }
+}
+
diff --git a/templates/icon/http-protocol-icon.svg b/templates/icon/http-protocol-icon.svg
index d4af44a..c375ec4 100644
--- a/templates/icon/http-protocol-icon.svg
+++ b/templates/icon/http-protocol-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" color="currentColor" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>

From 80ebd4ee48bed9ac04e0ed7c7e02390cedbd0bf8 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Fri, 15 Jan 2021 19:16:00 +0500
Subject: [PATCH 32/50] And some more css changes

---
 templates/asset.qtpl.go | 7 ++++---
 templates/default.css   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 7ae2ff1..6b906b1 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -25,16 +25,16 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) {
 //line templates/asset.qtpl:2
 	qw422016.N().S(`/* Layout stuff */
 @media screen and (min-width: 800px) {
-	main {margin: 0 auto; width: 800px;}
+	main {padding:1rem 2rem; margin: 0 auto; width: 800px;}
 }
 @media screen and (max-width: 800px) {
-	main {margin: 0; width: 100%;}
+	main {padding: 1rem; margin: 0; width: 100%;}
 }
 *, *::before, *::after {box-sizing: border-box;}
 html {height:100%; padding:0;
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
 body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
-main {padding:1rem 2rem; border-radius: 0 0 .25rem .25rem; }
+main {border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 .edit {height:100%;}
@@ -82,6 +82,7 @@ nav ul {display:flex; padding-left:0; flex-wrap:wrap; margin-top:0;}
 nav ul li {list-style-type:none;margin-right:1rem;}
 
 #new-name {width:100%;}
+.navlinks b {text-decoration: underline; }
 .navlinks__user {font-style:italic;}
 
 .rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; }
diff --git a/templates/default.css b/templates/default.css
index 820d034..ca8f8f1 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -1,15 +1,15 @@
 /* Layout stuff */
 @media screen and (min-width: 800px) {
-	main {margin: 0 auto; width: 800px;}
+	main {padding:1rem 2rem; margin: 0 auto; width: 800px;}
 }
 @media screen and (max-width: 800px) {
-	main {margin: 0; width: 100%;}
+	main {padding: 1rem; margin: 0; width: 100%;}
 }
 *, *::before, *::after {box-sizing: border-box;}
 html {height:100%; padding:0;
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
 body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
-main {padding:1rem 2rem; border-radius: 0 0 .25rem .25rem; }
+main {border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 .edit {height:100%;}
@@ -57,6 +57,7 @@ nav ul {display:flex; padding-left:0; flex-wrap:wrap; margin-top:0;}
 nav ul li {list-style-type:none;margin-right:1rem;}
 
 #new-name {width:100%;}
+.navlinks b {text-decoration: underline; }
 .navlinks__user {font-style:italic;}
 
 .rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; }

From 306f536aa663d7d78a858820bd6b949de19f2302 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sat, 16 Jan 2021 20:44:49 +0500
Subject: [PATCH 33/50] Make dark theme lest contrast

---
 templates/asset.qtpl.go | 14 ++++++++------
 templates/default.css   | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 6b906b1..e8ff5cb 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -133,11 +133,13 @@ td { border: #ddd 1px solid; }
 
 /* Dark theme! */
 @media (prefers-color-scheme: dark) {
-html { background-color: black; color: #ddd; }
-main,  article { background-color: #121212; }
+html { background-color: #121212; color: #ddd; }
+main,  article { background-color: #343434; }
 blockquote { border-left: 4px #ddd solid; }
-a, .wikilink_external { color: #22AA22; }
-a:visited, .wikilink_external:visited { color: #228822; }
+a, .wikilink_external { color: #f1fa8c; }
+a:visited, .wikilink_external:visited { color: #ffb86c; }
+.wikilink_new, .wikilink_new:visited { color: #dd4444; }
+.prevnext__el, .prevnext__el:visited { color: #ddd; }
 
 .transclusion .transclusion__link { color: #ddd; }
 article code, 
@@ -149,9 +151,9 @@ article .codeblock,
 .prevnext__el, 
 .upload-amnt, 
 textarea,
-table { border: 0; background-color: #232323; color: #ddd; }
+table { border: 0; background-color: #444444; color: #ddd; }
 .transclusion code,
-.transclusion .codeblock { background-color: #343434; }
+.transclusion .codeblock { background-color: #454545; }
 }
 
 `)
diff --git a/templates/default.css b/templates/default.css
index ca8f8f1..89247dc 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -108,11 +108,13 @@ td { border: #ddd 1px solid; }
 
 /* Dark theme! */
 @media (prefers-color-scheme: dark) {
-html { background-color: black; color: #ddd; }
-main,  article { background-color: #121212; }
+html { background-color: #121212; color: #ddd; }
+main,  article { background-color: #343434; }
 blockquote { border-left: 4px #ddd solid; }
-a, .wikilink_external { color: #22AA22; }
-a:visited, .wikilink_external:visited { color: #228822; }
+a, .wikilink_external { color: #f1fa8c; }
+a:visited, .wikilink_external:visited { color: #ffb86c; }
+.wikilink_new, .wikilink_new:visited { color: #dd4444; }
+.prevnext__el, .prevnext__el:visited { color: #ddd; }
 
 .transclusion .transclusion__link { color: #ddd; }
 article code, 
@@ -124,8 +126,8 @@ article .codeblock,
 .prevnext__el, 
 .upload-amnt, 
 textarea,
-table { border: 0; background-color: #232323; color: #ddd; }
+table { border: 0; background-color: #444444; color: #ddd; }
 .transclusion code,
-.transclusion .codeblock { background-color: #343434; }
+.transclusion .codeblock { background-color: #454545; }
 }
 

From 731a9946c5526b24b416a865f5d7959b56048087 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sat, 16 Jan 2021 21:42:18 +0500
Subject: [PATCH 34/50] Add edit previews

---
 http_mutators.go                |   6 +-
 templates/asset.qtpl.go         |   5 +-
 templates/default.css           |   5 +-
 templates/http_mutators.qtpl    |  25 ++++++-
 templates/http_mutators.qtpl.go | 114 +++++++++++++++++++++++++++-----
 5 files changed, 131 insertions(+), 24 deletions(-)

diff --git a/http_mutators.go b/http_mutators.go
index 6927e7f..ff81346 100644
--- a/http_mutators.go
+++ b/http_mutators.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"net/http"
 
+	"github.com/bouncepaw/mycorrhiza/markup"
 	"github.com/bouncepaw/mycorrhiza/templates"
 	"github.com/bouncepaw/mycorrhiza/user"
 	"github.com/bouncepaw/mycorrhiza/util"
@@ -151,6 +152,7 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) {
 	var (
 		hyphaName = HyphaNameFromRq(rq, "upload-text")
 		textData  = rq.PostFormValue("text")
+		action    = rq.PostFormValue("action")
 		u         = user.FromRequest(rq)
 	)
 	if ok := user.CanProceed(rq, "upload-text"); !ok {
@@ -162,7 +164,9 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) {
 		HttpErr(w, http.StatusBadRequest, hyphaName, "Error", "No text data passed")
 		return
 	}
-	if hop := UploadText(hyphaName, textData, u); len(hop.Errs) != 0 {
+	if action == "Preview" {
+		util.HTTP200Page(w, base("Preview "+hyphaName, templates.PreviewHTML(rq, hyphaName, textData, "", markup.Doc(hyphaName, textData).AsHTML())))
+	} else if hop := UploadText(hyphaName, textData, u); len(hop.Errs) != 0 {
 		HttpErr(w, http.StatusInternalServerError, hyphaName, "Error", hop.Errs[0].Error())
 	} else {
 		http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther)
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index e8ff5cb..300aa46 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -37,9 +37,12 @@ body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation
 main {border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
-.edit {height:100%;}
+.edit_no-preview {height:100%;}
+.edit_with-preview .edit-form textarea { min-height: 500px; }
+.edit__preview { border: 2px dashed #ddd; }
 .edit-form {height:90%;}
 .edit-form textarea {width:100%;height:90%;}
+.edit-form__save { font-weight: bold; }
 .icon {margin-right: .25rem; vertical-align: bottom; }
 
 main h1:not(.navi-title) {font-size:1.7rem;}
diff --git a/templates/default.css b/templates/default.css
index 89247dc..41c3208 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -12,9 +12,12 @@ body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation
 main {border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
 textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
-.edit {height:100%;}
+.edit_no-preview {height:100%;}
+.edit_with-preview .edit-form textarea { min-height: 500px; }
+.edit__preview { border: 2px dashed #ddd; }
 .edit-form {height:90%;}
 .edit-form textarea {width:100%;height:90%;}
+.edit-form__save { font-weight: bold; }
 .icon {margin-right: .25rem; vertical-align: bottom; }
 
 main h1:not(.navi-title) {font-size:1.7rem;}
diff --git a/templates/http_mutators.qtpl b/templates/http_mutators.qtpl
index 049f8ae..72466bd 100644
--- a/templates/http_mutators.qtpl
+++ b/templates/http_mutators.qtpl
@@ -1,7 +1,7 @@
 {% import "net/http" %}
 
 {% func EditHTML(rq *http.Request, hyphaName, textAreaFill, warning string) %}
-<main class="edit">
+<main class="edit edit_no-preview">
 {%s= navHTML(rq, hyphaName, "edit") %}
 	<h1>Edit {%s hyphaName %}</h1>
 	{%s= warning %}
@@ -9,8 +9,27 @@
 			action="/upload-text/{%s hyphaName %}">
 		<textarea name="text">{%s textAreaFill %}</textarea>
 		<br/>
-		<input type="submit"/>
-		<a href="/page/{%s hyphaName %}">Cancel</a>
+		<input type="submit" name="action" value="Save" class="edit-form__save"/>
+		<input type="submit" name="action" value="Preview" class="edit-form__preview">
+		<a href="/page/{%s hyphaName %}" class="edit-form__cancel">Cancel</a>
 	</form>
 </main>
 {% endfunc %}
+
+{% func PreviewHTML(rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) %}
+<main class="edit edit_with-preview">
+{%s= navHTML(rq, hyphaName, "edit") %}
+	<h1>Edit {%s hyphaName %} (preview)</h1>
+	{%s= warning %}
+	<form method="post" class="edit-form"
+			action="/upload-text/{%s hyphaName %}">
+		<textarea name="text">{%s textAreaFill %}</textarea>
+		<br/>
+		<input type="submit" name="action" value="Save" class="edit-form__save"/>
+		<input type="submit" name="action" value="Preview" class="edit-form__preview">
+		<a href="/page/{%s hyphaName %}" class="edit-form__cancel">Cancel</a>
+	</form>
+	<p class="warning">Note that the hypha is not saved yet. You can preview the changes ↓</p>
+	<section class="edit__preview">{%s= renderedPage %}</section>
+</main>
+{% endfunc %}
diff --git a/templates/http_mutators.qtpl.go b/templates/http_mutators.qtpl.go
index 62a24a1..7c1c342 100644
--- a/templates/http_mutators.qtpl.go
+++ b/templates/http_mutators.qtpl.go
@@ -24,7 +24,7 @@ var (
 func StreamEditHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string) {
 //line templates/http_mutators.qtpl:3
 	qw422016.N().S(`
-<main class="edit">
+<main class="edit edit_no-preview">
 `)
 //line templates/http_mutators.qtpl:5
 	qw422016.N().S(navHTML(rq, hyphaName, "edit"))
@@ -52,40 +52,118 @@ func StreamEditHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, text
 //line templates/http_mutators.qtpl:10
 	qw422016.N().S(`</textarea>
 		<br/>
-		<input type="submit"/>
+		<input type="submit" name="action" value="Save" class="edit-form__save"/>
+		<input type="submit" name="action" value="Preview" class="edit-form__preview">
 		<a href="/page/`)
-//line templates/http_mutators.qtpl:13
+//line templates/http_mutators.qtpl:14
 	qw422016.E().S(hyphaName)
-//line templates/http_mutators.qtpl:13
-	qw422016.N().S(`">Cancel</a>
+//line templates/http_mutators.qtpl:14
+	qw422016.N().S(`" class="edit-form__cancel">Cancel</a>
 	</form>
 </main>
 `)
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 }
 
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 func WriteEditHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string) {
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 	StreamEditHTML(qw422016, rq, hyphaName, textAreaFill, warning)
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 }
 
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 func EditHTML(rq *http.Request, hyphaName, textAreaFill, warning string) string {
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 	WriteEditHTML(qb422016, rq, hyphaName, textAreaFill, warning)
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 	qs422016 := string(qb422016.B)
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
 	return qs422016
-//line templates/http_mutators.qtpl:16
+//line templates/http_mutators.qtpl:17
+}
+
+//line templates/http_mutators.qtpl:19
+func StreamPreviewHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) {
+//line templates/http_mutators.qtpl:19
+	qw422016.N().S(`
+<main class="edit edit_with-preview">
+`)
+//line templates/http_mutators.qtpl:21
+	qw422016.N().S(navHTML(rq, hyphaName, "edit"))
+//line templates/http_mutators.qtpl:21
+	qw422016.N().S(`
+	<h1>Edit `)
+//line templates/http_mutators.qtpl:22
+	qw422016.E().S(hyphaName)
+//line templates/http_mutators.qtpl:22
+	qw422016.N().S(` (preview)</h1>
+	`)
+//line templates/http_mutators.qtpl:23
+	qw422016.N().S(warning)
+//line templates/http_mutators.qtpl:23
+	qw422016.N().S(`
+	<form method="post" class="edit-form"
+			action="/upload-text/`)
+//line templates/http_mutators.qtpl:25
+	qw422016.E().S(hyphaName)
+//line templates/http_mutators.qtpl:25
+	qw422016.N().S(`">
+		<textarea name="text">`)
+//line templates/http_mutators.qtpl:26
+	qw422016.E().S(textAreaFill)
+//line templates/http_mutators.qtpl:26
+	qw422016.N().S(`</textarea>
+		<br/>
+		<input type="submit" name="action" value="Save" class="edit-form__save"/>
+		<input type="submit" name="action" value="Preview" class="edit-form__preview">
+		<a href="/page/`)
+//line templates/http_mutators.qtpl:30
+	qw422016.E().S(hyphaName)
+//line templates/http_mutators.qtpl:30
+	qw422016.N().S(`" class="edit-form__cancel">Cancel</a>
+	</form>
+	<p class="warning">Note that the hypha is not saved yet. You can preview the changes ↓</p>
+	<section class="edit__preview">`)
+//line templates/http_mutators.qtpl:33
+	qw422016.N().S(renderedPage)
+//line templates/http_mutators.qtpl:33
+	qw422016.N().S(`</section>
+</main>
+`)
+//line templates/http_mutators.qtpl:35
+}
+
+//line templates/http_mutators.qtpl:35
+func WritePreviewHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) {
+//line templates/http_mutators.qtpl:35
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line templates/http_mutators.qtpl:35
+	StreamPreviewHTML(qw422016, rq, hyphaName, textAreaFill, warning, renderedPage)
+//line templates/http_mutators.qtpl:35
+	qt422016.ReleaseWriter(qw422016)
+//line templates/http_mutators.qtpl:35
+}
+
+//line templates/http_mutators.qtpl:35
+func PreviewHTML(rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) string {
+//line templates/http_mutators.qtpl:35
+	qb422016 := qt422016.AcquireByteBuffer()
+//line templates/http_mutators.qtpl:35
+	WritePreviewHTML(qb422016, rq, hyphaName, textAreaFill, warning, renderedPage)
+//line templates/http_mutators.qtpl:35
+	qs422016 := string(qb422016.B)
+//line templates/http_mutators.qtpl:35
+	qt422016.ReleaseByteBuffer(qb422016)
+//line templates/http_mutators.qtpl:35
+	return qs422016
+//line templates/http_mutators.qtpl:35
 }

From 36ecf44a2e3d4507fb279562a62f44998dd45cca Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sat, 16 Jan 2021 21:57:57 +0500
Subject: [PATCH 35/50] Some CSS fixes

---
 templates/asset.qtpl.go | 10 ++++++----
 templates/default.css   | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 300aa46..abab4b6 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -31,8 +31,7 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) {
 	main {padding: 1rem; margin: 0; width: 100%;}
 }
 *, *::before, *::after {box-sizing: border-box;}
-html {height:100%; padding:0;
-background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
+html { height:100%; padding:0; }
 body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 main {border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
@@ -122,7 +121,9 @@ article .codeblock,
 table { background-color: #eee; }
 
 /* Other stuff */
-html { background-color: #ddd; }
+html { background-color: #ddd; 
+background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+} /* heropatterns.com */
 
 main { background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); }
 blockquote { border-left: 4px black solid; }
@@ -136,7 +137,7 @@ td { border: #ddd 1px solid; }
 
 /* Dark theme! */
 @media (prefers-color-scheme: dark) {
-html { background-color: #121212; color: #ddd; }
+html { background: #222; color: #ddd; }
 main,  article { background-color: #343434; }
 blockquote { border-left: 4px #ddd solid; }
 a, .wikilink_external { color: #f1fa8c; }
@@ -157,6 +158,7 @@ textarea,
 table { border: 0; background-color: #444444; color: #ddd; }
 .transclusion code,
 .transclusion .codeblock { background-color: #454545; }
+mark { background: rgba(130, 80, 30, 5); color: inherit; }
 }
 
 `)
diff --git a/templates/default.css b/templates/default.css
index 41c3208..ef42a50 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -6,8 +6,7 @@
 	main {padding: 1rem; margin: 0; width: 100%;}
 }
 *, *::before, *::after {box-sizing: border-box;}
-html {height:100%; padding:0;
-background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");} /* heropatterns.com */
+html { height:100%; padding:0; }
 body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;}
 main {border-radius: 0 0 .25rem .25rem; }
 main > form {margin-bottom:1rem;}
@@ -97,7 +96,9 @@ article .codeblock,
 table { background-color: #eee; }
 
 /* Other stuff */
-html { background-color: #ddd; }
+html { background-color: #ddd; 
+background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+} /* heropatterns.com */
 
 main { background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); }
 blockquote { border-left: 4px black solid; }
@@ -111,7 +112,7 @@ td { border: #ddd 1px solid; }
 
 /* Dark theme! */
 @media (prefers-color-scheme: dark) {
-html { background-color: #121212; color: #ddd; }
+html { background: #222; color: #ddd; }
 main,  article { background-color: #343434; }
 blockquote { border-left: 4px #ddd solid; }
 a, .wikilink_external { color: #f1fa8c; }
@@ -132,5 +133,6 @@ textarea,
 table { border: 0; background-color: #444444; color: #ddd; }
 .transclusion code,
 .transclusion .codeblock { background-color: #454545; }
+mark { background: rgba(130, 80, 30, 5); color: inherit; }
 }
 

From 0341fa64400f1946ec2e8aa327179054bb1be240 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Tue, 19 Jan 2021 23:08:59 +0500
Subject: [PATCH 36/50] Allow unattaching

---
 history/operations.go          |   1 +
 http_mutators.go               |  54 ++++++++++++
 http_readers.go                |   4 +-
 hypha.go                       |  23 +++++
 main.go                        |   2 +-
 templates/asset.qtpl.go        |   1 +
 templates/default.css          |   1 +
 templates/http_readers.qtpl    |   5 +-
 templates/http_readers.qtpl.go |  59 ++++++++-----
 templates/unattach.qtpl        |  24 ++++++
 templates/unattach.qtpl.go     | 148 +++++++++++++++++++++++++++++++++
 user/user.go                   |  18 ++--
 12 files changed, 307 insertions(+), 33 deletions(-)
 create mode 100644 templates/unattach.qtpl
 create mode 100644 templates/unattach.qtpl.go

diff --git a/history/operations.go b/history/operations.go
index 49195b6..e788b6e 100644
--- a/history/operations.go
+++ b/history/operations.go
@@ -24,6 +24,7 @@ const (
 	TypeEditBinary
 	TypeDeleteHypha
 	TypeRenameHypha
+	TypeUnattachHypha
 )
 
 // HistoryOp is an object representing a history operation.
diff --git a/http_mutators.go b/http_mutators.go
index ff81346..61d1da9 100644
--- a/http_mutators.go
+++ b/http_mutators.go
@@ -16,11 +16,65 @@ func init() {
 	http.HandleFunc("/edit/", handlerEdit)
 	http.HandleFunc("/delete-ask/", handlerDeleteAsk)
 	http.HandleFunc("/rename-ask/", handlerRenameAsk)
+	http.HandleFunc("/unattach-ask/", handlerUnattachAsk)
 	// And those that do mutate something:
 	http.HandleFunc("/upload-binary/", handlerUploadBinary)
 	http.HandleFunc("/upload-text/", handlerUploadText)
 	http.HandleFunc("/delete-confirm/", handlerDeleteConfirm)
 	http.HandleFunc("/rename-confirm/", handlerRenameConfirm)
+	http.HandleFunc("/unattach-confirm/", handlerUnattachConfirm)
+}
+
+func handlerUnattachAsk(w http.ResponseWriter, rq *http.Request) {
+	log.Println(rq.URL)
+	var (
+		hyphaName = HyphaNameFromRq(rq, "unattach-ask")
+		hd, isOld = HyphaStorage[hyphaName]
+		hasAmnt   = hd != nil && hd.binaryPath != ""
+	)
+	if !hasAmnt {
+		HttpErr(w, http.StatusBadRequest, hyphaName, "Cannot unattach", "No attachment attached yet, therefore you cannot unattach")
+		log.Println("Rejected (no amnt):", rq.URL)
+		return
+	} else if ok := user.CanProceed(rq, "unattach-confirm"); !ok {
+		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a trusted editor to unattach attachments")
+		log.Println("Rejected (no rights):", rq.URL)
+		return
+	}
+	util.HTTP200Page(w, base("Unattach "+hyphaName+"?", templates.UnattachAskHTML(rq, hyphaName, isOld)))
+}
+
+func handlerUnattachConfirm(w http.ResponseWriter, rq *http.Request) {
+	log.Println(rq.URL)
+	var (
+		hyphaName        = HyphaNameFromRq(rq, "unattach-confirm")
+		hyphaData, isOld = HyphaStorage[hyphaName]
+		hasAmnt          = hyphaData != nil && hyphaData.binaryPath != ""
+		u                = user.FromRequest(rq)
+	)
+	if !u.CanProceed("unattach-confirm") {
+		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a trusted editor to unattach attachments")
+		log.Println("Rejected (no rights):", rq.URL)
+		return
+	}
+	if !hasAmnt {
+		HttpErr(w, http.StatusBadRequest, hyphaName, "Cannot unattach", "No attachment attached yet, therefore you cannot unattach")
+		log.Println("Rejected (no amnt):", rq.URL)
+		return
+	} else if !isOld {
+		// The precondition is to have the hypha in the first place.
+		HttpErr(w, http.StatusPreconditionFailed, hyphaName,
+			"Error: no such hypha",
+			"Could not unattach this hypha because it does not exist")
+		return
+	}
+	if hop := hyphaData.UnattachHypha(hyphaName, u); len(hop.Errs) != 0 {
+		HttpErr(w, http.StatusInternalServerError, hyphaName,
+			"Error: could not unattach hypha",
+			fmt.Sprintf("Could not unattach this hypha due to internal errors. Server errors: <code>%v</code>", hop.Errs))
+		return
+	}
+	http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther)
 }
 
 func handlerRenameAsk(w http.ResponseWriter, rq *http.Request) {
diff --git a/http_readers.go b/http_readers.go
index 497a30f..939aef1 100644
--- a/http_readers.go
+++ b/http_readers.go
@@ -80,6 +80,7 @@ func handlerPage(w http.ResponseWriter, rq *http.Request) {
 	var (
 		hyphaName         = HyphaNameFromRq(rq, "page")
 		data, hyphaExists = HyphaStorage[hyphaName]
+		hasAmnt           = hyphaExists && data.binaryPath != ""
 		contents          string
 		openGraph         string
 	)
@@ -102,6 +103,7 @@ func handlerPage(w http.ResponseWriter, rq *http.Request) {
 			templates.PageHTML(rq, hyphaName,
 				naviTitle(hyphaName),
 				contents,
-				treeHTML, prevHypha, nextHypha),
+				treeHTML, prevHypha, nextHypha,
+				hasAmnt),
 			openGraph))
 }
diff --git a/hypha.go b/hypha.go
index c9f2612..64015e8 100644
--- a/hypha.go
+++ b/hypha.go
@@ -128,6 +128,29 @@ func (hd *HyphaData) DeleteHypha(hyphaName string, u *user.User) *history.Histor
 	return hop
 }
 
+// UnattachHypha unattaches hypha and makes a history record about that.
+func (hd *HyphaData) UnattachHypha(hyphaName string, u *user.User) *history.HistoryOp {
+	hop := history.Operation(history.TypeUnattachHypha).
+		WithFilesRemoved(hd.binaryPath).
+		WithMsg(fmt.Sprintf("Unattach ‘%s’", hyphaName)).
+		WithUser(u).
+		Apply()
+	if len(hop.Errs) == 0 {
+		hd, ok := HyphaStorage[hyphaName]
+		if ok {
+			if hd.binaryPath != "" {
+				hd.binaryPath = ""
+			}
+			// If nothing is left of the hypha
+			if hd.textPath == "" {
+				delete(HyphaStorage, hyphaName)
+				hyphae.DecrementCount()
+			}
+		}
+	}
+	return hop
+}
+
 func findHyphaeToRename(hyphaName string, recursive bool) []string {
 	hyphae := []string{hyphaName}
 	if recursive {
diff --git a/main.go b/main.go
index ae1aa0f..6a4c26a 100644
--- a/main.go
+++ b/main.go
@@ -154,7 +154,7 @@ func main() {
 	history.Start(WikiDir)
 
 	// See http_readers.go for /page/, /text/, /binary/
-	// See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/
+	// See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/, /unattach-ask/, /unattach-confirm/
 	// See http_auth.go for /login, /login-data, /logout, /logout-confirm
 	// See http_history.go for /history/, /recent-changes
 	http.HandleFunc("/list", handlerList)
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index abab4b6..36a8da9 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -72,6 +72,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25
 .navi-title__separator { margin: 0 .25rem; }
 .navi-title__colon { margin-right: .5rem; }
 .upload-amnt { clear: both; padding: .5rem; border-radius: .25rem; }
+.upload-amnt__unattach { display: block; }
 aside { clear: both; }
 
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
diff --git a/templates/default.css b/templates/default.css
index ef42a50..192e2fe 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -47,6 +47,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25
 .navi-title__separator { margin: 0 .25rem; }
 .navi-title__colon { margin-right: .5rem; }
 .upload-amnt { clear: both; padding: .5rem; border-radius: .25rem; }
+.upload-amnt__unattach { display: block; }
 aside { clear: both; }
 
 .img-gallery { text-align: center; margin-top: .25rem; margin-bottom: .25rem; }
diff --git a/templates/http_readers.qtpl b/templates/http_readers.qtpl
index cb63f5e..445df90 100644
--- a/templates/http_readers.qtpl
+++ b/templates/http_readers.qtpl
@@ -28,7 +28,7 @@
 {% endfunc %}
 
 If `contents` == "", a helpful message is shown instead.
-{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) %}
+{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) %}
 <main>
 {%= navHTML(rq, hyphaName, "page") %}
 	<article>
@@ -51,6 +51,9 @@ If `contents` == "", a helpful message is shown instead.
 	<form action="/upload-binary/{%s hyphaName %}"
 			method="post" enctype="multipart/form-data"
 			class="upload-amnt">
+		{% if hasAmnt %}
+			<a class="upload-amnt__unattach" href="/unattach-ask/{%s hyphaName %}">Unattach current attachment?</a>
+		{% endif %}
 		<label for="upload-binary__input">Upload a new attachment</label>
 		<br>
 		<input type="file" id="upload-binary__input" name="binary"/>
diff --git a/templates/http_readers.qtpl.go b/templates/http_readers.qtpl.go
index f0c0826..2e52eba 100644
--- a/templates/http_readers.qtpl.go
+++ b/templates/http_readers.qtpl.go
@@ -144,7 +144,7 @@ func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, revHas
 // If `contents` == "", a helpful message is shown instead.
 
 //line templates/http_readers.qtpl:31
-func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) {
+func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) {
 //line templates/http_readers.qtpl:31
 	qw422016.N().S(`
 <main>
@@ -237,50 +237,65 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi
 		qw422016.N().S(`"
 			method="post" enctype="multipart/form-data"
 			class="upload-amnt">
+		`)
+//line templates/http_readers.qtpl:54
+		if hasAmnt {
+//line templates/http_readers.qtpl:54
+			qw422016.N().S(`
+			<a class="upload-amnt__unattach" href="/unattach-ask/`)
+//line templates/http_readers.qtpl:55
+			qw422016.E().S(hyphaName)
+//line templates/http_readers.qtpl:55
+			qw422016.N().S(`">Unattach current attachment?</a>
+		`)
+//line templates/http_readers.qtpl:56
+		}
+//line templates/http_readers.qtpl:56
+		qw422016.N().S(`
 		<label for="upload-binary__input">Upload a new attachment</label>
 		<br>
 		<input type="file" id="upload-binary__input" name="binary"/>
 		<input type="submit"/>
 	</form>
 `)
-//line templates/http_readers.qtpl:59
+//line templates/http_readers.qtpl:62
 	}
-//line templates/http_readers.qtpl:59
+//line templates/http_readers.qtpl:62
 	qw422016.N().S(`
 	<aside>
 		`)
-//line templates/http_readers.qtpl:61
+//line templates/http_readers.qtpl:64
 	qw422016.N().S(tree)
-//line templates/http_readers.qtpl:61
+//line templates/http_readers.qtpl:64
 	qw422016.N().S(`
 	</aside>
 </main>
 `)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
 }
 
-//line templates/http_readers.qtpl:64
-func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) {
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
+func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) {
+//line templates/http_readers.qtpl:67
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:64
-	StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
+	StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName, hasAmnt)
+//line templates/http_readers.qtpl:67
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
 }
 
-//line templates/http_readers.qtpl:64
-func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string) string {
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
+func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) string {
+//line templates/http_readers.qtpl:67
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:64
-	WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
+	WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName, hasAmnt)
+//line templates/http_readers.qtpl:67
 	qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
 	return qs422016
-//line templates/http_readers.qtpl:64
+//line templates/http_readers.qtpl:67
 }
diff --git a/templates/unattach.qtpl b/templates/unattach.qtpl
new file mode 100644
index 0000000..e4f0ae2
--- /dev/null
+++ b/templates/unattach.qtpl
@@ -0,0 +1,24 @@
+{% import "net/http" %}
+{% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %}
+<main>
+{%= navHTML(rq, hyphaName, "unattach-ask") %}
+{%- if isOld -%}
+	<section>
+		<h1>Unattach {%s hyphaName %}?</h1>
+		<p>Do you really want to unattach hypha <em>{%s hyphaName %}</em>?</p>
+		<p><a href="/unattach-confirm/{%s hyphaName %}"><strong>Confirm</strong></a></p>
+		<p><a href="/page/{%s hyphaName %}">Cancel</a></p>
+	</section>
+{%- else -%}
+	{%= cannotUnattachDueToNonExistence(hyphaName) %}
+{%- endif -%}
+</main>
+{% endfunc %}
+
+{% func cannotUnattachDueToNonExistence(hyphaName string) %}
+	<section>
+		<h1>Cannot unattach {%s hyphaName %}</h1>
+		<p>This hypha does not exist.</p>
+		<p><a href="/page/{%s hyphaName %}">Go back</a></p>
+	</section>
+{% endfunc %}
diff --git a/templates/unattach.qtpl.go b/templates/unattach.qtpl.go
new file mode 100644
index 0000000..c00bc80
--- /dev/null
+++ b/templates/unattach.qtpl.go
@@ -0,0 +1,148 @@
+// Code generated by qtc from "unattach.qtpl". DO NOT EDIT.
+// See https://github.com/valyala/quicktemplate for details.
+
+//line templates/unattach.qtpl:1
+package templates
+
+//line templates/unattach.qtpl:1
+import "net/http"
+
+//line templates/unattach.qtpl:2
+import (
+	qtio422016 "io"
+
+	qt422016 "github.com/valyala/quicktemplate"
+)
+
+//line templates/unattach.qtpl:2
+var (
+	_ = qtio422016.Copy
+	_ = qt422016.AcquireByteBuffer
+)
+
+//line templates/unattach.qtpl:2
+func StreamUnattachAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) {
+//line templates/unattach.qtpl:2
+	qw422016.N().S(`
+<main>
+`)
+//line templates/unattach.qtpl:4
+	streamnavHTML(qw422016, rq, hyphaName, "unattach-ask")
+//line templates/unattach.qtpl:4
+	qw422016.N().S(`
+`)
+//line templates/unattach.qtpl:5
+	if isOld {
+//line templates/unattach.qtpl:5
+		qw422016.N().S(`	<section>
+		<h1>Unattach `)
+//line templates/unattach.qtpl:7
+		qw422016.E().S(hyphaName)
+//line templates/unattach.qtpl:7
+		qw422016.N().S(`?</h1>
+		<p>Do you really want to unattach hypha <em>`)
+//line templates/unattach.qtpl:8
+		qw422016.E().S(hyphaName)
+//line templates/unattach.qtpl:8
+		qw422016.N().S(`</em>?</p>
+		<p><a href="/unattach-confirm/`)
+//line templates/unattach.qtpl:9
+		qw422016.E().S(hyphaName)
+//line templates/unattach.qtpl:9
+		qw422016.N().S(`"><strong>Confirm</strong></a></p>
+		<p><a href="/page/`)
+//line templates/unattach.qtpl:10
+		qw422016.E().S(hyphaName)
+//line templates/unattach.qtpl:10
+		qw422016.N().S(`">Cancel</a></p>
+	</section>
+`)
+//line templates/unattach.qtpl:12
+	} else {
+//line templates/unattach.qtpl:12
+		qw422016.N().S(`	`)
+//line templates/unattach.qtpl:13
+		streamcannotUnattachDueToNonExistence(qw422016, hyphaName)
+//line templates/unattach.qtpl:13
+		qw422016.N().S(`
+`)
+//line templates/unattach.qtpl:14
+	}
+//line templates/unattach.qtpl:14
+	qw422016.N().S(`</main>
+`)
+//line templates/unattach.qtpl:16
+}
+
+//line templates/unattach.qtpl:16
+func WriteUnattachAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) {
+//line templates/unattach.qtpl:16
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line templates/unattach.qtpl:16
+	StreamUnattachAskHTML(qw422016, rq, hyphaName, isOld)
+//line templates/unattach.qtpl:16
+	qt422016.ReleaseWriter(qw422016)
+//line templates/unattach.qtpl:16
+}
+
+//line templates/unattach.qtpl:16
+func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) string {
+//line templates/unattach.qtpl:16
+	qb422016 := qt422016.AcquireByteBuffer()
+//line templates/unattach.qtpl:16
+	WriteUnattachAskHTML(qb422016, rq, hyphaName, isOld)
+//line templates/unattach.qtpl:16
+	qs422016 := string(qb422016.B)
+//line templates/unattach.qtpl:16
+	qt422016.ReleaseByteBuffer(qb422016)
+//line templates/unattach.qtpl:16
+	return qs422016
+//line templates/unattach.qtpl:16
+}
+
+//line templates/unattach.qtpl:18
+func streamcannotUnattachDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) {
+//line templates/unattach.qtpl:18
+	qw422016.N().S(`
+	<section>
+		<h1>Cannot unattach `)
+//line templates/unattach.qtpl:20
+	qw422016.E().S(hyphaName)
+//line templates/unattach.qtpl:20
+	qw422016.N().S(`</h1>
+		<p>This hypha does not exist.</p>
+		<p><a href="/page/`)
+//line templates/unattach.qtpl:22
+	qw422016.E().S(hyphaName)
+//line templates/unattach.qtpl:22
+	qw422016.N().S(`">Go back</a></p>
+	</section>
+`)
+//line templates/unattach.qtpl:24
+}
+
+//line templates/unattach.qtpl:24
+func writecannotUnattachDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) {
+//line templates/unattach.qtpl:24
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line templates/unattach.qtpl:24
+	streamcannotUnattachDueToNonExistence(qw422016, hyphaName)
+//line templates/unattach.qtpl:24
+	qt422016.ReleaseWriter(qw422016)
+//line templates/unattach.qtpl:24
+}
+
+//line templates/unattach.qtpl:24
+func cannotUnattachDueToNonExistence(hyphaName string) string {
+//line templates/unattach.qtpl:24
+	qb422016 := qt422016.AcquireByteBuffer()
+//line templates/unattach.qtpl:24
+	writecannotUnattachDueToNonExistence(qb422016, hyphaName)
+//line templates/unattach.qtpl:24
+	qs422016 := string(qb422016.B)
+//line templates/unattach.qtpl:24
+	qt422016.ReleaseByteBuffer(qb422016)
+//line templates/unattach.qtpl:24
+	return qs422016
+//line templates/unattach.qtpl:24
+}
diff --git a/user/user.go b/user/user.go
index 331c17f..640e76f 100644
--- a/user/user.go
+++ b/user/user.go
@@ -15,14 +15,16 @@ type User struct {
 
 // Route — Right (more is more right)
 var minimalRights = map[string]int{
-	"edit":           1,
-	"upload-binary":  1,
-	"upload-text":    1,
-	"rename-ask":     2,
-	"rename-confirm": 2,
-	"delete-ask":     3,
-	"delete-confirm": 3,
-	"reindex":        4,
+	"edit":             1,
+	"upload-binary":    1,
+	"upload-text":      1,
+	"rename-ask":       2,
+	"rename-confirm":   2,
+	"unattach-ask":     2,
+	"unattach-confirm": 2,
+	"delete-ask":       3,
+	"delete-confirm":   3,
+	"reindex":          4,
 }
 
 // Group — Right

From b03576bdb70c09defe442aa0e7b54d724afff77e Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Wed, 20 Jan 2021 18:53:30 +0500
Subject: [PATCH 37/50] Make hypha tabs look more like tabs

---
 templates/asset.qtpl.go         |  46 ++++++---
 templates/common.qtpl           |  18 ++--
 templates/common.qtpl.go        | 164 +++++++++++++++++---------------
 templates/default.css           |  46 ++++++---
 templates/delete.qtpl           |   2 +-
 templates/delete.qtpl.go        |   6 +-
 templates/http_mutators.qtpl    |   4 +-
 templates/http_mutators.qtpl.go |  12 +--
 templates/http_readers.qtpl     |   6 +-
 templates/http_readers.qtpl.go  |  18 ++--
 templates/rename.qtpl           |   2 +-
 templates/rename.qtpl.go        |   6 +-
 12 files changed, 195 insertions(+), 135 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 36a8da9..9115df9 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -25,10 +25,15 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) {
 //line templates/asset.qtpl:2
 	qw422016.N().S(`/* Layout stuff */
 @media screen and (min-width: 800px) {
-	main {padding:1rem 2rem; margin: 0 auto; width: 800px;}
+	main { padding:1rem 2rem; margin: 0 auto; width: 800px; }
+	.hypha-tabs { padding: 1rem 2rem; margin: 0 auto; width: 800px; }
+	.hypha-tabs__tab:nth-of-type(1) { margin-left: 2rem; }
+	.hypha-tabs__tab { margin-right: 1.5rem; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-bottom: 2px #ddd solid; padding: 0 .5rem; }
 }
 @media screen and (max-width: 800px) {
-	main {padding: 1rem; margin: 0; width: 100%;}
+	main { padding: 1rem; margin: 0; width: 100%; }
+	.hypha-tabs { padding: 1rem; margin: 0; width: 100%; }
+	.hypha-tabs__tab { box-shadow: none; margin-right: .5rem; padding: .25rem .5rem; }
 }
 *, *::before, *::after {box-sizing: border-box;}
 html { height:100%; padding:0; }
@@ -67,7 +72,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
 
-.navi-title { padding-bottom: .5rem; margin-bottom: .25rem; }
+.navi-title { padding-bottom: .5rem; margin: .25rem 0; }
 .navi-title a {text-decoration:none; }
 .navi-title__separator { margin: 0 .25rem; }
 .navi-title__colon { margin-right: .5rem; }
@@ -81,12 +86,14 @@ aside { clear: both; }
 figure { margin: 0; }
 figcaption { padding-bottom: .5rem; }
 
-nav ul {display:flex; padding-left:0; flex-wrap:wrap; margin-top:0;}
-nav ul li {list-style-type:none;margin-right:1rem;}
-
 #new-name {width:100%;}
-.navlinks b {text-decoration: underline; }
-.navlinks__user {font-style:italic;}
+
+.hypha-tabs { padding: 0; }
+.hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; }
+.hypha-tabs__tab { list-style-type: none; }
+.hypha-tabs__tab a { text-decoration: none; }
+.hypha-tabs__tab_active { font-weight: bold; }
+.hypha-tabs__user { font-style:italic; }
 
 .rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; }
 .rc-entry__time { font-style: italic; }
@@ -121,12 +128,21 @@ article .codeblock,
 .prevnext__el,
 table { background-color: #eee; }
 
+@media screen and (max-width: 800px) {
+	.hypha-tabs { background-color: white; }
+	.hypha-tabs__tab { box-shadow: none; }
+}
+
 /* Other stuff */
 html { background-color: #ddd; 
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
 } /* heropatterns.com */
 
-main { background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); }
+main, .hypha-tabs__tab { background-color: white; }
+.hypha-tabs__tab { clip-path: inset(-20px -20px 0 -20px); }
+.hypha-tabs__tab a { color: black; }
+.hypha-tabs__tab_active { border-bottom: 2px white solid; }
+
 blockquote { border-left: 4px black solid; }
 .wikilink_new {color:#a55858;}
 .transclusion code, .transclusion .codeblock {background-color:#ddd;}
@@ -139,13 +155,18 @@ td { border: #ddd 1px solid; }
 /* Dark theme! */
 @media (prefers-color-scheme: dark) {
 html { background: #222; color: #ddd; }
-main,  article { background-color: #343434; }
-blockquote { border-left: 4px #ddd solid; }
+main,  article, .hypha-tabs__tab { background-color: #343434; }
+
 a, .wikilink_external { color: #f1fa8c; }
 a:visited, .wikilink_external:visited { color: #ffb86c; }
 .wikilink_new, .wikilink_new:visited { color: #dd4444; }
 .prevnext__el, .prevnext__el:visited { color: #ddd; }
 
+.hypha-tabs__tab a, .hypha-tabs__tab { color: #ddd; background-color: #232323; border: 0; }
+.hypha-tabs__tab_active { background-color: #343434; }
+
+blockquote { border-left: 4px #ddd solid; }
+
 .transclusion .transclusion__link { color: #ddd; }
 article code, 
 article .codeblock, 
@@ -160,6 +181,9 @@ table { border: 0; background-color: #444444; color: #ddd; }
 .transclusion code,
 .transclusion .codeblock { background-color: #454545; }
 mark { background: rgba(130, 80, 30, 5); color: inherit; }
+@media screen and (max-width: 800px) {
+	.hypha-tabs { background-color: #232323; }
+}
 }
 
 `)
diff --git a/templates/common.qtpl b/templates/common.qtpl
index a288422..8a2b075 100644
--- a/templates/common.qtpl
+++ b/templates/common.qtpl
@@ -24,15 +24,21 @@ var navEntries = []navEntry{
 	u := user.FromRequest(rq)
 %}
 
-	<nav class="navlinks">
-		<ul>
+	<nav class="hypha-tabs">
+		<ul class="hypha-tabs__flex">
 		{%- for _, entry := range navEntries -%}
 		{%- if navType == "revision" && entry.path == "revision" -%}
-			<li><b>{%s revisionHash[0] %}</b></li>
+			<li class="hypha-tabs__tab hypha-tabs__tab_active">
+				{%s revisionHash[0] %}
+			</li>
 		{%- elseif navType == entry.path -%}
-			<li><b>{%s entry.title %}</b></li>
+			<li class="hypha-tabs__tab hypha-tabs__tab_active">
+				{%s entry.title %}
+			</li>
 		{%- elseif entry.path != "revision" && u.CanProceed(entry.path) -%}
-			<li><a href="/{%s entry.path %}/{%s hyphaName %}">{%s entry.title %}</a></li>
+			<li class="hypha-tabs__tab">
+				<a href="/{%s entry.path %}/{%s hyphaName %}">{%s entry.title %}</a>
+			</li>
 		{%- endif -%}
 		{%- endfor -%}
 		{%s= userMenuHTML(u) %}
@@ -42,7 +48,7 @@ var navEntries = []navEntry{
 
 {% func userMenuHTML(u *user.User) %}
 	{% if user.AuthUsed %}
-			<li class="navlinks__user">
+			<li class="hypha-tabs__tab hypha-tabs__user">
 			{% if u.Group == "anon" %}
 				<a href="/login">Login</a>
 			{% else %}
diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go
index 7965baa..a30040d 100644
--- a/templates/common.qtpl.go
+++ b/templates/common.qtpl.go
@@ -55,159 +55,165 @@ func streamnavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navTy
 //line templates/common.qtpl:25
 	qw422016.N().S(`
 
-	<nav class="navlinks">
-		<ul>
+	<nav class="hypha-tabs">
+		<ul class="hypha-tabs__flex">
 `)
 //line templates/common.qtpl:29
 	for _, entry := range navEntries {
 //line templates/common.qtpl:30
 		if navType == "revision" && entry.path == "revision" {
 //line templates/common.qtpl:30
-			qw422016.N().S(`			<li><b>`)
-//line templates/common.qtpl:31
+			qw422016.N().S(`			<li class="hypha-tabs__tab hypha-tabs__tab_active">
+				`)
+//line templates/common.qtpl:32
 			qw422016.E().S(revisionHash[0])
-//line templates/common.qtpl:31
-			qw422016.N().S(`</b></li>
-`)
 //line templates/common.qtpl:32
+			qw422016.N().S(`
+			</li>
+`)
+//line templates/common.qtpl:34
 		} else if navType == entry.path {
-//line templates/common.qtpl:32
-			qw422016.N().S(`			<li><b>`)
-//line templates/common.qtpl:33
-			qw422016.E().S(entry.title)
-//line templates/common.qtpl:33
-			qw422016.N().S(`</b></li>
-`)
 //line templates/common.qtpl:34
-		} else if entry.path != "revision" && u.CanProceed(entry.path) {
-//line templates/common.qtpl:34
-			qw422016.N().S(`			<li><a href="/`)
-//line templates/common.qtpl:35
-			qw422016.E().S(entry.path)
-//line templates/common.qtpl:35
-			qw422016.N().S(`/`)
-//line templates/common.qtpl:35
-			qw422016.E().S(hyphaName)
-//line templates/common.qtpl:35
-			qw422016.N().S(`">`)
-//line templates/common.qtpl:35
-			qw422016.E().S(entry.title)
-//line templates/common.qtpl:35
-			qw422016.N().S(`</a></li>
-`)
+			qw422016.N().S(`			<li class="hypha-tabs__tab hypha-tabs__tab_active">
+				`)
 //line templates/common.qtpl:36
+			qw422016.E().S(entry.title)
+//line templates/common.qtpl:36
+			qw422016.N().S(`
+			</li>
+`)
+//line templates/common.qtpl:38
+		} else if entry.path != "revision" && u.CanProceed(entry.path) {
+//line templates/common.qtpl:38
+			qw422016.N().S(`			<li class="hypha-tabs__tab">
+				<a href="/`)
+//line templates/common.qtpl:40
+			qw422016.E().S(entry.path)
+//line templates/common.qtpl:40
+			qw422016.N().S(`/`)
+//line templates/common.qtpl:40
+			qw422016.E().S(hyphaName)
+//line templates/common.qtpl:40
+			qw422016.N().S(`">`)
+//line templates/common.qtpl:40
+			qw422016.E().S(entry.title)
+//line templates/common.qtpl:40
+			qw422016.N().S(`</a>
+			</li>
+`)
+//line templates/common.qtpl:42
 		}
-//line templates/common.qtpl:37
+//line templates/common.qtpl:43
 	}
-//line templates/common.qtpl:37
+//line templates/common.qtpl:43
 	qw422016.N().S(`		`)
-//line templates/common.qtpl:38
+//line templates/common.qtpl:44
 	qw422016.N().S(userMenuHTML(u))
-//line templates/common.qtpl:38
+//line templates/common.qtpl:44
 	qw422016.N().S(`
 		</ul>
 	</nav>
 `)
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 }
 
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 func writenavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) {
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 	streamnavHTML(qw422016, rq, hyphaName, navType, revisionHash...)
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 	qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 }
 
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string {
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 	writenavHTML(qb422016, rq, hyphaName, navType, revisionHash...)
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 	qs422016 := string(qb422016.B)
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 	return qs422016
-//line templates/common.qtpl:41
+//line templates/common.qtpl:47
 }
 
-//line templates/common.qtpl:43
+//line templates/common.qtpl:49
 func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) {
-//line templates/common.qtpl:43
+//line templates/common.qtpl:49
 	qw422016.N().S(`
 	`)
-//line templates/common.qtpl:44
+//line templates/common.qtpl:50
 	if user.AuthUsed {
-//line templates/common.qtpl:44
+//line templates/common.qtpl:50
 		qw422016.N().S(`
-			<li class="navlinks__user">
+			<li class="hypha-tabs__tab hypha-tabs__user">
 			`)
-//line templates/common.qtpl:46
+//line templates/common.qtpl:52
 		if u.Group == "anon" {
-//line templates/common.qtpl:46
+//line templates/common.qtpl:52
 			qw422016.N().S(`
 				<a href="/login">Login</a>
 			`)
-//line templates/common.qtpl:48
+//line templates/common.qtpl:54
 		} else {
-//line templates/common.qtpl:48
+//line templates/common.qtpl:54
 			qw422016.N().S(`
 				<a href="/page/`)
-//line templates/common.qtpl:49
+//line templates/common.qtpl:55
 			qw422016.E().S(util.UserTree)
-//line templates/common.qtpl:49
+//line templates/common.qtpl:55
 			qw422016.N().S(`/`)
-//line templates/common.qtpl:49
+//line templates/common.qtpl:55
 			qw422016.E().S(u.Name)
-//line templates/common.qtpl:49
+//line templates/common.qtpl:55
 			qw422016.N().S(`">`)
-//line templates/common.qtpl:49
+//line templates/common.qtpl:55
 			qw422016.E().S(u.Name)
-//line templates/common.qtpl:49
+//line templates/common.qtpl:55
 			qw422016.N().S(`</a>
 			`)
-//line templates/common.qtpl:50
+//line templates/common.qtpl:56
 		}
-//line templates/common.qtpl:50
+//line templates/common.qtpl:56
 		qw422016.N().S(`
 			</li>
 	`)
-//line templates/common.qtpl:52
+//line templates/common.qtpl:58
 	}
-//line templates/common.qtpl:52
+//line templates/common.qtpl:58
 	qw422016.N().S(`
 `)
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 }
 
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 func writeuserMenuHTML(qq422016 qtio422016.Writer, u *user.User) {
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 	streamuserMenuHTML(qw422016, u)
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 	qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 }
 
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 func userMenuHTML(u *user.User) string {
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 	writeuserMenuHTML(qb422016, u)
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 	qs422016 := string(qb422016.B)
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 	return qs422016
-//line templates/common.qtpl:53
+//line templates/common.qtpl:59
 }
diff --git a/templates/default.css b/templates/default.css
index 192e2fe..e9053ac 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -1,9 +1,14 @@
 /* Layout stuff */
 @media screen and (min-width: 800px) {
-	main {padding:1rem 2rem; margin: 0 auto; width: 800px;}
+	main { padding:1rem 2rem; margin: 0 auto; width: 800px; }
+	.hypha-tabs { padding: 1rem 2rem; margin: 0 auto; width: 800px; }
+	.hypha-tabs__tab:nth-of-type(1) { margin-left: 2rem; }
+	.hypha-tabs__tab { margin-right: 1.5rem; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-bottom: 2px #ddd solid; padding: 0 .5rem; }
 }
 @media screen and (max-width: 800px) {
-	main {padding: 1rem; margin: 0; width: 100%;}
+	main { padding: 1rem; margin: 0; width: 100%; }
+	.hypha-tabs { padding: 1rem; margin: 0; width: 100%; }
+	.hypha-tabs__tab { box-shadow: none; margin-right: .5rem; padding: .25rem .5rem; }
 }
 *, *::before, *::after {box-sizing: border-box;}
 html { height:100%; padding:0; }
@@ -42,7 +47,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25
 .binary-container_with-video video,
 .binary-container_with-audio audio {width: 100%}
 
-.navi-title { padding-bottom: .5rem; margin-bottom: .25rem; }
+.navi-title { padding-bottom: .5rem; margin: .25rem 0; }
 .navi-title a {text-decoration:none; }
 .navi-title__separator { margin: 0 .25rem; }
 .navi-title__colon { margin-right: .5rem; }
@@ -56,12 +61,14 @@ aside { clear: both; }
 figure { margin: 0; }
 figcaption { padding-bottom: .5rem; }
 
-nav ul {display:flex; padding-left:0; flex-wrap:wrap; margin-top:0;}
-nav ul li {list-style-type:none;margin-right:1rem;}
-
 #new-name {width:100%;}
-.navlinks b {text-decoration: underline; }
-.navlinks__user {font-style:italic;}
+
+.hypha-tabs { padding: 0; }
+.hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; }
+.hypha-tabs__tab { list-style-type: none; }
+.hypha-tabs__tab a { text-decoration: none; }
+.hypha-tabs__tab_active { font-weight: bold; }
+.hypha-tabs__user { font-style:italic; }
 
 .rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; }
 .rc-entry__time { font-style: italic; }
@@ -96,12 +103,21 @@ article .codeblock,
 .prevnext__el,
 table { background-color: #eee; }
 
+@media screen and (max-width: 800px) {
+	.hypha-tabs { background-color: white; }
+	.hypha-tabs__tab { box-shadow: none; }
+}
+
 /* Other stuff */
 html { background-color: #ddd; 
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
 } /* heropatterns.com */
 
-main { background-color: white; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); }
+main, .hypha-tabs__tab { background-color: white; }
+.hypha-tabs__tab { clip-path: inset(-20px -20px 0 -20px); }
+.hypha-tabs__tab a { color: black; }
+.hypha-tabs__tab_active { border-bottom: 2px white solid; }
+
 blockquote { border-left: 4px black solid; }
 .wikilink_new {color:#a55858;}
 .transclusion code, .transclusion .codeblock {background-color:#ddd;}
@@ -114,13 +130,18 @@ td { border: #ddd 1px solid; }
 /* Dark theme! */
 @media (prefers-color-scheme: dark) {
 html { background: #222; color: #ddd; }
-main,  article { background-color: #343434; }
-blockquote { border-left: 4px #ddd solid; }
+main,  article, .hypha-tabs__tab { background-color: #343434; }
+
 a, .wikilink_external { color: #f1fa8c; }
 a:visited, .wikilink_external:visited { color: #ffb86c; }
 .wikilink_new, .wikilink_new:visited { color: #dd4444; }
 .prevnext__el, .prevnext__el:visited { color: #ddd; }
 
+.hypha-tabs__tab a, .hypha-tabs__tab { color: #ddd; background-color: #232323; border: 0; }
+.hypha-tabs__tab_active { background-color: #343434; }
+
+blockquote { border-left: 4px #ddd solid; }
+
 .transclusion .transclusion__link { color: #ddd; }
 article code, 
 article .codeblock, 
@@ -135,5 +156,8 @@ table { border: 0; background-color: #444444; color: #ddd; }
 .transclusion code,
 .transclusion .codeblock { background-color: #454545; }
 mark { background: rgba(130, 80, 30, 5); color: inherit; }
+@media screen and (max-width: 800px) {
+	.hypha-tabs { background-color: #232323; }
+}
 }
 
diff --git a/templates/delete.qtpl b/templates/delete.qtpl
index d91c851..1d45e0a 100644
--- a/templates/delete.qtpl
+++ b/templates/delete.qtpl
@@ -2,8 +2,8 @@
 
 This dialog is to be shown to a user when they try to delete a hypha.
 {% func DeleteAskHTML(rq *http.Request, hyphaName string, isOld bool) %}
-<main>
 {%= navHTML(rq, hyphaName, "delete-ask") %}
+<main>
 {% if isOld %}
 	<section>
 		<h1>Delete {%s hyphaName %}?</h1>
diff --git a/templates/delete.qtpl.go b/templates/delete.qtpl.go
index 4f58b04..1e67350 100644
--- a/templates/delete.qtpl.go
+++ b/templates/delete.qtpl.go
@@ -26,12 +26,12 @@ var (
 func StreamDeleteAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) {
 //line templates/delete.qtpl:4
 	qw422016.N().S(`
-<main>
 `)
-//line templates/delete.qtpl:6
+//line templates/delete.qtpl:5
 	streamnavHTML(qw422016, rq, hyphaName, "delete-ask")
-//line templates/delete.qtpl:6
+//line templates/delete.qtpl:5
 	qw422016.N().S(`
+<main>
 `)
 //line templates/delete.qtpl:7
 	if isOld {
diff --git a/templates/http_mutators.qtpl b/templates/http_mutators.qtpl
index 72466bd..39a37ba 100644
--- a/templates/http_mutators.qtpl
+++ b/templates/http_mutators.qtpl
@@ -1,8 +1,8 @@
 {% import "net/http" %}
 
 {% func EditHTML(rq *http.Request, hyphaName, textAreaFill, warning string) %}
-<main class="edit edit_no-preview">
 {%s= navHTML(rq, hyphaName, "edit") %}
+<main class="edit edit_no-preview">
 	<h1>Edit {%s hyphaName %}</h1>
 	{%s= warning %}
 	<form method="post" class="edit-form"
@@ -17,8 +17,8 @@
 {% endfunc %}
 
 {% func PreviewHTML(rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) %}
-<main class="edit edit_with-preview">
 {%s= navHTML(rq, hyphaName, "edit") %}
+<main class="edit edit_with-preview">
 	<h1>Edit {%s hyphaName %} (preview)</h1>
 	{%s= warning %}
 	<form method="post" class="edit-form"
diff --git a/templates/http_mutators.qtpl.go b/templates/http_mutators.qtpl.go
index 7c1c342..8f25c90 100644
--- a/templates/http_mutators.qtpl.go
+++ b/templates/http_mutators.qtpl.go
@@ -24,12 +24,12 @@ var (
 func StreamEditHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string) {
 //line templates/http_mutators.qtpl:3
 	qw422016.N().S(`
-<main class="edit edit_no-preview">
 `)
-//line templates/http_mutators.qtpl:5
+//line templates/http_mutators.qtpl:4
 	qw422016.N().S(navHTML(rq, hyphaName, "edit"))
-//line templates/http_mutators.qtpl:5
+//line templates/http_mutators.qtpl:4
 	qw422016.N().S(`
+<main class="edit edit_no-preview">
 	<h1>Edit `)
 //line templates/http_mutators.qtpl:6
 	qw422016.E().S(hyphaName)
@@ -95,12 +95,12 @@ func EditHTML(rq *http.Request, hyphaName, textAreaFill, warning string) string
 func StreamPreviewHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) {
 //line templates/http_mutators.qtpl:19
 	qw422016.N().S(`
-<main class="edit edit_with-preview">
 `)
-//line templates/http_mutators.qtpl:21
+//line templates/http_mutators.qtpl:20
 	qw422016.N().S(navHTML(rq, hyphaName, "edit"))
-//line templates/http_mutators.qtpl:21
+//line templates/http_mutators.qtpl:20
 	qw422016.N().S(`
+<main class="edit edit_with-preview">
 	<h1>Edit `)
 //line templates/http_mutators.qtpl:22
 	qw422016.E().S(hyphaName)
diff --git a/templates/http_readers.qtpl b/templates/http_readers.qtpl
index 445df90..a9d7304 100644
--- a/templates/http_readers.qtpl
+++ b/templates/http_readers.qtpl
@@ -3,8 +3,8 @@
 {% import "github.com/bouncepaw/mycorrhiza/user" %}
 
 {% func HistoryHTML(rq *http.Request, hyphaName, list string) %}
-<main>
 {%= navHTML(rq, hyphaName, "history") %}
+<main>
 	<article class="history">
 		<h1>History of {%s hyphaName %}</h1>
 		{%s= list %}
@@ -13,8 +13,8 @@
 {% endfunc %}
 
 {% func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) %}
-<main>
 {%= navHTML(rq, hyphaName, "revision", revHash) %}
+<main>
 	<article>
 		<p>Please note that viewing binary parts of hyphae is not supported in history for now.</p>
 		{%s= naviTitle %}
@@ -29,8 +29,8 @@
 
 If `contents` == "", a helpful message is shown instead.
 {% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) %}
-<main>
 {%= navHTML(rq, hyphaName, "page") %}
+<main>
 	<article>
 		{%s= naviTitle %}
 		{% if contents == "" %}
diff --git a/templates/http_readers.qtpl.go b/templates/http_readers.qtpl.go
index 2e52eba..d9000da 100644
--- a/templates/http_readers.qtpl.go
+++ b/templates/http_readers.qtpl.go
@@ -30,12 +30,12 @@ var (
 func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) {
 //line templates/http_readers.qtpl:5
 	qw422016.N().S(`
-<main>
 `)
-//line templates/http_readers.qtpl:7
+//line templates/http_readers.qtpl:6
 	streamnavHTML(qw422016, rq, hyphaName, "history")
-//line templates/http_readers.qtpl:7
+//line templates/http_readers.qtpl:6
 	qw422016.N().S(`
+<main>
 	<article class="history">
 		<h1>History of `)
 //line templates/http_readers.qtpl:9
@@ -83,12 +83,12 @@ func HistoryHTML(rq *http.Request, hyphaName, list string) string {
 func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) {
 //line templates/http_readers.qtpl:15
 	qw422016.N().S(`
-<main>
 `)
-//line templates/http_readers.qtpl:17
+//line templates/http_readers.qtpl:16
 	streamnavHTML(qw422016, rq, hyphaName, "revision", revHash)
-//line templates/http_readers.qtpl:17
+//line templates/http_readers.qtpl:16
 	qw422016.N().S(`
+<main>
 	<article>
 		<p>Please note that viewing binary parts of hyphae is not supported in history for now.</p>
 		`)
@@ -147,12 +147,12 @@ func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, revHas
 func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) {
 //line templates/http_readers.qtpl:31
 	qw422016.N().S(`
-<main>
 `)
-//line templates/http_readers.qtpl:33
+//line templates/http_readers.qtpl:32
 	streamnavHTML(qw422016, rq, hyphaName, "page")
-//line templates/http_readers.qtpl:33
+//line templates/http_readers.qtpl:32
 	qw422016.N().S(`
+<main>
 	<article>
 		`)
 //line templates/http_readers.qtpl:35
diff --git a/templates/rename.qtpl b/templates/rename.qtpl
index b68d912..aee28ce 100644
--- a/templates/rename.qtpl
+++ b/templates/rename.qtpl
@@ -1,8 +1,8 @@
 {% import "net/http" %}
 This dialog is to be shown to a user when they try to rename a hypha.
 {% func RenameAskHTML(rq *http.Request, hyphaName string, isOld bool) %}
-<main>
 {%= navHTML(rq, hyphaName, "rename-ask") %}
+<main>
 {%- if isOld -%}
 	<section>
 		<h1>Rename {%s hyphaName %}</h1>
diff --git a/templates/rename.qtpl.go b/templates/rename.qtpl.go
index 34f4ed9..2347bcd 100644
--- a/templates/rename.qtpl.go
+++ b/templates/rename.qtpl.go
@@ -26,12 +26,12 @@ var (
 func StreamRenameAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) {
 //line templates/rename.qtpl:3
 	qw422016.N().S(`
-<main>
 `)
-//line templates/rename.qtpl:5
+//line templates/rename.qtpl:4
 	streamnavHTML(qw422016, rq, hyphaName, "rename-ask")
-//line templates/rename.qtpl:5
+//line templates/rename.qtpl:4
 	qw422016.N().S(`
+<main>
 `)
 //line templates/rename.qtpl:6
 	if isOld {

From ff875ceb1aed8b5914a1a9682e93bd6834d61d86 Mon Sep 17 00:00:00 2001
From: handlerug <umar@handlerug.me>
Date: Wed, 20 Jan 2021 22:01:47 +0700
Subject: [PATCH 38/50] fix(ui): history month header color in dark mode

---
 templates/asset.qtpl.go | 2 +-
 templates/default.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 9115df9..ae76899 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -107,7 +107,7 @@ figcaption { padding-bottom: .5rem; }
 
 .page-separator { clear: both; }
 .history__entries { background-color: #eee; margin: 0; padding: 0; border-radius: .25rem; }
-.history__month-anchor { text-decoration: none; color: black; }
+.history__month-anchor { text-decoration: none; color: inherit; }
 .history__entry { list-style-type: none; padding: .25rem; }
 .history-entry { padding: .25rem; }
 .history-entry__time { font-weight: bold; }
diff --git a/templates/default.css b/templates/default.css
index e9053ac..c55f4ea 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -82,7 +82,7 @@ figcaption { padding-bottom: .5rem; }
 
 .page-separator { clear: both; }
 .history__entries { background-color: #eee; margin: 0; padding: 0; border-radius: .25rem; }
-.history__month-anchor { text-decoration: none; color: black; }
+.history__month-anchor { text-decoration: none; color: inherit; }
 .history__entry { list-style-type: none; padding: .25rem; }
 .history-entry { padding: .25rem; }
 .history-entry__time { font-weight: bold; }

From e5c96eee886b086856db07534d800d8cf1b500fa Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 21 Jan 2021 18:49:22 +0500
Subject: [PATCH 39/50] Display proper time on history pages

---
 history/information.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/history/information.go b/history/information.go
index 82c0eb3..7bd55e4 100644
--- a/history/information.go
+++ b/history/information.go
@@ -146,13 +146,14 @@ func (rev *Revision) asHistoryEntry(hyphaName string) (html string) {
 		<span class="history-entry__msg">%[4]s</span>
 	</a>%[5]s
 </li>
-`, hyphaName, rev.timeHourMinute(), rev.Hash, rev.Message, author)
+`, hyphaName, rev.timeToDisplay(), rev.Hash, rev.Message, author)
 }
 
-// Return time like 13:42
-func (rev *Revision) timeHourMinute() string {
+// Return time like mm-dd 13:42
+func (rev *Revision) timeToDisplay() string {
+	D := rev.Time.Day()
 	h, m, _ := rev.Time.Clock()
-	return strconv.Itoa(h) + ":" + strconv.Itoa(m)
+	return fmt.Sprintf("%02d — %02d:%02d", D, h, m)
 }
 
 // This regex is wrapped in "". For some reason, these quotes appear at some time and we have to get rid of them.

From 43fbe3c6e2f1816fac415ae1c1dd1cab83149476 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Thu, 21 Jan 2021 19:21:34 +0500
Subject: [PATCH 40/50] Ignore edits that do not edit anything

---
 history/information.go | 6 ++++++
 history/operations.go  | 6 ++++++
 hypha.go               | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/history/information.go b/history/information.go
index 7bd55e4..ef60b32 100644
--- a/history/information.go
+++ b/history/information.go
@@ -82,6 +82,12 @@ func RecentChanges(n int) string {
 	return templates.RecentChangesHTML(entries, n)
 }
 
+// FileChanged tells you if the file has been changed.
+func FileChanged(path string) bool {
+	_, err := gitsh("diff", "--exit-code", path)
+	return err != nil
+}
+
 // Revisions returns slice of revisions for the given hypha name.
 func Revisions(hyphaName string) ([]Revision, error) {
 	var (
diff --git a/history/operations.go b/history/operations.go
index e788b6e..a8177ba 100644
--- a/history/operations.go
+++ b/history/operations.go
@@ -109,6 +109,12 @@ func (hop *HistoryOp) Apply() *HistoryOp {
 	return hop
 }
 
+// Abort aborts the history operation.
+func (hop *HistoryOp) Abort() *HistoryOp {
+	gitMutex.Unlock()
+	return hop
+}
+
 // WithMsg sets what message will be used for the future commit. If user message exceeds one line, it is stripped down.
 func (hop *HistoryOp) WithMsg(userMsg string) *HistoryOp {
 	for _, ch := range userMsg {
diff --git a/hypha.go b/hypha.go
index 64015e8..be355b4 100644
--- a/hypha.go
+++ b/hypha.go
@@ -88,6 +88,9 @@ func uploadHelp(hop *history.HistoryOp, hyphaName, ext string, data []byte, u *u
 		hyphae.IncrementCount()
 	}
 	*originalFullPath = fullPath
+	if hop.Type == history.TypeEditText && !history.FileChanged(fullPath) {
+		return hop.Abort()
+	}
 	return hop.WithFiles(fullPath).
 		WithUser(u).
 		Apply()

From 355fd4b1b065b90d0d12ec6a4a591e6640d8ae83 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Fri, 22 Jan 2021 22:25:40 +0500
Subject: [PATCH 41/50] Fix the renaming bug

---
 hypha.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hypha.go b/hypha.go
index be355b4..6e59cbe 100644
--- a/hypha.go
+++ b/hypha.go
@@ -8,7 +8,7 @@ import (
 	"mime/multipart"
 	"os"
 	"path/filepath"
-	"strings"
+	"regexp"
 
 	"github.com/bouncepaw/mycorrhiza/history"
 	"github.com/bouncepaw/mycorrhiza/hyphae"
@@ -88,7 +88,7 @@ func uploadHelp(hop *history.HistoryOp, hyphaName, ext string, data []byte, u *u
 		hyphae.IncrementCount()
 	}
 	*originalFullPath = fullPath
-	if hop.Type == history.TypeEditText && !history.FileChanged(fullPath) {
+	if isOld && hop.Type == history.TypeEditText && !history.FileChanged(fullPath) {
 		return hop.Abort()
 	}
 	return hop.WithFiles(fullPath).
@@ -195,8 +195,9 @@ func relocateHyphaData(hyphaNames []string, replaceName func(string) string) {
 // RenameHypha renames hypha from old name `hyphaName` to `newName` and makes a history record about that. If `recursive` is `true`, its subhyphae will be renamed the same way.
 func RenameHypha(hyphaName, newName string, recursive bool, u *user.User) *history.HistoryOp {
 	var (
+		re          = regexp.MustCompile(`(?i)` + hyphaName)
 		replaceName = func(str string) string {
-			return strings.Replace(str, hyphaName, newName, 1)
+			return re.ReplaceAllString(CanonicalName(str), newName)
 		}
 		hyphaNames     = findHyphaeToRename(hyphaName, recursive)
 		renameMap, err = renamingPairs(hyphaNames, replaceName)

From e72ca863e3a420937faa16f9633c623b84dc6a74 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sat, 23 Jan 2021 18:45:17 +0500
Subject: [PATCH 42/50] Add /about page, remove -title option, add -name and
 -icon options

---
 README.md                    |   6 +-
 flag.go                      |   3 +-
 main.go                      |   7 +
 name.go                      |   2 +-
 templates/http_stuff.qtpl    |  25 ++++
 templates/http_stuff.qtpl.go | 244 +++++++++++++++++++++++++----------
 user/users.go                |  22 ++++
 util/util.go                 |   3 +-
 8 files changed, 237 insertions(+), 75 deletions(-)

diff --git a/README.md b/README.md
index 69e179b..cc79e78 100644
--- a/README.md
+++ b/README.md
@@ -24,10 +24,12 @@ Options:
         Used when -auth-method=fixed. Path to file with user credentials. (default "mycocredentials.json")
   -home string
         The home page (default "home")
+  -icon string
+        What to show in the navititle in the beginning, before the colon (default "🍄")
+  -name string
+        What is the name of your wiki (default "wiki")
   -port string
         Port to serve the wiki at (default "1737")
-  -title string
-        How to call your wiki in the navititle (default "🍄")
   -url string
         URL at which your wiki can be found. Used to generate feeds (default "http://0.0.0.0:$port")
   -user-tree string
diff --git a/flag.go b/flag.go
index c2cb461..e7ef67d 100644
--- a/flag.go
+++ b/flag.go
@@ -13,7 +13,8 @@ func init() {
 	flag.StringVar(&util.URL, "url", "http://0.0.0.0:$port", "URL at which your wiki can be found. Used to generate feeds and social media previews")
 	flag.StringVar(&util.ServerPort, "port", "1737", "Port to serve the wiki at using HTTP")
 	flag.StringVar(&util.HomePage, "home", "home", "The home page name")
-	flag.StringVar(&util.SiteTitle, "title", "🍄", "How to call your wiki in the navititle")
+	flag.StringVar(&util.SiteNavIcon, "icon", "🍄", "What to show in the navititle in the beginning, before the colon")
+	flag.StringVar(&util.SiteName, "name", "wiki", "What is the name of your wiki")
 	flag.StringVar(&util.UserTree, "user-tree", "u", "Hypha which is a superhypha of all user pages")
 	flag.StringVar(&util.AuthMethod, "auth-method", "none", "What auth method to use. Variants: \"none\", \"fixed\"")
 	flag.StringVar(&util.FixedCredentialsPath, "fixed-credentials-path", "mycocredentials.json", "Used when -auth-method=fixed. Path to file with user credentials.")
diff --git a/main.go b/main.go
index 6a4c26a..700adad 100644
--- a/main.go
+++ b/main.go
@@ -129,6 +129,12 @@ func handlerIcon(w http.ResponseWriter, rq *http.Request) {
 	}
 }
 
+func handlerAbout(w http.ResponseWriter, rq *http.Request) {
+	w.Header().Set("Content-Type", "text/html;charset=utf-8")
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte(base("About "+util.SiteName, templates.AboutHTML())))
+}
+
 func handlerRobotsTxt(w http.ResponseWriter, rq *http.Request) {
 	w.Header().Set("Content-Type", "text/plain")
 	w.WriteHeader(http.StatusOK)
@@ -160,6 +166,7 @@ func main() {
 	http.HandleFunc("/list", handlerList)
 	http.HandleFunc("/reindex", handlerReindex)
 	http.HandleFunc("/random", handlerRandom)
+	http.HandleFunc("/about", handlerAbout)
 	http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(WikiDir+"/static"))))
 	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, rq *http.Request) {
 		http.ServeFile(w, rq, WikiDir+"/static/favicon.ico")
diff --git a/name.go b/name.go
index 9d0bf08..2a859d8 100644
--- a/name.go
+++ b/name.go
@@ -23,7 +23,7 @@ func CanonicalName(name string) string {
 func naviTitle(canonicalName string) string {
 	var (
 		html = fmt.Sprintf(`<h1 class="navi-title" id="navi-title">
-	<a href="/page/%s">%s</a><span aria-hidden="true" class="navi-title__colon">:</span>`, util.HomePage, util.SiteTitle)
+	<a href="/page/%s">%s</a><span aria-hidden="true" class="navi-title__colon">:</span>`, util.HomePage, util.SiteNavIcon)
 		prevAcc = `/page/`
 		parts   = strings.Split(canonicalName, "/")
 		rel     = "up"
diff --git a/templates/http_stuff.qtpl b/templates/http_stuff.qtpl
index 3a88e2f..4d10a9b 100644
--- a/templates/http_stuff.qtpl
+++ b/templates/http_stuff.qtpl
@@ -1,3 +1,6 @@
+{% import "github.com/bouncepaw/mycorrhiza/util" %}
+{% import "github.com/bouncepaw/mycorrhiza/user" %}
+
 {% func BaseHTML(title, body string, headElements ...string) %}
 <!doctype html>
 <html>
@@ -41,3 +44,25 @@
 			{% endif %}
 			</tr>
 {% endfunc %}
+
+{% func AboutHTML() %}
+<main>
+	<section>
+		<h1>About {%s util.SiteName %}</h1>
+		<ul>
+			<li><b><a href="https://mycorrhiza.lesarbr.es">MycorrhizaWiki</a> version:</b> β 0.12 indev</li>
+		{%- if user.AuthUsed -%}
+			<li><b>User count:</b> {%d user.Count() %}</li>
+			<li><b>Home page:</b> <a href="/">{%s util.HomePage %}</a></li>
+			<li><b>Administrators:</b> {%- for i, username := range user.ListUsersWithGroup("admin") -%}
+				{%- if i > 0 -%}<span aria-hidden="true">, </span>
+				{%- endif -%}
+				<a href="/page/{%s util.UserTree %}/{%s username %}">{%s username %}</a>{%- endfor -%}</li>
+		{%- else -%}
+			<li>This wiki does not use authorization</li>
+		{%- endif -%}
+		</ul>
+		<p>See <a href="/list">/list</a> for information about hyphae on this wiki.</p>
+	</section>
+</main>
+{% endfunc %}
diff --git a/templates/http_stuff.qtpl.go b/templates/http_stuff.qtpl.go
index 1e2bd99..b2b286a 100644
--- a/templates/http_stuff.qtpl.go
+++ b/templates/http_stuff.qtpl.go
@@ -5,21 +5,27 @@
 package templates
 
 //line templates/http_stuff.qtpl:1
+import "github.com/bouncepaw/mycorrhiza/util"
+
+//line templates/http_stuff.qtpl:2
+import "github.com/bouncepaw/mycorrhiza/user"
+
+//line templates/http_stuff.qtpl:4
 import (
 	qtio422016 "io"
 
 	qt422016 "github.com/valyala/quicktemplate"
 )
 
-//line templates/http_stuff.qtpl:1
+//line templates/http_stuff.qtpl:4
 var (
 	_ = qtio422016.Copy
 	_ = qt422016.AcquireByteBuffer
 )
 
-//line templates/http_stuff.qtpl:1
+//line templates/http_stuff.qtpl:4
 func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, headElements ...string) {
-//line templates/http_stuff.qtpl:1
+//line templates/http_stuff.qtpl:4
 	qw422016.N().S(`
 <!doctype html>
 <html>
@@ -27,68 +33,68 @@ func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, headElements
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<link rel="stylesheet" type="text/css" href="/static/common.css">
 		<title>`)
-//line templates/http_stuff.qtpl:7
+//line templates/http_stuff.qtpl:10
 	qw422016.E().S(title)
-//line templates/http_stuff.qtpl:7
+//line templates/http_stuff.qtpl:10
 	qw422016.N().S(`</title>
 		`)
-//line templates/http_stuff.qtpl:8
+//line templates/http_stuff.qtpl:11
 	for _, el := range headElements {
-//line templates/http_stuff.qtpl:8
+//line templates/http_stuff.qtpl:11
 		qw422016.N().S(el)
-//line templates/http_stuff.qtpl:8
+//line templates/http_stuff.qtpl:11
 	}
-//line templates/http_stuff.qtpl:8
+//line templates/http_stuff.qtpl:11
 	qw422016.N().S(`
 	</head>
 	<body>
 		`)
-//line templates/http_stuff.qtpl:11
+//line templates/http_stuff.qtpl:14
 	qw422016.N().S(body)
-//line templates/http_stuff.qtpl:11
+//line templates/http_stuff.qtpl:14
 	qw422016.N().S(`
 	</body>
 </html>
 `)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 }
 
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string, headElements ...string) {
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 	StreamBaseHTML(qw422016, title, body, headElements...)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 }
 
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 func BaseHTML(title, body string, headElements ...string) string {
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 	WriteBaseHTML(qb422016, title, body, headElements...)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 	return qs422016
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:17
 }
 
-//line templates/http_stuff.qtpl:16
+//line templates/http_stuff.qtpl:19
 func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:16
+//line templates/http_stuff.qtpl:19
 	qw422016.N().S(`
 <main>
 	<h1>List of hyphae</h1>
 	<p>This wiki has `)
-//line templates/http_stuff.qtpl:19
+//line templates/http_stuff.qtpl:22
 	qw422016.N().D(pageCount)
-//line templates/http_stuff.qtpl:19
+//line templates/http_stuff.qtpl:22
 	qw422016.N().S(` hyphae.</p>
 	<table>
 		<thead>
@@ -99,105 +105,203 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int)
 		</thead>
 		<tbody>
 			`)
-//line templates/http_stuff.qtpl:28
+//line templates/http_stuff.qtpl:31
 	qw422016.N().S(tbody)
-//line templates/http_stuff.qtpl:28
+//line templates/http_stuff.qtpl:31
 	qw422016.N().S(`
 		</tbody>
 	</table>
 </main>
 `)
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 }
 
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 	StreamHyphaListHTML(qw422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 }
 
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 func HyphaListHTML(tbody string, pageCount int) string {
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 	WriteHyphaListHTML(qb422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 	return qs422016
-//line templates/http_stuff.qtpl:32
+//line templates/http_stuff.qtpl:35
 }
 
-//line templates/http_stuff.qtpl:34
+//line templates/http_stuff.qtpl:37
 func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:34
+//line templates/http_stuff.qtpl:37
 	qw422016.N().S(`
 			<tr>
 				<td><a href="/page/`)
-//line templates/http_stuff.qtpl:36
+//line templates/http_stuff.qtpl:39
 	qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:36
+//line templates/http_stuff.qtpl:39
 	qw422016.N().S(`">`)
-//line templates/http_stuff.qtpl:36
+//line templates/http_stuff.qtpl:39
 	qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:36
+//line templates/http_stuff.qtpl:39
 	qw422016.N().S(`</a></td>
 			`)
-//line templates/http_stuff.qtpl:37
+//line templates/http_stuff.qtpl:40
 	if binaryPresent {
-//line templates/http_stuff.qtpl:37
+//line templates/http_stuff.qtpl:40
 		qw422016.N().S(`
 				<td>`)
-//line templates/http_stuff.qtpl:38
+//line templates/http_stuff.qtpl:41
 		qw422016.E().S(binaryMime)
-//line templates/http_stuff.qtpl:38
+//line templates/http_stuff.qtpl:41
 		qw422016.N().S(`</td>
 			`)
-//line templates/http_stuff.qtpl:39
+//line templates/http_stuff.qtpl:42
 	} else {
-//line templates/http_stuff.qtpl:39
+//line templates/http_stuff.qtpl:42
 		qw422016.N().S(`
 				<td></td>
 			`)
-//line templates/http_stuff.qtpl:41
+//line templates/http_stuff.qtpl:44
 	}
-//line templates/http_stuff.qtpl:41
+//line templates/http_stuff.qtpl:44
 	qw422016.N().S(`
 			</tr>
 `)
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 }
 
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 	StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 }
 
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string {
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 	WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
 	return qs422016
-//line templates/http_stuff.qtpl:43
+//line templates/http_stuff.qtpl:46
+}
+
+//line templates/http_stuff.qtpl:48
+func StreamAboutHTML(qw422016 *qt422016.Writer) {
+//line templates/http_stuff.qtpl:48
+	qw422016.N().S(`
+<main>
+	<section>
+		<h1>About `)
+//line templates/http_stuff.qtpl:51
+	qw422016.E().S(util.SiteName)
+//line templates/http_stuff.qtpl:51
+	qw422016.N().S(`</h1>
+		<ul>
+			<li><b><a href="https://mycorrhiza.lesarbr.es">MycorrhizaWiki</a> version:</b> β 0.12 indev</li>
+`)
+//line templates/http_stuff.qtpl:54
+	if user.AuthUsed {
+//line templates/http_stuff.qtpl:54
+		qw422016.N().S(`			<li><b>User count:</b> `)
+//line templates/http_stuff.qtpl:55
+		qw422016.N().D(user.Count())
+//line templates/http_stuff.qtpl:55
+		qw422016.N().S(`</li>
+			<li><b>Home page:</b> <a href="/">`)
+//line templates/http_stuff.qtpl:56
+		qw422016.E().S(util.HomePage)
+//line templates/http_stuff.qtpl:56
+		qw422016.N().S(`</a></li>
+			<li><b>Administrators:</b>`)
+//line templates/http_stuff.qtpl:57
+		for i, username := range user.ListUsersWithGroup("admin") {
+//line templates/http_stuff.qtpl:58
+			if i > 0 {
+//line templates/http_stuff.qtpl:58
+				qw422016.N().S(`<span aria-hidden="true">, </span>
+`)
+//line templates/http_stuff.qtpl:59
+			}
+//line templates/http_stuff.qtpl:59
+			qw422016.N().S(`				<a href="/page/`)
+//line templates/http_stuff.qtpl:60
+			qw422016.E().S(util.UserTree)
+//line templates/http_stuff.qtpl:60
+			qw422016.N().S(`/`)
+//line templates/http_stuff.qtpl:60
+			qw422016.E().S(username)
+//line templates/http_stuff.qtpl:60
+			qw422016.N().S(`">`)
+//line templates/http_stuff.qtpl:60
+			qw422016.E().S(username)
+//line templates/http_stuff.qtpl:60
+			qw422016.N().S(`</a>`)
+//line templates/http_stuff.qtpl:60
+		}
+//line templates/http_stuff.qtpl:60
+		qw422016.N().S(`</li>
+`)
+//line templates/http_stuff.qtpl:61
+	} else {
+//line templates/http_stuff.qtpl:61
+		qw422016.N().S(`			<li>This wiki does not use authorization</li>
+`)
+//line templates/http_stuff.qtpl:63
+	}
+//line templates/http_stuff.qtpl:63
+	qw422016.N().S(`		</ul>
+		<p>See <a href="/list">/list</a> for information about hyphae on this wiki.</p>
+	</section>
+</main>
+`)
+//line templates/http_stuff.qtpl:68
+}
+
+//line templates/http_stuff.qtpl:68
+func WriteAboutHTML(qq422016 qtio422016.Writer) {
+//line templates/http_stuff.qtpl:68
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line templates/http_stuff.qtpl:68
+	StreamAboutHTML(qw422016)
+//line templates/http_stuff.qtpl:68
+	qt422016.ReleaseWriter(qw422016)
+//line templates/http_stuff.qtpl:68
+}
+
+//line templates/http_stuff.qtpl:68
+func AboutHTML() string {
+//line templates/http_stuff.qtpl:68
+	qb422016 := qt422016.AcquireByteBuffer()
+//line templates/http_stuff.qtpl:68
+	WriteAboutHTML(qb422016)
+//line templates/http_stuff.qtpl:68
+	qs422016 := string(qb422016.B)
+//line templates/http_stuff.qtpl:68
+	qt422016.ReleaseByteBuffer(qb422016)
+//line templates/http_stuff.qtpl:68
+	return qs422016
+//line templates/http_stuff.qtpl:68
 }
diff --git a/user/users.go b/user/users.go
index 58a174d..397ecf0 100644
--- a/user/users.go
+++ b/user/users.go
@@ -8,6 +8,28 @@ var AuthUsed bool
 var users sync.Map
 var tokens sync.Map
 
+func ListUsersWithGroup(group string) []string {
+	usersWithTheGroup := []string{}
+	users.Range(func(_, v interface{}) bool {
+		userobj := v.(*User)
+
+		if userobj.Group == group {
+			usersWithTheGroup = append(usersWithTheGroup, userobj.Name)
+		}
+		return true
+	})
+	return usersWithTheGroup
+}
+
+func Count() int {
+	i := 0
+	users.Range(func(k, v interface{}) bool {
+		i++
+		return true
+	})
+	return i
+}
+
 func HasUsername(username string) bool {
 	_, has := users.Load(username)
 	return has
diff --git a/util/util.go b/util/util.go
index e593f70..5bbf9d7 100644
--- a/util/util.go
+++ b/util/util.go
@@ -11,7 +11,8 @@ var (
 	URL                  string
 	ServerPort           string
 	HomePage             string
-	SiteTitle            string
+	SiteNavIcon          string
+	SiteName             string
 	WikiDir              string
 	UserTree             string
 	AuthMethod           string

From 84545dd9f192cac2ece9209292b3701959d09d02 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sat, 23 Jan 2021 21:37:29 +0500
Subject: [PATCH 43/50] Rename -user-tree to -user-hypha

---
 README.md                 | 2 +-
 flag.go                   | 6 +++---
 history/history.go        | 2 +-
 history/information.go    | 2 +-
 templates/common.qtpl     | 2 +-
 templates/common.qtpl.go  | 2 +-
 templates/http_stuff.qtpl | 2 +-
 util/util.go              | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index cc79e78..d672a18 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Options:
         Port to serve the wiki at (default "1737")
   -url string
         URL at which your wiki can be found. Used to generate feeds (default "http://0.0.0.0:$port")
-  -user-tree string
+  -user-hypha string
         Hypha which is a superhypha of all user pages (default "u")
 ```
 
diff --git a/flag.go b/flag.go
index e7ef67d..f3add19 100644
--- a/flag.go
+++ b/flag.go
@@ -15,7 +15,7 @@ func init() {
 	flag.StringVar(&util.HomePage, "home", "home", "The home page name")
 	flag.StringVar(&util.SiteNavIcon, "icon", "🍄", "What to show in the navititle in the beginning, before the colon")
 	flag.StringVar(&util.SiteName, "name", "wiki", "What is the name of your wiki")
-	flag.StringVar(&util.UserTree, "user-tree", "u", "Hypha which is a superhypha of all user pages")
+	flag.StringVar(&util.UserHypha, "user-hypha", "u", "Hypha which is a superhypha of all user pages")
 	flag.StringVar(&util.AuthMethod, "auth-method", "none", "What auth method to use. Variants: \"none\", \"fixed\"")
 	flag.StringVar(&util.FixedCredentialsPath, "fixed-credentials-path", "mycocredentials.json", "Used when -auth-method=fixed. Path to file with user credentials.")
 }
@@ -44,8 +44,8 @@ func parseCliArgs() {
 		log.Fatal("Error: you must use a proper name for the homepage")
 	}
 
-	if !isCanonicalName(util.UserTree) {
-		log.Fatal("Error: you must use a proper name for user tree")
+	if !isCanonicalName(util.UserHypha) {
+		log.Fatal("Error: you must use a proper name for user hypha")
 	}
 
 	switch util.AuthMethod {
diff --git a/history/history.go b/history/history.go
index dcd6268..f3d117d 100644
--- a/history/history.go
+++ b/history/history.go
@@ -118,7 +118,7 @@ func (rev Revision) RecentChangesEntry() (html string) {
 <li class="rc-entry__hash">%[2]s</li>
 <li class="rc-entry__links">%[5]s</li>
 <li class="rc-entry__msg">%[6]s <span class="rc-entry__author">by <a href="/page/%[3]s/%[4]s" rel="author">%[4]s</a></span></li>
-`, rev.TimeString(), rev.Hash, util.UserTree, rev.Username, rev.HyphaeLinks(), rev.Message)
+`, rev.TimeString(), rev.Hash, util.UserHypha, rev.Username, rev.HyphaeLinks(), rev.Message)
 	}
 	return fmt.Sprintf(`
 <li class="rc-entry__time"><time>%[1]s</time></li>
diff --git a/history/information.go b/history/information.go
index ef60b32..f2c0aad 100644
--- a/history/information.go
+++ b/history/information.go
@@ -142,7 +142,7 @@ func (rev *Revision) asHistoryEntry(hyphaName string) (html string) {
 	author := ""
 	if rev.Username != "anon" {
 		author = fmt.Sprintf(`
-		<span class="history-entry__author">by <a href="/page/%[1]s/%[2]s" rel="author">%[2]s</span>`, util.UserTree, rev.Username)
+		<span class="history-entry__author">by <a href="/page/%[1]s/%[2]s" rel="author">%[2]s</span>`, util.UserHypha, rev.Username)
 	}
 	return fmt.Sprintf(`
 <li class="history__entry">
diff --git a/templates/common.qtpl b/templates/common.qtpl
index 8a2b075..08fa7d2 100644
--- a/templates/common.qtpl
+++ b/templates/common.qtpl
@@ -52,7 +52,7 @@ var navEntries = []navEntry{
 			{% if u.Group == "anon" %}
 				<a href="/login">Login</a>
 			{% else %}
-				<a href="/page/{%s util.UserTree %}/{%s u.Name %}">{%s u.Name %}</a>
+				<a href="/page/{%s util.UserHypha %}/{%s u.Name %}">{%s u.Name %}</a>
 			{% endif %}
 			</li>
 	{% endif %}
diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go
index a30040d..5895b1e 100644
--- a/templates/common.qtpl.go
+++ b/templates/common.qtpl.go
@@ -166,7 +166,7 @@ func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) {
 			qw422016.N().S(`
 				<a href="/page/`)
 //line templates/common.qtpl:55
-			qw422016.E().S(util.UserTree)
+			qw422016.E().S(util.UserHypha)
 //line templates/common.qtpl:55
 			qw422016.N().S(`/`)
 //line templates/common.qtpl:55
diff --git a/templates/http_stuff.qtpl b/templates/http_stuff.qtpl
index 4d10a9b..d5dacad 100644
--- a/templates/http_stuff.qtpl
+++ b/templates/http_stuff.qtpl
@@ -57,7 +57,7 @@
 			<li><b>Administrators:</b> {%- for i, username := range user.ListUsersWithGroup("admin") -%}
 				{%- if i > 0 -%}<span aria-hidden="true">, </span>
 				{%- endif -%}
-				<a href="/page/{%s util.UserTree %}/{%s username %}">{%s username %}</a>{%- endfor -%}</li>
+				<a href="/page/{%s util.UserHypha %}/{%s username %}">{%s username %}</a>{%- endfor -%}</li>
 		{%- else -%}
 			<li>This wiki does not use authorization</li>
 		{%- endif -%}
diff --git a/util/util.go b/util/util.go
index 5bbf9d7..6fc2ca0 100644
--- a/util/util.go
+++ b/util/util.go
@@ -14,7 +14,7 @@ var (
 	SiteNavIcon          string
 	SiteName             string
 	WikiDir              string
-	UserTree             string
+	UserHypha            string
 	AuthMethod           string
 	FixedCredentialsPath string
 )

From 100f5ada92df7fd70930ada9c33cad42d620456e Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 24 Jan 2021 00:00:58 +0500
Subject: [PATCH 44/50] Add header links

---
 flag.go                      |  11 +-
 hypha.go                     |  14 +++
 main.go                      |  16 ++-
 templates/asset.qtpl.go      |  21 +++-
 templates/default.css        |  21 +++-
 templates/http_stuff.qtpl    |   9 ++
 templates/http_stuff.qtpl.go | 227 +++++++++++++++++++----------------
 user/user.go                 |  21 ++--
 util/header_links.go         |  35 ++++++
 util/util.go                 |   1 +
 10 files changed, 248 insertions(+), 128 deletions(-)
 create mode 100644 util/header_links.go

diff --git a/flag.go b/flag.go
index f3add19..47a2134 100644
--- a/flag.go
+++ b/flag.go
@@ -18,6 +18,7 @@ func init() {
 	flag.StringVar(&util.UserHypha, "user-hypha", "u", "Hypha which is a superhypha of all user pages")
 	flag.StringVar(&util.AuthMethod, "auth-method", "none", "What auth method to use. Variants: \"none\", \"fixed\"")
 	flag.StringVar(&util.FixedCredentialsPath, "fixed-credentials-path", "mycocredentials.json", "Used when -auth-method=fixed. Path to file with user credentials.")
+	flag.StringVar(&util.HeaderLinksHypha, "header-links-hypha", "", "Optional hypha that overrides the header links")
 }
 
 // Do the things related to cli args and die maybe
@@ -40,13 +41,9 @@ func parseCliArgs() {
 		util.URL = "http://0.0.0.0:" + util.ServerPort
 	}
 
-	if !isCanonicalName(util.HomePage) {
-		log.Fatal("Error: you must use a proper name for the homepage")
-	}
-
-	if !isCanonicalName(util.UserHypha) {
-		log.Fatal("Error: you must use a proper name for user hypha")
-	}
+	util.HomePage = CanonicalName(util.HomePage)
+	util.UserHypha = CanonicalName(util.UserHypha)
+	util.HeaderLinksHypha = CanonicalName(util.HeaderLinksHypha)
 
 	switch util.AuthMethod {
 	case "none":
diff --git a/hypha.go b/hypha.go
index 6e59cbe..be7fef4 100644
--- a/hypha.go
+++ b/hypha.go
@@ -313,3 +313,17 @@ func FetchTextPart(d *HyphaData) (string, error) {
 	}
 	return string(text), nil
 }
+
+func setHeaderLinks() {
+	if userLinksHypha, ok := GetHyphaData(util.HeaderLinksHypha); !ok {
+		util.SetDefaultHeaderLinks()
+	} else {
+		contents, err := ioutil.ReadFile(userLinksHypha.textPath)
+		if err != nil || len(contents) == 0 {
+			util.SetDefaultHeaderLinks()
+		} else {
+			text := string(contents)
+			util.ParseHeaderLinks(text, markup.Rocketlink)
+		}
+	}
+}
diff --git a/main.go b/main.go
index 700adad..9daa2cd 100644
--- a/main.go
+++ b/main.go
@@ -75,6 +75,19 @@ func handlerReindex(w http.ResponseWriter, rq *http.Request) {
 	log.Println("Start indexing hyphae...")
 	Index(WikiDir)
 	log.Println("Indexed", hyphae.Count(), "hyphae")
+	http.Redirect(w, rq, "/", http.StatusSeeOther)
+}
+
+// Update header links by reading the configured hypha, if there is any, or resorting to default values.
+func handlerUpdateHeaderLinks(w http.ResponseWriter, rq *http.Request) {
+	log.Println(rq.URL)
+	if ok := user.CanProceed(rq, "update-header-links"); !ok {
+		HttpErr(w, http.StatusForbidden, util.HomePage, "Not enough rights", "You must be a moderator to update header links.")
+		log.Println("Rejected", rq.URL)
+		return
+	}
+	setHeaderLinks()
+	http.Redirect(w, rq, "/", http.StatusSeeOther)
 }
 
 // Redirect to a random hypha.
@@ -153,11 +166,11 @@ func main() {
 		log.Fatal(err)
 	}
 	log.Println("Wiki storage directory is", WikiDir)
-	log.Println("Start indexing hyphae...")
 	Index(WikiDir)
 	log.Println("Indexed", hyphae.Count(), "hyphae")
 
 	history.Start(WikiDir)
+	setHeaderLinks()
 
 	// See http_readers.go for /page/, /text/, /binary/
 	// See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/, /unattach-ask/, /unattach-confirm/
@@ -165,6 +178,7 @@ func main() {
 	// See http_history.go for /history/, /recent-changes
 	http.HandleFunc("/list", handlerList)
 	http.HandleFunc("/reindex", handlerReindex)
+	http.HandleFunc("/update-header-links", handlerUpdateHeaderLinks)
 	http.HandleFunc("/random", handlerRandom)
 	http.HandleFunc("/about", handlerAbout)
 	http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(WikiDir+"/static"))))
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index ae76899..7f405cb 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -27,13 +27,18 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) {
 @media screen and (min-width: 800px) {
 	main { padding:1rem 2rem; margin: 0 auto; width: 800px; }
 	.hypha-tabs { padding: 1rem 2rem; margin: 0 auto; width: 800px; }
+	header { margin: 0 auto; width: 800px; }
+	.header-links__entry { margin-right: 1.5rem; }
+	.header-links__entry:nth-of-type(1),
 	.hypha-tabs__tab:nth-of-type(1) { margin-left: 2rem; }
 	.hypha-tabs__tab { margin-right: 1.5rem; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-bottom: 2px #ddd solid; padding: 0 .5rem; }
 }
 @media screen and (max-width: 800px) {
 	main { padding: 1rem; margin: 0; width: 100%; }
-	.hypha-tabs { padding: 1rem; margin: 0; width: 100%; }
+	.hypha-tabs{ padding: 1rem; margin: 0; width: 100%; }
 	.hypha-tabs__tab { box-shadow: none; margin-right: .5rem; padding: .25rem .5rem; }
+	header { width: 100%; }
+	.header-links__entry { margin-right: .5rem; }
 }
 *, *::before, *::after {box-sizing: border-box;}
 html { height:100%; padding:0; }
@@ -88,9 +93,11 @@ figcaption { padding-bottom: .5rem; }
 
 #new-name {width:100%;}
 
+header { margin-bottom: .5rem; }
+.header-links__link { text-decoration: none; display: block; width: 100%; height: 100%; padding: .25rem; }
 .hypha-tabs { padding: 0; }
-.hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; }
-.hypha-tabs__tab { list-style-type: none; }
+.header-links__list, .hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; }
+.header-links__entry, .hypha-tabs__tab { list-style-type: none; }
 .hypha-tabs__tab a { text-decoration: none; }
 .hypha-tabs__tab_active { font-weight: bold; }
 .hypha-tabs__user { font-style:italic; }
@@ -137,6 +144,9 @@ table { background-color: #eee; }
 html { background-color: #ddd; 
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
 } /* heropatterns.com */
+header { background-color: #bbb; }
+.header-links__link { color: black; }
+.header-links__link:hover { background-color: #eee; }
 
 main, .hypha-tabs__tab { background-color: white; }
 .hypha-tabs__tab { clip-path: inset(-20px -20px 0 -20px); }
@@ -155,12 +165,15 @@ td { border: #ddd 1px solid; }
 /* Dark theme! */
 @media (prefers-color-scheme: dark) {
 html { background: #222; color: #ddd; }
-main,  article, .hypha-tabs__tab { background-color: #343434; }
+main,  article, .hypha-tabs__tab, header { background-color: #343434; color: #ddd; }
 
 a, .wikilink_external { color: #f1fa8c; }
 a:visited, .wikilink_external:visited { color: #ffb86c; }
 .wikilink_new, .wikilink_new:visited { color: #dd4444; }
+
+.header-links__link, .header-links__link:visited,
 .prevnext__el, .prevnext__el:visited { color: #ddd; }
+.header-links__link:hover { background-color: #444; }
 
 .hypha-tabs__tab a, .hypha-tabs__tab { color: #ddd; background-color: #232323; border: 0; }
 .hypha-tabs__tab_active { background-color: #343434; }
diff --git a/templates/default.css b/templates/default.css
index c55f4ea..ffbcc82 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -2,13 +2,18 @@
 @media screen and (min-width: 800px) {
 	main { padding:1rem 2rem; margin: 0 auto; width: 800px; }
 	.hypha-tabs { padding: 1rem 2rem; margin: 0 auto; width: 800px; }
+	header { margin: 0 auto; width: 800px; }
+	.header-links__entry { margin-right: 1.5rem; }
+	.header-links__entry:nth-of-type(1),
 	.hypha-tabs__tab:nth-of-type(1) { margin-left: 2rem; }
 	.hypha-tabs__tab { margin-right: 1.5rem; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-bottom: 2px #ddd solid; padding: 0 .5rem; }
 }
 @media screen and (max-width: 800px) {
 	main { padding: 1rem; margin: 0; width: 100%; }
-	.hypha-tabs { padding: 1rem; margin: 0; width: 100%; }
+	.hypha-tabs{ padding: 1rem; margin: 0; width: 100%; }
 	.hypha-tabs__tab { box-shadow: none; margin-right: .5rem; padding: .25rem .5rem; }
+	header { width: 100%; }
+	.header-links__entry { margin-right: .5rem; }
 }
 *, *::before, *::after {box-sizing: border-box;}
 html { height:100%; padding:0; }
@@ -63,9 +68,11 @@ figcaption { padding-bottom: .5rem; }
 
 #new-name {width:100%;}
 
+header { margin-bottom: .5rem; }
+.header-links__link { text-decoration: none; display: block; width: 100%; height: 100%; padding: .25rem; }
 .hypha-tabs { padding: 0; }
-.hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; }
-.hypha-tabs__tab { list-style-type: none; }
+.header-links__list, .hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; }
+.header-links__entry, .hypha-tabs__tab { list-style-type: none; }
 .hypha-tabs__tab a { text-decoration: none; }
 .hypha-tabs__tab_active { font-weight: bold; }
 .hypha-tabs__user { font-style:italic; }
@@ -112,6 +119,9 @@ table { background-color: #eee; }
 html { background-color: #ddd; 
 background-image: url("data:image/svg+xml,%3Csvg width='42' height='44' viewBox='0 0 42 44' xmlns='http://www.w3.org/2000/svg'%3E%3Cg id='Page-1' fill='none' fill-rule='evenodd'%3E%3Cg id='brick-wall' fill='%23bbbbbb' fill-opacity='0.4'%3E%3Cpath d='M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
 } /* heropatterns.com */
+header { background-color: #bbb; }
+.header-links__link { color: black; }
+.header-links__link:hover { background-color: #eee; }
 
 main, .hypha-tabs__tab { background-color: white; }
 .hypha-tabs__tab { clip-path: inset(-20px -20px 0 -20px); }
@@ -130,12 +140,15 @@ td { border: #ddd 1px solid; }
 /* Dark theme! */
 @media (prefers-color-scheme: dark) {
 html { background: #222; color: #ddd; }
-main,  article, .hypha-tabs__tab { background-color: #343434; }
+main,  article, .hypha-tabs__tab, header { background-color: #343434; color: #ddd; }
 
 a, .wikilink_external { color: #f1fa8c; }
 a:visited, .wikilink_external:visited { color: #ffb86c; }
 .wikilink_new, .wikilink_new:visited { color: #dd4444; }
+
+.header-links__link, .header-links__link:visited,
 .prevnext__el, .prevnext__el:visited { color: #ddd; }
+.header-links__link:hover { background-color: #444; }
 
 .hypha-tabs__tab a, .hypha-tabs__tab { color: #ddd; background-color: #232323; border: 0; }
 .hypha-tabs__tab_active { background-color: #343434; }
diff --git a/templates/http_stuff.qtpl b/templates/http_stuff.qtpl
index d5dacad..c65c0f9 100644
--- a/templates/http_stuff.qtpl
+++ b/templates/http_stuff.qtpl
@@ -11,6 +11,15 @@
 		{% for _, el := range headElements %}{%s= el %}{% endfor %}
 	</head>
 	<body>
+		<header>
+			<nav class="header-links">
+				<ul class="header-links__list">
+					{%- for _, link := range util.HeaderLinks -%}
+					<li class="header-links__entry"><a class="header-links__link" href="{%s link.Href %}">{%s link.Display %}</a></li>
+					{%- endfor -%}
+				</ul>
+			</nav>
+		</header>
 		{%s= body %}
 	</body>
 </html>
diff --git a/templates/http_stuff.qtpl.go b/templates/http_stuff.qtpl.go
index b2b286a..667627a 100644
--- a/templates/http_stuff.qtpl.go
+++ b/templates/http_stuff.qtpl.go
@@ -48,53 +48,76 @@ func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, headElements
 	qw422016.N().S(`
 	</head>
 	<body>
+		<header>
+			<nav class="header-links">
+				<ul class="header-links__list">
+`)
+//line templates/http_stuff.qtpl:17
+	for _, link := range util.HeaderLinks {
+//line templates/http_stuff.qtpl:17
+		qw422016.N().S(`					<li class="header-links__entry"><a class="header-links__link" href="`)
+//line templates/http_stuff.qtpl:18
+		qw422016.E().S(link.Href)
+//line templates/http_stuff.qtpl:18
+		qw422016.N().S(`">`)
+//line templates/http_stuff.qtpl:18
+		qw422016.E().S(link.Display)
+//line templates/http_stuff.qtpl:18
+		qw422016.N().S(`</a></li>
+`)
+//line templates/http_stuff.qtpl:19
+	}
+//line templates/http_stuff.qtpl:19
+	qw422016.N().S(`				</ul>
+			</nav>
+		</header>
 		`)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:23
 	qw422016.N().S(body)
-//line templates/http_stuff.qtpl:14
+//line templates/http_stuff.qtpl:23
 	qw422016.N().S(`
 	</body>
 </html>
 `)
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 }
 
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string, headElements ...string) {
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 	StreamBaseHTML(qw422016, title, body, headElements...)
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 }
 
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 func BaseHTML(title, body string, headElements ...string) string {
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 	WriteBaseHTML(qb422016, title, body, headElements...)
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 	return qs422016
-//line templates/http_stuff.qtpl:17
+//line templates/http_stuff.qtpl:26
 }
 
-//line templates/http_stuff.qtpl:19
+//line templates/http_stuff.qtpl:28
 func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:19
+//line templates/http_stuff.qtpl:28
 	qw422016.N().S(`
 <main>
 	<h1>List of hyphae</h1>
 	<p>This wiki has `)
-//line templates/http_stuff.qtpl:22
+//line templates/http_stuff.qtpl:31
 	qw422016.N().D(pageCount)
-//line templates/http_stuff.qtpl:22
+//line templates/http_stuff.qtpl:31
 	qw422016.N().S(` hyphae.</p>
 	<table>
 		<thead>
@@ -105,203 +128,203 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int)
 		</thead>
 		<tbody>
 			`)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:40
 	qw422016.N().S(tbody)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:40
 	qw422016.N().S(`
 		</tbody>
 	</table>
 </main>
 `)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 }
 
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 	StreamHyphaListHTML(qw422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 }
 
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 func HyphaListHTML(tbody string, pageCount int) string {
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 	WriteHyphaListHTML(qb422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 	return qs422016
-//line templates/http_stuff.qtpl:35
+//line templates/http_stuff.qtpl:44
 }
 
-//line templates/http_stuff.qtpl:37
+//line templates/http_stuff.qtpl:46
 func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:37
+//line templates/http_stuff.qtpl:46
 	qw422016.N().S(`
 			<tr>
 				<td><a href="/page/`)
-//line templates/http_stuff.qtpl:39
+//line templates/http_stuff.qtpl:48
 	qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:39
+//line templates/http_stuff.qtpl:48
 	qw422016.N().S(`">`)
-//line templates/http_stuff.qtpl:39
+//line templates/http_stuff.qtpl:48
 	qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:39
+//line templates/http_stuff.qtpl:48
 	qw422016.N().S(`</a></td>
 			`)
-//line templates/http_stuff.qtpl:40
+//line templates/http_stuff.qtpl:49
 	if binaryPresent {
-//line templates/http_stuff.qtpl:40
+//line templates/http_stuff.qtpl:49
 		qw422016.N().S(`
 				<td>`)
-//line templates/http_stuff.qtpl:41
+//line templates/http_stuff.qtpl:50
 		qw422016.E().S(binaryMime)
-//line templates/http_stuff.qtpl:41
+//line templates/http_stuff.qtpl:50
 		qw422016.N().S(`</td>
 			`)
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:51
 	} else {
-//line templates/http_stuff.qtpl:42
+//line templates/http_stuff.qtpl:51
 		qw422016.N().S(`
 				<td></td>
 			`)
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:53
 	}
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:53
 	qw422016.N().S(`
 			</tr>
 `)
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 }
 
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 	StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 }
 
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string {
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 	WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 	return qs422016
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:55
 }
 
-//line templates/http_stuff.qtpl:48
+//line templates/http_stuff.qtpl:57
 func StreamAboutHTML(qw422016 *qt422016.Writer) {
-//line templates/http_stuff.qtpl:48
+//line templates/http_stuff.qtpl:57
 	qw422016.N().S(`
 <main>
 	<section>
 		<h1>About `)
-//line templates/http_stuff.qtpl:51
+//line templates/http_stuff.qtpl:60
 	qw422016.E().S(util.SiteName)
-//line templates/http_stuff.qtpl:51
+//line templates/http_stuff.qtpl:60
 	qw422016.N().S(`</h1>
 		<ul>
 			<li><b><a href="https://mycorrhiza.lesarbr.es">MycorrhizaWiki</a> version:</b> β 0.12 indev</li>
 `)
-//line templates/http_stuff.qtpl:54
+//line templates/http_stuff.qtpl:63
 	if user.AuthUsed {
-//line templates/http_stuff.qtpl:54
+//line templates/http_stuff.qtpl:63
 		qw422016.N().S(`			<li><b>User count:</b> `)
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:64
 		qw422016.N().D(user.Count())
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:64
 		qw422016.N().S(`</li>
 			<li><b>Home page:</b> <a href="/">`)
-//line templates/http_stuff.qtpl:56
+//line templates/http_stuff.qtpl:65
 		qw422016.E().S(util.HomePage)
-//line templates/http_stuff.qtpl:56
+//line templates/http_stuff.qtpl:65
 		qw422016.N().S(`</a></li>
 			<li><b>Administrators:</b>`)
-//line templates/http_stuff.qtpl:57
+//line templates/http_stuff.qtpl:66
 		for i, username := range user.ListUsersWithGroup("admin") {
-//line templates/http_stuff.qtpl:58
+//line templates/http_stuff.qtpl:67
 			if i > 0 {
-//line templates/http_stuff.qtpl:58
+//line templates/http_stuff.qtpl:67
 				qw422016.N().S(`<span aria-hidden="true">, </span>
 `)
-//line templates/http_stuff.qtpl:59
+//line templates/http_stuff.qtpl:68
 			}
-//line templates/http_stuff.qtpl:59
+//line templates/http_stuff.qtpl:68
 			qw422016.N().S(`				<a href="/page/`)
-//line templates/http_stuff.qtpl:60
-			qw422016.E().S(util.UserTree)
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:69
+			qw422016.E().S(util.UserHypha)
+//line templates/http_stuff.qtpl:69
 			qw422016.N().S(`/`)
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:69
 			qw422016.E().S(username)
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:69
 			qw422016.N().S(`">`)
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:69
 			qw422016.E().S(username)
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:69
 			qw422016.N().S(`</a>`)
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:69
 		}
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:69
 		qw422016.N().S(`</li>
 `)
-//line templates/http_stuff.qtpl:61
+//line templates/http_stuff.qtpl:70
 	} else {
-//line templates/http_stuff.qtpl:61
+//line templates/http_stuff.qtpl:70
 		qw422016.N().S(`			<li>This wiki does not use authorization</li>
 `)
-//line templates/http_stuff.qtpl:63
+//line templates/http_stuff.qtpl:72
 	}
-//line templates/http_stuff.qtpl:63
+//line templates/http_stuff.qtpl:72
 	qw422016.N().S(`		</ul>
 		<p>See <a href="/list">/list</a> for information about hyphae on this wiki.</p>
 	</section>
 </main>
 `)
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 }
 
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 func WriteAboutHTML(qq422016 qtio422016.Writer) {
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 	StreamAboutHTML(qw422016)
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 }
 
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 func AboutHTML() string {
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 	WriteAboutHTML(qb422016)
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 	return qs422016
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:77
 }
diff --git a/user/user.go b/user/user.go
index 640e76f..b45e2c5 100644
--- a/user/user.go
+++ b/user/user.go
@@ -15,16 +15,17 @@ type User struct {
 
 // Route — Right (more is more right)
 var minimalRights = map[string]int{
-	"edit":             1,
-	"upload-binary":    1,
-	"upload-text":      1,
-	"rename-ask":       2,
-	"rename-confirm":   2,
-	"unattach-ask":     2,
-	"unattach-confirm": 2,
-	"delete-ask":       3,
-	"delete-confirm":   3,
-	"reindex":          4,
+	"edit":                1,
+	"upload-binary":       1,
+	"upload-text":         1,
+	"rename-ask":          2,
+	"rename-confirm":      2,
+	"unattach-ask":        2,
+	"unattach-confirm":    2,
+	"update-header-links": 3,
+	"delete-ask":          3,
+	"delete-confirm":      3,
+	"reindex":             4,
 }
 
 // Group — Right
diff --git a/util/header_links.go b/util/header_links.go
new file mode 100644
index 0000000..9c78565
--- /dev/null
+++ b/util/header_links.go
@@ -0,0 +1,35 @@
+package util
+
+import (
+	"strings"
+)
+
+func SetDefaultHeaderLinks() {
+	HeaderLinks = []HeaderLink{
+		{"/", SiteName},
+		{"/recent-changes", "Recent changes"},
+		{"/list", "All hyphae"},
+		{"/random", "Random"},
+	}
+}
+
+// rocketlinkλ is markup.Rocketlink. You have to pass it like that to avoid cyclical dependency.
+func ParseHeaderLinks(text string, rocketlinkλ func(string, string) (string, string, string, string)) {
+	HeaderLinks = []HeaderLink{}
+	for _, line := range strings.Split(text, "\n") {
+		if strings.HasPrefix(line, "=>") {
+			href, text, _, _ := rocketlinkλ(line, HeaderLinksHypha)
+			HeaderLinks = append(HeaderLinks, HeaderLink{
+				Href:    href,
+				Display: text,
+			})
+		}
+	}
+}
+
+type HeaderLink struct {
+	Href    string
+	Display string
+}
+
+var HeaderLinks []HeaderLink
diff --git a/util/util.go b/util/util.go
index 6fc2ca0..c977992 100644
--- a/util/util.go
+++ b/util/util.go
@@ -15,6 +15,7 @@ var (
 	SiteName             string
 	WikiDir              string
 	UserHypha            string
+	HeaderLinksHypha     string
 	AuthMethod           string
 	FixedCredentialsPath string
 )

From 455a3e0f791287b91889d09a548dba875af8659c Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 24 Jan 2021 12:06:37 +0500
Subject: [PATCH 45/50] Fix hyphae count corruption on reindexation

---
 hyphae/count.go | 7 +++++++
 main.go         | 1 +
 2 files changed, 8 insertions(+)

diff --git a/hyphae/count.go b/hyphae/count.go
index 2c1d5f1..d090606 100644
--- a/hyphae/count.go
+++ b/hyphae/count.go
@@ -10,6 +10,13 @@ var count = struct {
 	sync.Mutex
 }{}
 
+// Set the value of hyphae count to zero.
+func ResetCount() {
+  count.Lock()
+  count.value = 0
+  count.Unlock()
+}
+
 // Increment the value of hyphae count.
 func IncrementCount() {
 	count.Lock()
diff --git a/main.go b/main.go
index 9daa2cd..cf79b9f 100644
--- a/main.go
+++ b/main.go
@@ -70,6 +70,7 @@ func handlerReindex(w http.ResponseWriter, rq *http.Request) {
 		log.Println("Rejected", rq.URL)
 		return
 	}
+	hyphae.ResetCount()
 	HyphaStorage = make(map[string]*HyphaData)
 	log.Println("Wiki storage directory is", WikiDir)
 	log.Println("Start indexing hyphae...")

From e33e5d06a1d91bf706de7391dd60eb117d1c9076 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 24 Jan 2021 12:30:14 +0500
Subject: [PATCH 46/50] Move the user link to the header links

---
 http_auth.go                 |   6 +-
 http_history.go              |   5 +-
 http_mutators.go             |  23 ++--
 http_readers.go              |   6 +-
 main.go                      |  20 +++-
 templates/asset.qtpl.go      |   3 +-
 templates/common.qtpl        |  17 ++-
 templates/common.qtpl.go     | 145 +++++++++++------------
 templates/default.css        |   3 +-
 templates/http_stuff.qtpl    |   3 +-
 templates/http_stuff.qtpl.go | 219 ++++++++++++++++++-----------------
 user/net.go                  |   2 +-
 user/user.go                 |   2 +-
 user/users.go                |   4 +-
 14 files changed, 239 insertions(+), 219 deletions(-)

diff --git a/http_auth.go b/http_auth.go
index 2e1039b..cfe0799 100644
--- a/http_auth.go
+++ b/http_auth.go
@@ -28,7 +28,7 @@ func handlerLogout(w http.ResponseWriter, rq *http.Request) {
 		log.Println("Unknown user tries to log out")
 		w.WriteHeader(http.StatusForbidden)
 	}
-	w.Write([]byte(base("Logout?", templates.LogoutHTML(can))))
+	w.Write([]byte(base("Logout?", templates.LogoutHTML(can), u)))
 }
 
 func handlerLogoutConfirm(w http.ResponseWriter, rq *http.Request) {
@@ -44,7 +44,7 @@ func handlerLoginData(w http.ResponseWriter, rq *http.Request) {
 		err      = user.LoginDataHTTP(w, rq, username, password)
 	)
 	if err != "" {
-		w.Write([]byte(base(err, templates.LoginErrorHTML(err))))
+		w.Write([]byte(base(err, templates.LoginErrorHTML(err), user.EmptyUser())))
 	} else {
 		http.Redirect(w, rq, "/", http.StatusSeeOther)
 	}
@@ -58,5 +58,5 @@ func handlerLogin(w http.ResponseWriter, rq *http.Request) {
 	} else {
 		w.WriteHeader(http.StatusForbidden)
 	}
-	w.Write([]byte(base("Login", templates.LoginHTML())))
+	w.Write([]byte(base("Login", templates.LoginHTML(), user.EmptyUser())))
 }
diff --git a/http_history.go b/http_history.go
index de010d5..3adda8a 100644
--- a/http_history.go
+++ b/http_history.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/bouncepaw/mycorrhiza/history"
 	"github.com/bouncepaw/mycorrhiza/templates"
+	"github.com/bouncepaw/mycorrhiza/user"
 	"github.com/bouncepaw/mycorrhiza/util"
 )
 
@@ -34,7 +35,7 @@ func handlerHistory(w http.ResponseWriter, rq *http.Request) {
 	log.Println("Found", len(revs), "revisions for", hyphaName)
 
 	util.HTTP200Page(w,
-		base(hyphaName, templates.HistoryHTML(rq, hyphaName, list)))
+		base(hyphaName, templates.HistoryHTML(rq, hyphaName, list), user.FromRequest(rq)))
 }
 
 // Recent changes
@@ -45,7 +46,7 @@ func handlerRecentChanges(w http.ResponseWriter, rq *http.Request) {
 		n, err   = strconv.Atoi(noPrefix)
 	)
 	if err == nil && n < 101 {
-		util.HTTP200Page(w, base(strconv.Itoa(n)+" recent changes", history.RecentChanges(n)))
+		util.HTTP200Page(w, base(strconv.Itoa(n)+" recent changes", history.RecentChanges(n), user.FromRequest(rq)))
 	} else {
 		http.Redirect(w, rq, "/recent-changes/20", http.StatusSeeOther)
 	}
diff --git a/http_mutators.go b/http_mutators.go
index 61d1da9..ca48d07 100644
--- a/http_mutators.go
+++ b/http_mutators.go
@@ -41,7 +41,7 @@ func handlerUnattachAsk(w http.ResponseWriter, rq *http.Request) {
 		log.Println("Rejected (no rights):", rq.URL)
 		return
 	}
-	util.HTTP200Page(w, base("Unattach "+hyphaName+"?", templates.UnattachAskHTML(rq, hyphaName, isOld)))
+	util.HTTP200Page(w, base("Unattach "+hyphaName+"?", templates.UnattachAskHTML(rq, hyphaName, isOld), user.FromRequest(rq)))
 }
 
 func handlerUnattachConfirm(w http.ResponseWriter, rq *http.Request) {
@@ -82,13 +82,14 @@ func handlerRenameAsk(w http.ResponseWriter, rq *http.Request) {
 	var (
 		hyphaName = HyphaNameFromRq(rq, "rename-ask")
 		_, isOld  = HyphaStorage[hyphaName]
+		u         = user.FromRequest(rq)
 	)
-	if ok := user.CanProceed(rq, "rename-confirm"); !ok {
+	if !u.CanProceed("rename-confirm") {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a trusted editor to rename pages.")
 		log.Println("Rejected", rq.URL)
 		return
 	}
-	util.HTTP200Page(w, base("Rename "+hyphaName+"?", templates.RenameAskHTML(rq, hyphaName, isOld)))
+	util.HTTP200Page(w, base("Rename "+hyphaName+"?", templates.RenameAskHTML(rq, hyphaName, isOld), u))
 }
 
 func handlerRenameConfirm(w http.ResponseWriter, rq *http.Request) {
@@ -134,13 +135,14 @@ func handlerDeleteAsk(w http.ResponseWriter, rq *http.Request) {
 	var (
 		hyphaName = HyphaNameFromRq(rq, "delete-ask")
 		_, isOld  = HyphaStorage[hyphaName]
+		u         = user.FromRequest(rq)
 	)
-	if ok := user.CanProceed(rq, "delete-ask"); !ok {
+	if !u.CanProceed("delete-ask") {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a moderator to delete pages.")
 		log.Println("Rejected", rq.URL)
 		return
 	}
-	util.HTTP200Page(w, base("Delete "+hyphaName+"?", templates.DeleteAskHTML(rq, hyphaName, isOld)))
+	util.HTTP200Page(w, base("Delete "+hyphaName+"?", templates.DeleteAskHTML(rq, hyphaName, isOld), u))
 }
 
 // handlerDeleteConfirm deletes a hypha for sure
@@ -151,7 +153,7 @@ func handlerDeleteConfirm(w http.ResponseWriter, rq *http.Request) {
 		hyphaData, isOld = HyphaStorage[hyphaName]
 		u                = user.FromRequest(rq)
 	)
-	if !user.CanProceed(rq, "delete-confirm") {
+	if !u.CanProceed("delete-confirm") {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a moderator to delete pages.")
 		log.Println("Rejected", rq.URL)
 		return
@@ -181,8 +183,9 @@ func handlerEdit(w http.ResponseWriter, rq *http.Request) {
 		warning          string
 		textAreaFill     string
 		err              error
+		u                = user.FromRequest(rq)
 	)
-	if ok := user.CanProceed(rq, "edit"); !ok {
+	if !u.CanProceed("edit") {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to edit pages.")
 		log.Println("Rejected", rq.URL)
 		return
@@ -197,7 +200,7 @@ func handlerEdit(w http.ResponseWriter, rq *http.Request) {
 	} else {
 		warning = `<p>You are creating a new hypha.</p>`
 	}
-	util.HTTP200Page(w, base("Edit "+hyphaName, templates.EditHTML(rq, hyphaName, textAreaFill, warning)))
+	util.HTTP200Page(w, base("Edit "+hyphaName, templates.EditHTML(rq, hyphaName, textAreaFill, warning), u))
 }
 
 // handlerUploadText uploads a new text part for the hypha.
@@ -209,7 +212,7 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) {
 		action    = rq.PostFormValue("action")
 		u         = user.FromRequest(rq)
 	)
-	if ok := user.CanProceed(rq, "upload-text"); !ok {
+	if !u.CanProceed("upload-text") {
 		HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to edit pages.")
 		log.Println("Rejected", rq.URL)
 		return
@@ -219,7 +222,7 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) {
 		return
 	}
 	if action == "Preview" {
-		util.HTTP200Page(w, base("Preview "+hyphaName, templates.PreviewHTML(rq, hyphaName, textData, "", markup.Doc(hyphaName, textData).AsHTML())))
+		util.HTTP200Page(w, base("Preview "+hyphaName, templates.PreviewHTML(rq, hyphaName, textData, "", markup.Doc(hyphaName, textData).AsHTML()), u))
 	} else if hop := UploadText(hyphaName, textData, u); len(hop.Errs) != 0 {
 		HttpErr(w, http.StatusInternalServerError, hyphaName, "Error", hop.Errs[0].Error())
 	} else {
diff --git a/http_readers.go b/http_readers.go
index 939aef1..970200d 100644
--- a/http_readers.go
+++ b/http_readers.go
@@ -13,6 +13,7 @@ import (
 	"github.com/bouncepaw/mycorrhiza/markup"
 	"github.com/bouncepaw/mycorrhiza/templates"
 	"github.com/bouncepaw/mycorrhiza/tree"
+	"github.com/bouncepaw/mycorrhiza/user"
 	"github.com/bouncepaw/mycorrhiza/util"
 )
 
@@ -34,6 +35,7 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
 		contents          = fmt.Sprintf(`<p>This hypha had no text at this revision.</p>`)
 		textPath          = hyphaName + ".myco"
 		textContents, err = history.FileAtRevision(textPath, revHash)
+		u                 = user.FromRequest(rq)
 	)
 	if err == nil {
 		contents = markup.Doc(hyphaName, textContents).AsHTML()
@@ -49,7 +51,7 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
 	)
 	w.Header().Set("Content-Type", "text/html;charset=utf-8")
 	w.WriteHeader(http.StatusOK)
-	w.Write([]byte(base(hyphaName, page)))
+	w.Write([]byte(base(hyphaName, page, u)))
 }
 
 // handlerText serves raw source text of the hypha.
@@ -83,6 +85,7 @@ func handlerPage(w http.ResponseWriter, rq *http.Request) {
 		hasAmnt           = hyphaExists && data.binaryPath != ""
 		contents          string
 		openGraph         string
+		u                 = user.FromRequest(rq)
 	)
 	if hyphaExists {
 		fileContentsT, errT := ioutil.ReadFile(data.textPath)
@@ -105,5 +108,6 @@ func handlerPage(w http.ResponseWriter, rq *http.Request) {
 				contents,
 				treeHTML, prevHypha, nextHypha,
 				hasAmnt),
+			u,
 			openGraph))
 }
diff --git a/main.go b/main.go
index cf79b9f..c87c96e 100644
--- a/main.go
+++ b/main.go
@@ -41,9 +41,18 @@ func HttpErr(w http.ResponseWriter, status int, name, title, errMsg string) {
 	log.Println(errMsg, "for", name)
 	w.Header().Set("Content-Type", "text/html;charset=utf-8")
 	w.WriteHeader(status)
-	fmt.Fprint(w, base(title, fmt.Sprintf(
-		`<main><p>%s. <a href="/page/%s">Go back to the hypha.<a></p></main>`,
-		errMsg, name)))
+	fmt.Fprint(
+		w,
+		base(
+			title,
+			fmt.Sprintf(
+				`<main><p>%s. <a href="/page/%s">Go back to the hypha.<a></p></main>`,
+				errMsg,
+				name,
+			),
+			user.EmptyUser(),
+		),
+	)
 }
 
 // Show all hyphae
@@ -52,11 +61,12 @@ func handlerList(w http.ResponseWriter, rq *http.Request) {
 	var (
 		tbody     string
 		pageCount = hyphae.Count()
+		u         = user.FromRequest(rq)
 	)
 	for hyphaName, data := range HyphaStorage {
 		tbody += templates.HyphaListRowHTML(hyphaName, ExtensionToMime(filepath.Ext(data.binaryPath)), data.binaryPath != "")
 	}
-	util.HTTP200Page(w, base("List of pages", templates.HyphaListHTML(tbody, pageCount)))
+	util.HTTP200Page(w, base("List of pages", templates.HyphaListHTML(tbody, pageCount), u))
 }
 
 // This part is present in all html documents.
@@ -146,7 +156,7 @@ func handlerIcon(w http.ResponseWriter, rq *http.Request) {
 func handlerAbout(w http.ResponseWriter, rq *http.Request) {
 	w.Header().Set("Content-Type", "text/html;charset=utf-8")
 	w.WriteHeader(http.StatusOK)
-	w.Write([]byte(base("About "+util.SiteName, templates.AboutHTML())))
+	w.Write([]byte(base("About "+util.SiteName, templates.AboutHTML(), user.FromRequest(rq))))
 }
 
 func handlerRobotsTxt(w http.ResponseWriter, rq *http.Request) {
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index 7f405cb..c13cf38 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -29,6 +29,7 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) {
 	.hypha-tabs { padding: 1rem 2rem; margin: 0 auto; width: 800px; }
 	header { margin: 0 auto; width: 800px; }
 	.header-links__entry { margin-right: 1.5rem; }
+	.header-links__entry_user { margin: 0 2rem 0 auto; }
 	.header-links__entry:nth-of-type(1),
 	.hypha-tabs__tab:nth-of-type(1) { margin-left: 2rem; }
 	.hypha-tabs__tab { margin-right: 1.5rem; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-bottom: 2px #ddd solid; padding: 0 .5rem; }
@@ -94,13 +95,13 @@ figcaption { padding-bottom: .5rem; }
 #new-name {width:100%;}
 
 header { margin-bottom: .5rem; }
+.header-links__entry_user { font-style:italic; }
 .header-links__link { text-decoration: none; display: block; width: 100%; height: 100%; padding: .25rem; }
 .hypha-tabs { padding: 0; }
 .header-links__list, .hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; }
 .header-links__entry, .hypha-tabs__tab { list-style-type: none; }
 .hypha-tabs__tab a { text-decoration: none; }
 .hypha-tabs__tab_active { font-weight: bold; }
-.hypha-tabs__user { font-style:italic; }
 
 .rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; }
 .rc-entry__time { font-style: italic; }
diff --git a/templates/common.qtpl b/templates/common.qtpl
index 08fa7d2..b5e06a1 100644
--- a/templates/common.qtpl
+++ b/templates/common.qtpl
@@ -41,20 +41,19 @@ var navEntries = []navEntry{
 			</li>
 		{%- endif -%}
 		{%- endfor -%}
-		{%s= userMenuHTML(u) %}
 		</ul>
 	</nav>
 {% endfunc %}
 
 {% func userMenuHTML(u *user.User) %}
-	{% if user.AuthUsed %}
-			<li class="hypha-tabs__tab hypha-tabs__user">
-			{% if u.Group == "anon" %}
-				<a href="/login">Login</a>
-			{% else %}
-				<a href="/page/{%s util.UserHypha %}/{%s u.Name %}">{%s u.Name %}</a>
-			{% endif %}
-			</li>
+{% if user.AuthUsed %}
+<li class="header-links__entry header-links__entry_user">
+	{% if u.Group == "anon" %}
+	<a href="/login" class="header-links__link">Login</a>
+	{% else %}
+	<a href="/page/{%s util.UserHypha %}/{%s u.Name %}" class="header-links__link">{%s u.Name %}</a>
 	{% endif %}
+</li>
+{% endif %}
 {% endfunc %}
 
diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go
index 5895b1e..590cc02 100644
--- a/templates/common.qtpl.go
+++ b/templates/common.qtpl.go
@@ -106,114 +106,109 @@ func streamnavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navTy
 //line templates/common.qtpl:43
 	}
 //line templates/common.qtpl:43
-	qw422016.N().S(`		`)
-//line templates/common.qtpl:44
-	qw422016.N().S(userMenuHTML(u))
-//line templates/common.qtpl:44
-	qw422016.N().S(`
-		</ul>
+	qw422016.N().S(`		</ul>
 	</nav>
 `)
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 }
 
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 func writenavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) {
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 	streamnavHTML(qw422016, rq, hyphaName, navType, revisionHash...)
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 	qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 }
 
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string {
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 	writenavHTML(qb422016, rq, hyphaName, navType, revisionHash...)
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 	qs422016 := string(qb422016.B)
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 	return qs422016
-//line templates/common.qtpl:47
+//line templates/common.qtpl:46
 }
 
-//line templates/common.qtpl:49
+//line templates/common.qtpl:48
 func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) {
-//line templates/common.qtpl:49
-	qw422016.N().S(`
-	`)
-//line templates/common.qtpl:50
-	if user.AuthUsed {
-//line templates/common.qtpl:50
-		qw422016.N().S(`
-			<li class="hypha-tabs__tab hypha-tabs__user">
-			`)
-//line templates/common.qtpl:52
-		if u.Group == "anon" {
-//line templates/common.qtpl:52
-			qw422016.N().S(`
-				<a href="/login">Login</a>
-			`)
-//line templates/common.qtpl:54
-		} else {
-//line templates/common.qtpl:54
-			qw422016.N().S(`
-				<a href="/page/`)
-//line templates/common.qtpl:55
-			qw422016.E().S(util.UserHypha)
-//line templates/common.qtpl:55
-			qw422016.N().S(`/`)
-//line templates/common.qtpl:55
-			qw422016.E().S(u.Name)
-//line templates/common.qtpl:55
-			qw422016.N().S(`">`)
-//line templates/common.qtpl:55
-			qw422016.E().S(u.Name)
-//line templates/common.qtpl:55
-			qw422016.N().S(`</a>
-			`)
-//line templates/common.qtpl:56
-		}
-//line templates/common.qtpl:56
-		qw422016.N().S(`
-			</li>
-	`)
-//line templates/common.qtpl:58
-	}
-//line templates/common.qtpl:58
+//line templates/common.qtpl:48
 	qw422016.N().S(`
 `)
-//line templates/common.qtpl:59
+//line templates/common.qtpl:49
+	if user.AuthUsed {
+//line templates/common.qtpl:49
+		qw422016.N().S(`
+<li class="header-links__entry header-links__entry_user">
+	`)
+//line templates/common.qtpl:51
+		if u.Group == "anon" {
+//line templates/common.qtpl:51
+			qw422016.N().S(`
+	<a href="/login" class="header-links__link">Login</a>
+	`)
+//line templates/common.qtpl:53
+		} else {
+//line templates/common.qtpl:53
+			qw422016.N().S(`
+	<a href="/page/`)
+//line templates/common.qtpl:54
+			qw422016.E().S(util.UserHypha)
+//line templates/common.qtpl:54
+			qw422016.N().S(`/`)
+//line templates/common.qtpl:54
+			qw422016.E().S(u.Name)
+//line templates/common.qtpl:54
+			qw422016.N().S(`" class="header-links__link">`)
+//line templates/common.qtpl:54
+			qw422016.E().S(u.Name)
+//line templates/common.qtpl:54
+			qw422016.N().S(`</a>
+	`)
+//line templates/common.qtpl:55
+		}
+//line templates/common.qtpl:55
+		qw422016.N().S(`
+</li>
+`)
+//line templates/common.qtpl:57
+	}
+//line templates/common.qtpl:57
+	qw422016.N().S(`
+`)
+//line templates/common.qtpl:58
 }
 
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 func writeuserMenuHTML(qq422016 qtio422016.Writer, u *user.User) {
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 	streamuserMenuHTML(qw422016, u)
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 	qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 }
 
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 func userMenuHTML(u *user.User) string {
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 	writeuserMenuHTML(qb422016, u)
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 	qs422016 := string(qb422016.B)
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 	return qs422016
-//line templates/common.qtpl:59
+//line templates/common.qtpl:58
 }
diff --git a/templates/default.css b/templates/default.css
index ffbcc82..a669a87 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -4,6 +4,7 @@
 	.hypha-tabs { padding: 1rem 2rem; margin: 0 auto; width: 800px; }
 	header { margin: 0 auto; width: 800px; }
 	.header-links__entry { margin-right: 1.5rem; }
+	.header-links__entry_user { margin: 0 2rem 0 auto; }
 	.header-links__entry:nth-of-type(1),
 	.hypha-tabs__tab:nth-of-type(1) { margin-left: 2rem; }
 	.hypha-tabs__tab { margin-right: 1.5rem; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); border-bottom: 2px #ddd solid; padding: 0 .5rem; }
@@ -69,13 +70,13 @@ figcaption { padding-bottom: .5rem; }
 #new-name {width:100%;}
 
 header { margin-bottom: .5rem; }
+.header-links__entry_user { font-style:italic; }
 .header-links__link { text-decoration: none; display: block; width: 100%; height: 100%; padding: .25rem; }
 .hypha-tabs { padding: 0; }
 .header-links__list, .hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; }
 .header-links__entry, .hypha-tabs__tab { list-style-type: none; }
 .hypha-tabs__tab a { text-decoration: none; }
 .hypha-tabs__tab_active { font-weight: bold; }
-.hypha-tabs__user { font-style:italic; }
 
 .rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; }
 .rc-entry__time { font-style: italic; }
diff --git a/templates/http_stuff.qtpl b/templates/http_stuff.qtpl
index c65c0f9..8723860 100644
--- a/templates/http_stuff.qtpl
+++ b/templates/http_stuff.qtpl
@@ -1,7 +1,7 @@
 {% import "github.com/bouncepaw/mycorrhiza/util" %}
 {% import "github.com/bouncepaw/mycorrhiza/user" %}
 
-{% func BaseHTML(title, body string, headElements ...string) %}
+{% func BaseHTML(title, body string, u *user.User, headElements ...string) %}
 <!doctype html>
 <html>
 	<head>
@@ -17,6 +17,7 @@
 					{%- for _, link := range util.HeaderLinks -%}
 					<li class="header-links__entry"><a class="header-links__link" href="{%s link.Href %}">{%s link.Display %}</a></li>
 					{%- endfor -%}
+					{%s= userMenuHTML(u) %}
 				</ul>
 			</nav>
 		</header>
diff --git a/templates/http_stuff.qtpl.go b/templates/http_stuff.qtpl.go
index 667627a..2de5906 100644
--- a/templates/http_stuff.qtpl.go
+++ b/templates/http_stuff.qtpl.go
@@ -24,7 +24,7 @@ var (
 )
 
 //line templates/http_stuff.qtpl:4
-func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, headElements ...string) {
+func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, u *user.User, headElements ...string) {
 //line templates/http_stuff.qtpl:4
 	qw422016.N().S(`
 <!doctype html>
@@ -68,56 +68,61 @@ func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, headElements
 //line templates/http_stuff.qtpl:19
 	}
 //line templates/http_stuff.qtpl:19
-	qw422016.N().S(`				</ul>
+	qw422016.N().S(`					`)
+//line templates/http_stuff.qtpl:20
+	qw422016.N().S(userMenuHTML(u))
+//line templates/http_stuff.qtpl:20
+	qw422016.N().S(`
+				</ul>
 			</nav>
 		</header>
 		`)
-//line templates/http_stuff.qtpl:23
+//line templates/http_stuff.qtpl:24
 	qw422016.N().S(body)
-//line templates/http_stuff.qtpl:23
+//line templates/http_stuff.qtpl:24
 	qw422016.N().S(`
 	</body>
 </html>
 `)
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
 }
 
-//line templates/http_stuff.qtpl:26
-func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string, headElements ...string) {
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
+func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string, u *user.User, headElements ...string) {
+//line templates/http_stuff.qtpl:27
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:26
-	StreamBaseHTML(qw422016, title, body, headElements...)
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
+	StreamBaseHTML(qw422016, title, body, u, headElements...)
+//line templates/http_stuff.qtpl:27
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
 }
 
-//line templates/http_stuff.qtpl:26
-func BaseHTML(title, body string, headElements ...string) string {
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
+func BaseHTML(title, body string, u *user.User, headElements ...string) string {
+//line templates/http_stuff.qtpl:27
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:26
-	WriteBaseHTML(qb422016, title, body, headElements...)
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
+	WriteBaseHTML(qb422016, title, body, u, headElements...)
+//line templates/http_stuff.qtpl:27
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
 	return qs422016
-//line templates/http_stuff.qtpl:26
+//line templates/http_stuff.qtpl:27
 }
 
-//line templates/http_stuff.qtpl:28
+//line templates/http_stuff.qtpl:29
 func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:28
+//line templates/http_stuff.qtpl:29
 	qw422016.N().S(`
 <main>
 	<h1>List of hyphae</h1>
 	<p>This wiki has `)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	qw422016.N().D(pageCount)
-//line templates/http_stuff.qtpl:31
+//line templates/http_stuff.qtpl:32
 	qw422016.N().S(` hyphae.</p>
 	<table>
 		<thead>
@@ -128,203 +133,203 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int)
 		</thead>
 		<tbody>
 			`)
-//line templates/http_stuff.qtpl:40
+//line templates/http_stuff.qtpl:41
 	qw422016.N().S(tbody)
-//line templates/http_stuff.qtpl:40
+//line templates/http_stuff.qtpl:41
 	qw422016.N().S(`
 		</tbody>
 	</table>
 </main>
 `)
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 }
 
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 	StreamHyphaListHTML(qw422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 }
 
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 func HyphaListHTML(tbody string, pageCount int) string {
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 	WriteHyphaListHTML(qb422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 	return qs422016
-//line templates/http_stuff.qtpl:44
+//line templates/http_stuff.qtpl:45
 }
 
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:47
 func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:46
+//line templates/http_stuff.qtpl:47
 	qw422016.N().S(`
 			<tr>
 				<td><a href="/page/`)
-//line templates/http_stuff.qtpl:48
+//line templates/http_stuff.qtpl:49
 	qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:48
+//line templates/http_stuff.qtpl:49
 	qw422016.N().S(`">`)
-//line templates/http_stuff.qtpl:48
+//line templates/http_stuff.qtpl:49
 	qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:48
+//line templates/http_stuff.qtpl:49
 	qw422016.N().S(`</a></td>
 			`)
-//line templates/http_stuff.qtpl:49
+//line templates/http_stuff.qtpl:50
 	if binaryPresent {
-//line templates/http_stuff.qtpl:49
+//line templates/http_stuff.qtpl:50
 		qw422016.N().S(`
 				<td>`)
-//line templates/http_stuff.qtpl:50
+//line templates/http_stuff.qtpl:51
 		qw422016.E().S(binaryMime)
-//line templates/http_stuff.qtpl:50
+//line templates/http_stuff.qtpl:51
 		qw422016.N().S(`</td>
 			`)
-//line templates/http_stuff.qtpl:51
+//line templates/http_stuff.qtpl:52
 	} else {
-//line templates/http_stuff.qtpl:51
+//line templates/http_stuff.qtpl:52
 		qw422016.N().S(`
 				<td></td>
 			`)
-//line templates/http_stuff.qtpl:53
+//line templates/http_stuff.qtpl:54
 	}
-//line templates/http_stuff.qtpl:53
+//line templates/http_stuff.qtpl:54
 	qw422016.N().S(`
 			</tr>
 `)
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 }
 
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 	StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 }
 
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string {
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 	WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 	return qs422016
-//line templates/http_stuff.qtpl:55
+//line templates/http_stuff.qtpl:56
 }
 
-//line templates/http_stuff.qtpl:57
+//line templates/http_stuff.qtpl:58
 func StreamAboutHTML(qw422016 *qt422016.Writer) {
-//line templates/http_stuff.qtpl:57
+//line templates/http_stuff.qtpl:58
 	qw422016.N().S(`
 <main>
 	<section>
 		<h1>About `)
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:61
 	qw422016.E().S(util.SiteName)
-//line templates/http_stuff.qtpl:60
+//line templates/http_stuff.qtpl:61
 	qw422016.N().S(`</h1>
 		<ul>
 			<li><b><a href="https://mycorrhiza.lesarbr.es">MycorrhizaWiki</a> version:</b> β 0.12 indev</li>
 `)
-//line templates/http_stuff.qtpl:63
+//line templates/http_stuff.qtpl:64
 	if user.AuthUsed {
-//line templates/http_stuff.qtpl:63
+//line templates/http_stuff.qtpl:64
 		qw422016.N().S(`			<li><b>User count:</b> `)
-//line templates/http_stuff.qtpl:64
+//line templates/http_stuff.qtpl:65
 		qw422016.N().D(user.Count())
-//line templates/http_stuff.qtpl:64
+//line templates/http_stuff.qtpl:65
 		qw422016.N().S(`</li>
 			<li><b>Home page:</b> <a href="/">`)
-//line templates/http_stuff.qtpl:65
+//line templates/http_stuff.qtpl:66
 		qw422016.E().S(util.HomePage)
-//line templates/http_stuff.qtpl:65
+//line templates/http_stuff.qtpl:66
 		qw422016.N().S(`</a></li>
 			<li><b>Administrators:</b>`)
-//line templates/http_stuff.qtpl:66
+//line templates/http_stuff.qtpl:67
 		for i, username := range user.ListUsersWithGroup("admin") {
-//line templates/http_stuff.qtpl:67
+//line templates/http_stuff.qtpl:68
 			if i > 0 {
-//line templates/http_stuff.qtpl:67
+//line templates/http_stuff.qtpl:68
 				qw422016.N().S(`<span aria-hidden="true">, </span>
 `)
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:69
 			}
-//line templates/http_stuff.qtpl:68
+//line templates/http_stuff.qtpl:69
 			qw422016.N().S(`				<a href="/page/`)
-//line templates/http_stuff.qtpl:69
+//line templates/http_stuff.qtpl:70
 			qw422016.E().S(util.UserHypha)
-//line templates/http_stuff.qtpl:69
+//line templates/http_stuff.qtpl:70
 			qw422016.N().S(`/`)
-//line templates/http_stuff.qtpl:69
+//line templates/http_stuff.qtpl:70
 			qw422016.E().S(username)
-//line templates/http_stuff.qtpl:69
+//line templates/http_stuff.qtpl:70
 			qw422016.N().S(`">`)
-//line templates/http_stuff.qtpl:69
+//line templates/http_stuff.qtpl:70
 			qw422016.E().S(username)
-//line templates/http_stuff.qtpl:69
+//line templates/http_stuff.qtpl:70
 			qw422016.N().S(`</a>`)
-//line templates/http_stuff.qtpl:69
+//line templates/http_stuff.qtpl:70
 		}
-//line templates/http_stuff.qtpl:69
+//line templates/http_stuff.qtpl:70
 		qw422016.N().S(`</li>
 `)
-//line templates/http_stuff.qtpl:70
+//line templates/http_stuff.qtpl:71
 	} else {
-//line templates/http_stuff.qtpl:70
+//line templates/http_stuff.qtpl:71
 		qw422016.N().S(`			<li>This wiki does not use authorization</li>
 `)
-//line templates/http_stuff.qtpl:72
+//line templates/http_stuff.qtpl:73
 	}
-//line templates/http_stuff.qtpl:72
+//line templates/http_stuff.qtpl:73
 	qw422016.N().S(`		</ul>
 		<p>See <a href="/list">/list</a> for information about hyphae on this wiki.</p>
 	</section>
 </main>
 `)
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 }
 
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 func WriteAboutHTML(qq422016 qtio422016.Writer) {
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 	StreamAboutHTML(qw422016)
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 	qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 }
 
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 func AboutHTML() string {
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 	WriteAboutHTML(qb422016)
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 	qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 	return qs422016
-//line templates/http_stuff.qtpl:77
+//line templates/http_stuff.qtpl:78
 }
diff --git a/user/net.go b/user/net.go
index 55b08e1..caec383 100644
--- a/user/net.go
+++ b/user/net.go
@@ -17,7 +17,7 @@ func CanProceed(rq *http.Request, route string) bool {
 func FromRequest(rq *http.Request) *User {
 	cookie, err := rq.Cookie("mycorrhiza_token")
 	if err != nil {
-		return emptyUser()
+		return EmptyUser()
 	}
 	return userByToken(cookie.Value)
 }
diff --git a/user/user.go b/user/user.go
index b45e2c5..efc0028 100644
--- a/user/user.go
+++ b/user/user.go
@@ -37,7 +37,7 @@ var groupRight = map[string]int{
 	"admin":     4,
 }
 
-func emptyUser() *User {
+func EmptyUser() *User {
 	return &User{
 		Name:     "anon",
 		Group:    "anon",
diff --git a/user/users.go b/user/users.go
index 397ecf0..aa5bb4b 100644
--- a/user/users.go
+++ b/user/users.go
@@ -44,7 +44,7 @@ func userByToken(token string) *User {
 		username := usernameUntyped.(string)
 		return userByName(username)
 	}
-	return emptyUser()
+	return EmptyUser()
 }
 
 func userByName(username string) *User {
@@ -52,7 +52,7 @@ func userByName(username string) *User {
 		user := userUntyped.(*User)
 		return user
 	}
-	return emptyUser()
+	return EmptyUser()
 }
 
 func commenceSession(username, token string) {

From 9316e671b60de50f74ec26270607d77510c9f709 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 24 Jan 2021 13:18:59 +0500
Subject: [PATCH 47/50] Move the protocol icons to the left, change svg icon
 colors

---
 markup/lexer.go                         |  4 ++--
 markup/link.go                          | 12 ++++++------
 markup/paragraph.go                     |  4 ++--
 metarrhiza                              |  2 +-
 templates/asset.qtpl.go                 | 24 +++++++++++++++---------
 templates/default.css                   | 12 +++++++++---
 templates/icon/gemini-protocol-icon.svg |  2 +-
 templates/icon/gopher-protocol-icon.svg |  6 +++---
 templates/icon/http-protocol-icon.svg   |  2 +-
 templates/icon/mailto-protocol-icon.svg |  2 +-
 util/header_links.go                    |  4 ++--
 11 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/markup/lexer.go b/markup/lexer.go
index 24aaee5..4516eb0 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -165,8 +165,8 @@ numberState:
 launchpadState:
 	switch {
 	case startsWith("=>"):
-		href, text, class, icon := Rocketlink(line, state.name)
-		state.buf += fmt.Sprintf(`	<li class="launchpad__entry"><a class="rocketlink %s" href="%s">%s%s</a></li>`, class, href, text, icon)
+		href, text, class := Rocketlink(line, state.name)
+		state.buf += fmt.Sprintf(`	<li class="launchpad__entry"><a class="rocketlink %s" href="%s">%s</a></li>`, class, href, text)
 	case startsWith("```"):
 		state.where = "pre"
 		addLine(state.buf + "</ul>")
diff --git a/markup/link.go b/markup/link.go
index 1c358be..af3e51c 100644
--- a/markup/link.go
+++ b/markup/link.go
@@ -10,13 +10,13 @@ import (
 //
 // => addr display
 // [[addr|display]]
-func LinkParts(addr, display, hyphaName string) (href, text, class, icon string) {
+func LinkParts(addr, display, hyphaName string) (href, text, class string) {
 	if display == "" {
 		text = addr
 	} else {
 		text = strings.TrimSpace(display)
 	}
-	class = "wikilink_internal"
+	class = "wikilink wikilink_internal"
 
 	switch {
 	case strings.ContainsRune(addr, ':'):
@@ -28,9 +28,9 @@ func LinkParts(addr, display, hyphaName string) (href, text, class, icon string)
 				text = text[2:]
 			}
 		}
-		return addr, text, "wikilink_external", fmt.Sprintf(`<img class="wikilink__destination-type" src="/static/icon/%s" width="16" height="16"/>`, destination)
+		return addr, text, fmt.Sprintf("wikilink wikilink_external wikilink_%s", destination)
 	case strings.HasPrefix(addr, "/"):
-		return addr, text, class, ""
+		return addr, text, class
 	case strings.HasPrefix(addr, "./"):
 		hyphaName = canonicalName(path.Join(hyphaName, addr[2:]))
 	case strings.HasPrefix(addr, "../"):
@@ -41,12 +41,12 @@ func LinkParts(addr, display, hyphaName string) (href, text, class, icon string)
 	if !HyphaExists(hyphaName) {
 		class += " wikilink_new"
 	}
-	return "/page/" + hyphaName, text, class, ""
+	return "/page/" + hyphaName, text, class
 }
 
 // Parse markup line starting with "=>" according to wikilink rules.
 // See http://localhost:1737/page/wikilink
-func Rocketlink(src, hyphaName string) (href, text, class, icon string) {
+func Rocketlink(src, hyphaName string) (href, text, class string) {
 	src = strings.TrimSpace(src[2:]) // Drop =>
 	if src == "" {
 		return
diff --git a/markup/paragraph.go b/markup/paragraph.go
index bcb1c84..f506bb6 100644
--- a/markup/paragraph.go
+++ b/markup/paragraph.go
@@ -61,8 +61,8 @@ func getLinkNode(input *bytes.Buffer, hyphaName string, isBracketedLink bool) st
 			currBuf.WriteByte(b)
 		}
 	}
-	href, text, class, icon := LinkParts(addrBuf.String(), displayBuf.String(), hyphaName)
-	return fmt.Sprintf(`<a href="%s" class="%s">%s%s</a>`, href, class, html.EscapeString(text), icon)
+	href, text, class := LinkParts(addrBuf.String(), displayBuf.String(), hyphaName)
+	return fmt.Sprintf(`<a href="%s" class="%s">%s</a>`, href, class, html.EscapeString(text))
 }
 
 // getTextNode splits the `input` into two parts `textNode` and `rest` by the first encountered rune that resembles a span tag. If there is none, `textNode = input`, `rest = ""`. It handles escaping with backslash.
diff --git a/metarrhiza b/metarrhiza
index b67144c..be5b922 160000
--- a/metarrhiza
+++ b/metarrhiza
@@ -1 +1 @@
-Subproject commit b67144cc770900104a652483c11cabfecc7325aa
+Subproject commit be5b922e9b564551601d21ed45bf7d9ced65c6bb
diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go
index c13cf38..95a984b 100644
--- a/templates/asset.qtpl.go
+++ b/templates/asset.qtpl.go
@@ -57,7 +57,14 @@ textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;
 
 main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote { margin-left: 0; padding-left: 1rem; }
-.wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
+.wikilink_external::before { display: inline-block; width: 18px; height: 16px; vertical-align: sub; }
+/* .wikilink_external { padding-left: 16px; } */
+.wikilink_gopher::before { content: url("/static/icon/gopher"); }
+.wikilink_http::before { content: url("/static/icon/http"); }
+.wikilink_https::before { content: url("/static/icon/http"); }
+/* .wikilink_https { background: transparent url("/static/icon/http") center left no-repeat; } */
+.wikilink_gemini::before { content: url("/static/icon/gemini"); }
+.wikilink_mailto::before { content: url("/static/icon/mailto"); }
 
 article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
 article h1, article h2, article h3, article h4, article h5, article h6 { margin: 1.5rem 0 0 0; }
@@ -72,7 +79,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25
 .transclusion__link::before {content: "⇐ ";}
 
 /* Derived from https://commons.wikimedia.org/wiki/File:U%2B21D2.svg */
-.launchpad__entry { list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1.0' width='25' height='12'%3E%3Cg transform='scale(0.7,0.8) translate(-613.21429,-421)'%3E%3Cpath d='M 638.06773,429.49751 L 631.01022,436.87675 L 630.1898,436.02774 L 632.416,433.30375 L 613.46876,433.30375 L 613.46876,431.66382 L 633.82089,431.66382 L 635.57789,429.5261 L 633.79229,427.35979 L 613.46876,427.35979 L 613.46876,425.71985 L 632.416,425.71985 L 630.1898,422.99587 L 631.01022,422.08788 L 638.06773,429.49751 z '/%3E%3C/g%3E%3C/svg%3E"); }
+.launchpad__entry { list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1.0' width='25' height='12'%3E%3Cg transform='scale(0.7,0.8) translate(-613.21429,-421)'%3E%3Cpath fill='%23999' d='M 638.06773,429.49751 L 631.01022,436.87675 L 630.1898,436.02774 L 632.416,433.30375 L 613.46876,433.30375 L 613.46876,431.66382 L 633.82089,431.66382 L 635.57789,429.5261 L 633.79229,427.35979 L 613.46876,427.35979 L 613.46876,425.71985 L 632.416,425.71985 L 630.1898,422.99587 L 631.01022,422.08788 L 638.06773,429.49751 z '/%3E%3C/g%3E%3C/svg%3E"); }
 
 .binary-container_with-img img,
 .binary-container_with-video video,
@@ -126,7 +133,6 @@ td { padding: .25rem; }
 caption { caption-side: top; font-size: small; }
 
 /* Color stuff */
-svg path { fill: currentColor !important; }
 /* Lighter stuff #eee */
 article code,
 article .codeblock,
@@ -241,7 +247,7 @@ func StreamIconHTTP(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
 `)
 //line templates/asset.qtpl:7
-	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" color="currentColor" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="#999" d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
 `)
 //line templates/asset.qtpl:7
 	qw422016.N().S(`
@@ -281,7 +287,7 @@ func StreamIconGemini(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
 `)
 //line templates/asset.qtpl:11
-	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M15.502 20A6.523 6.523 0 0 1 12 23.502 6.523 6.523 0 0 1 8.498 20h2.26c.326.489.747.912 1.242 1.243.495-.33.916-.754 1.243-1.243h2.259zM18 14.805l2 2.268V19H4v-1.927l2-2.268V9c0-3.483 2.504-6.447 6-7.545C15.496 2.553 18 5.517 18 9v5.805zM17.27 17L16 15.56V9c0-2.318-1.57-4.43-4-5.42C9.57 4.57 8 6.681 8 9v6.56L6.73 17h10.54zM12 11a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/></svg>
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="#999" d="M15.502 20A6.523 6.523 0 0 1 12 23.502 6.523 6.523 0 0 1 8.498 20h2.26c.326.489.747.912 1.242 1.243.495-.33.916-.754 1.243-1.243h2.259zM18 14.805l2 2.268V19H4v-1.927l2-2.268V9c0-3.483 2.504-6.447 6-7.545C15.496 2.553 18 5.517 18 9v5.805zM17.27 17L16 15.56V9c0-2.318-1.57-4.43-4-5.42C9.57 4.57 8 6.681 8 9v6.56L6.73 17h10.54zM12 11a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/></svg>
 `)
 //line templates/asset.qtpl:11
 	qw422016.N().S(`
@@ -321,7 +327,7 @@ func StreamIconMailto(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
 `)
 //line templates/asset.qtpl:15
-	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm17 4.238l-7.928 7.1L4 7.216V19h16V7.238zM4.511 5l7.55 6.662L19.502 5H4.511z"/></svg>
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="#999" d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm17 4.238l-7.928 7.1L4 7.216V19h16V7.238zM4.511 5l7.55 6.662L19.502 5H4.511z"/></svg>
 `)
 //line templates/asset.qtpl:15
 	qw422016.N().S(`
@@ -363,8 +369,8 @@ func StreamIconGopher(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
 `)
 //line templates/asset.qtpl:20
-	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="24" height="24">
-<path d="M447.238,204.944v-70.459c0-8.836-7.164-16-16-16c-34.051,0-64.414,21.118-75.079,55.286
+	qw422016.N().S(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="16" height="16">
+<path fill="#999" d="M447.238,204.944v-70.459c0-8.836-7.164-16-16-16c-34.051,0-64.414,21.118-75.079,55.286
 C226.094,41.594,0,133.882,0,319.435c0,0.071,0.01,0.14,0.011,0.21c0.116,44.591,36.423,80.833,81.04,80.833h171.203
 c8.836,0,16-7.164,16-16c0-8.836-7.164-16-16-16H81.051c-21.441,0-39.7-13.836-46.351-33.044H496c8.836,0,16-7.164,16-16
 C512,271.82,486.82,228.692,447.238,204.944z M415.238,153.216v37.805c-10.318-2.946-19.556-4.305-29.342-4.937
@@ -372,7 +378,7 @@ C390.355,168.611,402.006,157.881,415.238,153.216z M295.484,303.435L295.484,303.4
 c-8.836,0-16,7.164-16,16c0,8.836,7.164,16,16,16c25.909,0,47.826,17.364,54.76,41.062H32.722
 c14.415-159.15,218.064-217.856,315.136-90.512c3.545,4.649,9.345,6.995,15.124,6.118
 c55.425-8.382,107.014,29.269,115.759,84.394H295.484z"/>
-<circle cx="415.238" cy="260.05" r="21.166"/>
+<circle fill="#999" cx="415.238" cy="260.05" r="21.166"/>
 </svg>
 `)
 //line templates/asset.qtpl:20
diff --git a/templates/default.css b/templates/default.css
index a669a87..0d1ccda 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -32,7 +32,14 @@ textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;
 
 main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote { margin-left: 0; padding-left: 1rem; }
-.wikilink__destination-type {display: inline; margin: 0 .25rem; vertical-align: sub; }
+.wikilink_external::before { display: inline-block; width: 18px; height: 16px; vertical-align: sub; }
+/* .wikilink_external { padding-left: 16px; } */
+.wikilink_gopher::before { content: url("/static/icon/gopher"); }
+.wikilink_http::before { content: url("/static/icon/http"); }
+.wikilink_https::before { content: url("/static/icon/http"); }
+/* .wikilink_https { background: transparent url("/static/icon/http") center left no-repeat; } */
+.wikilink_gemini::before { content: url("/static/icon/gemini"); }
+.wikilink_mailto::before { content: url("/static/icon/mailto"); }
 
 article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
 article h1, article h2, article h3, article h4, article h5, article h6 { margin: 1.5rem 0 0 0; }
@@ -47,7 +54,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25
 .transclusion__link::before {content: "⇐ ";}
 
 /* Derived from https://commons.wikimedia.org/wiki/File:U%2B21D2.svg */
-.launchpad__entry { list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1.0' width='25' height='12'%3E%3Cg transform='scale(0.7,0.8) translate(-613.21429,-421)'%3E%3Cpath d='M 638.06773,429.49751 L 631.01022,436.87675 L 630.1898,436.02774 L 632.416,433.30375 L 613.46876,433.30375 L 613.46876,431.66382 L 633.82089,431.66382 L 635.57789,429.5261 L 633.79229,427.35979 L 613.46876,427.35979 L 613.46876,425.71985 L 632.416,425.71985 L 630.1898,422.99587 L 631.01022,422.08788 L 638.06773,429.49751 z '/%3E%3C/g%3E%3C/svg%3E"); }
+.launchpad__entry { list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1.0' width='25' height='12'%3E%3Cg transform='scale(0.7,0.8) translate(-613.21429,-421)'%3E%3Cpath fill='%23999' d='M 638.06773,429.49751 L 631.01022,436.87675 L 630.1898,436.02774 L 632.416,433.30375 L 613.46876,433.30375 L 613.46876,431.66382 L 633.82089,431.66382 L 635.57789,429.5261 L 633.79229,427.35979 L 613.46876,427.35979 L 613.46876,425.71985 L 632.416,425.71985 L 630.1898,422.99587 L 631.01022,422.08788 L 638.06773,429.49751 z '/%3E%3C/g%3E%3C/svg%3E"); }
 
 .binary-container_with-img img,
 .binary-container_with-video video,
@@ -101,7 +108,6 @@ td { padding: .25rem; }
 caption { caption-side: top; font-size: small; }
 
 /* Color stuff */
-svg path { fill: currentColor !important; }
 /* Lighter stuff #eee */
 article code,
 article .codeblock,
diff --git a/templates/icon/gemini-protocol-icon.svg b/templates/icon/gemini-protocol-icon.svg
index 70beccb..f2a6414 100644
--- a/templates/icon/gemini-protocol-icon.svg
+++ b/templates/icon/gemini-protocol-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M15.502 20A6.523 6.523 0 0 1 12 23.502 6.523 6.523 0 0 1 8.498 20h2.26c.326.489.747.912 1.242 1.243.495-.33.916-.754 1.243-1.243h2.259zM18 14.805l2 2.268V19H4v-1.927l2-2.268V9c0-3.483 2.504-6.447 6-7.545C15.496 2.553 18 5.517 18 9v5.805zM17.27 17L16 15.56V9c0-2.318-1.57-4.43-4-5.42C9.57 4.57 8 6.681 8 9v6.56L6.73 17h10.54zM12 11a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="#999" d="M15.502 20A6.523 6.523 0 0 1 12 23.502 6.523 6.523 0 0 1 8.498 20h2.26c.326.489.747.912 1.242 1.243.495-.33.916-.754 1.243-1.243h2.259zM18 14.805l2 2.268V19H4v-1.927l2-2.268V9c0-3.483 2.504-6.447 6-7.545C15.496 2.553 18 5.517 18 9v5.805zM17.27 17L16 15.56V9c0-2.318-1.57-4.43-4-5.42C9.57 4.57 8 6.681 8 9v6.56L6.73 17h10.54zM12 11a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/></svg>
diff --git a/templates/icon/gopher-protocol-icon.svg b/templates/icon/gopher-protocol-icon.svg
index bce1a36..3ee0c59 100644
--- a/templates/icon/gopher-protocol-icon.svg
+++ b/templates/icon/gopher-protocol-icon.svg
@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="24" height="24">
-<path d="M447.238,204.944v-70.459c0-8.836-7.164-16-16-16c-34.051,0-64.414,21.118-75.079,55.286
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="16" height="16">
+<path fill="#999" d="M447.238,204.944v-70.459c0-8.836-7.164-16-16-16c-34.051,0-64.414,21.118-75.079,55.286
 C226.094,41.594,0,133.882,0,319.435c0,0.071,0.01,0.14,0.011,0.21c0.116,44.591,36.423,80.833,81.04,80.833h171.203
 c8.836,0,16-7.164,16-16c0-8.836-7.164-16-16-16H81.051c-21.441,0-39.7-13.836-46.351-33.044H496c8.836,0,16-7.164,16-16
 C512,271.82,486.82,228.692,447.238,204.944z M415.238,153.216v37.805c-10.318-2.946-19.556-4.305-29.342-4.937
@@ -7,5 +7,5 @@ C390.355,168.611,402.006,157.881,415.238,153.216z M295.484,303.435L295.484,303.4
 c-8.836,0-16,7.164-16,16c0,8.836,7.164,16,16,16c25.909,0,47.826,17.364,54.76,41.062H32.722
 c14.415-159.15,218.064-217.856,315.136-90.512c3.545,4.649,9.345,6.995,15.124,6.118
 c55.425-8.382,107.014,29.269,115.759,84.394H295.484z"/>
-<circle cx="415.238" cy="260.05" r="21.166"/>
+<circle fill="#999" cx="415.238" cy="260.05" r="21.166"/>
 </svg>
diff --git a/templates/icon/http-protocol-icon.svg b/templates/icon/http-protocol-icon.svg
index c375ec4..5bb72f9 100644
--- a/templates/icon/http-protocol-icon.svg
+++ b/templates/icon/http-protocol-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" color="currentColor" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="#999" d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"/></svg>
diff --git a/templates/icon/mailto-protocol-icon.svg b/templates/icon/mailto-protocol-icon.svg
index 424021c..863ccc1 100644
--- a/templates/icon/mailto-protocol-icon.svg
+++ b/templates/icon/mailto-protocol-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm17 4.238l-7.928 7.1L4 7.216V19h16V7.238zM4.511 5l7.55 6.662L19.502 5H4.511z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="#999" d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm17 4.238l-7.928 7.1L4 7.216V19h16V7.238zM4.511 5l7.55 6.662L19.502 5H4.511z"/></svg>
diff --git a/util/header_links.go b/util/header_links.go
index 9c78565..c574768 100644
--- a/util/header_links.go
+++ b/util/header_links.go
@@ -14,11 +14,11 @@ func SetDefaultHeaderLinks() {
 }
 
 // rocketlinkλ is markup.Rocketlink. You have to pass it like that to avoid cyclical dependency.
-func ParseHeaderLinks(text string, rocketlinkλ func(string, string) (string, string, string, string)) {
+func ParseHeaderLinks(text string, rocketlinkλ func(string, string) (string, string, string)) {
 	HeaderLinks = []HeaderLink{}
 	for _, line := range strings.Split(text, "\n") {
 		if strings.HasPrefix(line, "=>") {
-			href, text, _, _ := rocketlinkλ(line, HeaderLinksHypha)
+			href, text, _ := rocketlinkλ(line, HeaderLinksHypha)
 			HeaderLinks = append(HeaderLinks, HeaderLink{
 				Href:    href,
 				Display: text,

From 225c83d8516d0f5267cdf21aa280e609e5441a10 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 24 Jan 2021 13:33:51 +0500
Subject: [PATCH 48/50] Update README.md for 0.12

---
 README.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d672a18..dd14e51 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
 # 🍄 MycorrhizaWiki 0.12
 A wiki engine.
 
+[Main wiki](https://mycorrhiza.lesarbr.es)
+
 ## Building
+Also see [detailed instructions](https://mycorrhiza.lesarbr.es/page/deploy) on wiki.
 ```sh
 git clone --recurse-submodules https://github.com/bouncepaw/mycorrhiza
 cd mycorrhiza
@@ -37,8 +40,8 @@ Options:
 ```
 
 ## Features
-* Edit pages through html forms
-* Responsive design
+* Edit pages through html forms, graphical preview
+* Responsive design, dark theme (synced with system theme)
 * Works in text browsers
 * Wiki pages (called hyphae) are written in mycomarkup
 * Everything is stored as simple files, no database required. You can run a wiki on almost any directory and get something to work with
@@ -50,12 +53,10 @@ Options:
 * Recent changes page; RSS, Atom and JSON feeds available
 * Hyphae can be deleted (while still preserving history)
 * Hyphae can be renamed (recursive renaming of subhyphae is also supported)
-* Light on resources: I run a home wiki on this engine 24/7 at an [Orange π Lite](http://www.orangepi.org/orangepilite/)
+* Light on resources
 * Authorization with pre-set credentials
 
 ## Contributing
-Help is always needed. We have a [tg chat](https://t.me/mycorrhizadev) where some development is coordinated. Feel free to open an issue or contact me.
+Help is always needed. We have a [tg chat](https://t.me/mycorrhizadev) where some development is coordinated. You can also sponsor on [boosty](https://boosty.to/bouncepaw). Feel free to open an issue or contact directly.
 
-## Future plans
-* Tagging system
-* Better history viewing
+You can view list of all planned features on [our kanban board](https://github.com/bouncepaw/mycorrhiza/projects/1).

From f34757afbd7a3c73b7496963fcfe2a0094e17d09 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 24 Jan 2021 13:36:03 +0500
Subject: [PATCH 49/50] Drop memdb dependency because it is not used yet

---
 go.mod             |  1 -
 go.sum             |  9 -------
 hyphae/hypha.go    | 16 ++----------
 storage/storage.go | 65 ----------------------------------------------
 4 files changed, 2 insertions(+), 89 deletions(-)
 delete mode 100644 storage/storage.go

diff --git a/go.mod b/go.mod
index 2d5ea15..137cbae 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,6 @@ go 1.14
 require (
 	github.com/adrg/xdg v0.2.2
 	github.com/gorilla/feeds v1.1.1
-	github.com/hashicorp/go-memdb v1.3.0
 	github.com/kr/pretty v0.2.1 // indirect
 	github.com/valyala/quicktemplate v1.6.3
 )
diff --git a/go.sum b/go.sum
index b20873b..f950cb8 100644
--- a/go.sum
+++ b/go.sum
@@ -5,15 +5,6 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY=
 github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
-github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE=
-github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-memdb v1.3.0 h1:xdXq34gBOMEloa9rlGStLxmfX/dyIK8htOv36dQUwHU=
-github.com/hashicorp/go-memdb v1.3.0/go.mod h1:Mluclgwib3R93Hk5fxEfiRhB+6Dar64wWh71LpNSe3g=
-github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
diff --git a/hyphae/hypha.go b/hyphae/hypha.go
index 366fd5a..d70cd1e 100644
--- a/hyphae/hypha.go
+++ b/hyphae/hypha.go
@@ -1,8 +1,7 @@
 package hyphae
 
-import (
-	"github.com/bouncepaw/mycorrhiza/storage"
-)
+// TODO: do
+import ()
 
 type Hypha struct {
 	Name       string
@@ -15,17 +14,6 @@ type Hypha struct {
 
 // AddHypha adds a hypha named `name` with such `textPath` and `binaryPath`. Both paths can be empty. Does //not// check for hypha's existence beforehand. Count is handled.
 func AddHypha(name, textPath, binaryPath string) {
-	txn := storage.DB.Txn(true)
-	txn.Insert("hyphae",
-		&Hypha{
-			Name:       name,
-			TextPath:   textPath,
-			BinaryPath: binaryPath,
-			OutLinks:   make([]string, 0),
-			BackLinks:  make([]string, 0),
-		})
-	txn.Commit()
-	IncrementCount()
 }
 
 // DeleteHypha clears both paths and all out-links from the named hypha and marks it as non-existent. It does not actually delete it from the memdb. Count is handled.
diff --git a/storage/storage.go b/storage/storage.go
deleted file mode 100644
index 528c109..0000000
--- a/storage/storage.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package storage
-
-import (
-	"github.com/hashicorp/go-memdb"
-)
-
-// Create the DB schema
-var schema = &memdb.DBSchema{
-	Tables: map[string]*memdb.TableSchema{
-		"hyphae": &memdb.TableSchema{
-			Name: "hyphae",
-			Indexes: map[string]*memdb.IndexSchema{
-				"id": &memdb.IndexSchema{
-					Name:    "id",
-					Unique:  true,
-					Indexer: &memdb.StringFieldIndex{Field: "Name"},
-				},
-				"exists": &memdb.IndexSchema{
-					Name:    "exists",
-					Unique:  false,
-					Indexer: &memdb.BoolFieldIndex{Field: "Exists"},
-				},
-				"out-links": &memdb.IndexSchema{
-					Name:    "out-links",
-					Unique:  false,
-					Indexer: &memdb.StringSliceFieldIndex{Field: "OutLinks"},
-				},
-				"back-links": &memdb.IndexSchema{
-					Name:    "back-links",
-					Unique:  false,
-					Indexer: &memdb.StringSliceFieldIndex{Field: "BackLinks"},
-				},
-			},
-		},
-	},
-}
-
-var DB *memdb.MemDB
-
-func init() {
-	var err error
-	DB, err = memdb.NewMemDB(schema)
-	if err != nil {
-		panic(err)
-	}
-}
-
-func ForEveryRecord(table string, λ func(obj interface{})) error {
-	txn := DB.Txn(false)
-	defer txn.Abort()
-
-	it, err := txn.Get(table, "id")
-	if err != nil {
-		return err
-	}
-
-	for obj := it.Next(); obj != nil; obj = it.Next() {
-		λ(obj)
-	}
-
-	return nil
-}
-
-func TxnW() *memdb.Txn { return DB.Txn(true) }
-func TxnR() *memdb.Txn { return DB.Txn(false) }

From 86c760d676c75bec9a677f56f1324e0e39419a71 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sun, 24 Jan 2021 13:40:17 +0500
Subject: [PATCH 50/50] Add a missing option to the Usage section

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index dd14e51..db4db81 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,8 @@ Options:
         What auth method to use. Variants: "none", "fixed" (default "none")
   -fixed-credentials-path string
         Used when -auth-method=fixed. Path to file with user credentials. (default "mycocredentials.json")
+  -header-links-hypha string
+        Optional hypha that overrides the header links
   -home string
         The home page (default "home")
   -icon string