From 77d1cf500998e7408eeb190f9c082bb579a3d120 Mon Sep 17 00:00:00 2001
From: Timur Ismagilov <bouncepaw2@ya.ru>
Date: Sun, 16 May 2021 13:47:44 +0500
Subject: [PATCH] Add the registration link to the top bar

---
 assets/assets.qtpl.go |   2 +-
 assets/default.css    |   2 +-
 views/nav.qtpl        |  20 ++--
 views/nav.qtpl.go     | 250 ++++++++++++++++++++++--------------------
 4 files changed, 148 insertions(+), 126 deletions(-)

diff --git a/assets/assets.qtpl.go b/assets/assets.qtpl.go
index 0c97fe2..2503ba3 100644
--- a/assets/assets.qtpl.go
+++ b/assets/assets.qtpl.go
@@ -143,7 +143,7 @@ header { width: 100%; margin-bottom: 1rem; }
 .header-links__entry, .hypha-tabs__tab { list-style-type: none; }
 
 .header-links__entry { margin-right: .5rem; }
-.header-links__entry_user { font-style:italic; }
+.header-links__entry_user, .header-links__entry_register { font-style:italic; }
 .header-links__link { display: inline-block; padding: .25rem; text-decoration: none; }
 
 .hypha-tabs { padding: 0; margin: 0; }
diff --git a/assets/default.css b/assets/default.css
index c9950ea..ab9534a 100644
--- a/assets/default.css
+++ b/assets/default.css
@@ -28,7 +28,7 @@ header { width: 100%; margin-bottom: 1rem; }
 .header-links__entry, .hypha-tabs__tab { list-style-type: none; }
 
 .header-links__entry { margin-right: .5rem; }
-.header-links__entry_user { font-style:italic; }
+.header-links__entry_user, .header-links__entry_register { font-style:italic; }
 .header-links__link { display: inline-block; padding: .25rem; text-decoration: none; }
 
 .hypha-tabs { padding: 0; margin: 0; }
diff --git a/views/nav.qtpl b/views/nav.qtpl
index 0f8e0b7..eaad97e 100644
--- a/views/nav.qtpl
+++ b/views/nav.qtpl
@@ -2,6 +2,7 @@
 {% import "strings" %}
 {% import "github.com/bouncepaw/mycorrhiza/cfg" %}
 {% import "github.com/bouncepaw/mycorrhiza/user" %}
+{% import "github.com/bouncepaw/mycorrhiza/util" %}
 
 This is the <nav> seen on top of many pages.
 {% code
@@ -48,13 +49,18 @@ var navEntries = []navEntry{
 
 {% func UserMenuHTML(u *user.User) %}
 {% 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="/hypha/{%s cfg.UserHypha %}/{%s u.Name %}" class="header-links__link">{%s u.Name %}</a>
-	{% endif %}
-</li>
+	<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="/hypha/{%s cfg.UserHypha %}/{%s u.Name %}" class="header-links__link">{%s util.BeautifulName(u.Name) %}</a>
+		{% endif %}
+	</li>
+{% endif %}
+{% if user.AuthUsed && cfg.UseRegistration && u.Group == "anon" %}
+	<li class="header-links__entry header-links__entry_register">
+		<a href="/register" class="header-links__link">Register</a>
+	</li>
 {% endif %}
 {% endfunc %}
 
diff --git a/views/nav.qtpl.go b/views/nav.qtpl.go
index 2cbdcce..1011440 100644
--- a/views/nav.qtpl.go
+++ b/views/nav.qtpl.go
@@ -16,22 +16,25 @@ import "github.com/bouncepaw/mycorrhiza/cfg"
 //line views/nav.qtpl:4
 import "github.com/bouncepaw/mycorrhiza/user"
 
+//line views/nav.qtpl:5
+import "github.com/bouncepaw/mycorrhiza/util"
+
 // This is the <nav> seen on top of many pages.
 
-//line views/nav.qtpl:7
+//line views/nav.qtpl:8
 import (
 	qtio422016 "io"
 
 	qt422016 "github.com/valyala/quicktemplate"
 )
 
-//line views/nav.qtpl:7
+//line views/nav.qtpl:8
 var (
 	_ = qtio422016.Copy
 	_ = qt422016.AcquireByteBuffer
 )
 
-//line views/nav.qtpl:8
+//line views/nav.qtpl:9
 type navEntry struct {
 	path  string
 	title string
@@ -48,268 +51,281 @@ var navEntries = []navEntry{
 	{"text", "Raw text"},
 }
 
-//line views/nav.qtpl:24
+//line views/nav.qtpl:25
 func StreamNavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) {
-//line views/nav.qtpl:24
+//line views/nav.qtpl:25
 	qw422016.N().S(`
 `)
-//line views/nav.qtpl:26
+//line views/nav.qtpl:27
 	u := user.FromRequest(rq)
 
-//line views/nav.qtpl:27
+//line views/nav.qtpl:28
 	qw422016.N().S(`
 	<nav class="hypha-tabs main-width">
 		<ul class="hypha-tabs__flex">
 `)
-//line views/nav.qtpl:30
+//line views/nav.qtpl:31
 	for _, entry := range navEntries {
-//line views/nav.qtpl:31
+//line views/nav.qtpl:32
 		if navType == "revision" && entry.path == "revision" {
-//line views/nav.qtpl:31
+//line views/nav.qtpl:32
 			qw422016.N().S(`			<li class="hypha-tabs__tab hypha-tabs__tab_active">
 				<span class="hypha-tabs__selection">`)
-//line views/nav.qtpl:33
+//line views/nav.qtpl:34
 			qw422016.E().S(revisionHash[0])
-//line views/nav.qtpl:33
+//line views/nav.qtpl:34
 			qw422016.N().S(`</span>
 			</li>
 `)
-//line views/nav.qtpl:35
+//line views/nav.qtpl:36
 		} else if navType == entry.path {
-//line views/nav.qtpl:35
+//line views/nav.qtpl:36
 			qw422016.N().S(`			<li class="hypha-tabs__tab hypha-tabs__tab_active">
 				<span class="hypha-tabs__selection">`)
-//line views/nav.qtpl:37
+//line views/nav.qtpl:38
 			qw422016.E().S(entry.title)
-//line views/nav.qtpl:37
+//line views/nav.qtpl:38
 			qw422016.N().S(`</span>
 			</li>
 `)
-//line views/nav.qtpl:39
+//line views/nav.qtpl:40
 		} else if entry.path != "revision" && u.CanProceed(entry.path) {
-//line views/nav.qtpl:39
+//line views/nav.qtpl:40
 			qw422016.N().S(`			<li class="hypha-tabs__tab">
 				<a class="hypha-tabs__link" href="/`)
-//line views/nav.qtpl:41
+//line views/nav.qtpl:42
 			qw422016.E().S(entry.path)
-//line views/nav.qtpl:41
+//line views/nav.qtpl:42
 			qw422016.N().S(`/`)
-//line views/nav.qtpl:41
+//line views/nav.qtpl:42
 			qw422016.E().S(hyphaName)
-//line views/nav.qtpl:41
+//line views/nav.qtpl:42
 			qw422016.N().S(`">`)
-//line views/nav.qtpl:41
+//line views/nav.qtpl:42
 			qw422016.E().S(entry.title)
-//line views/nav.qtpl:41
+//line views/nav.qtpl:42
 			qw422016.N().S(`</a>
 			</li>
 `)
-//line views/nav.qtpl:43
+//line views/nav.qtpl:44
 		}
-//line views/nav.qtpl:44
+//line views/nav.qtpl:45
 	}
-//line views/nav.qtpl:44
+//line views/nav.qtpl:45
 	qw422016.N().S(`		</ul>
 	</nav>
 `)
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 }
 
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 func WriteNavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) {
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 	StreamNavHTML(qw422016, rq, hyphaName, navType, revisionHash...)
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 	qt422016.ReleaseWriter(qw422016)
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 }
 
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 func NavHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string {
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 	WriteNavHTML(qb422016, rq, hyphaName, navType, revisionHash...)
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 	qs422016 := string(qb422016.B)
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 	return qs422016
-//line views/nav.qtpl:47
+//line views/nav.qtpl:48
 }
 
-//line views/nav.qtpl:49
+//line views/nav.qtpl:50
 func StreamUserMenuHTML(qw422016 *qt422016.Writer, u *user.User) {
-//line views/nav.qtpl:49
+//line views/nav.qtpl:50
 	qw422016.N().S(`
 `)
-//line views/nav.qtpl:50
+//line views/nav.qtpl:51
 	if user.AuthUsed {
-//line views/nav.qtpl:50
+//line views/nav.qtpl:51
 		qw422016.N().S(`
-<li class="header-links__entry header-links__entry_user">
-	`)
-//line views/nav.qtpl:52
+	<li class="header-links__entry header-links__entry_user">
+		`)
+//line views/nav.qtpl:53
 		if u.Group == "anon" {
-//line views/nav.qtpl:52
+//line views/nav.qtpl:53
 			qw422016.N().S(`
-	<a href="/login" class="header-links__link">Login</a>
-	`)
-//line views/nav.qtpl:54
+		<a href="/login" class="header-links__link">Login</a>
+		`)
+//line views/nav.qtpl:55
 		} else {
-//line views/nav.qtpl:54
+//line views/nav.qtpl:55
 			qw422016.N().S(`
-	<a href="/hypha/`)
-//line views/nav.qtpl:55
+		<a href="/hypha/`)
+//line views/nav.qtpl:56
 			qw422016.E().S(cfg.UserHypha)
-//line views/nav.qtpl:55
+//line views/nav.qtpl:56
 			qw422016.N().S(`/`)
-//line views/nav.qtpl:55
+//line views/nav.qtpl:56
 			qw422016.E().S(u.Name)
-//line views/nav.qtpl:55
+//line views/nav.qtpl:56
 			qw422016.N().S(`" class="header-links__link">`)
-//line views/nav.qtpl:55
-			qw422016.E().S(u.Name)
-//line views/nav.qtpl:55
+//line views/nav.qtpl:56
+			qw422016.E().S(util.BeautifulName(u.Name))
+//line views/nav.qtpl:56
 			qw422016.N().S(`</a>
-	`)
-//line views/nav.qtpl:56
+		`)
+//line views/nav.qtpl:57
 		}
-//line views/nav.qtpl:56
+//line views/nav.qtpl:57
 		qw422016.N().S(`
-</li>
+	</li>
 `)
-//line views/nav.qtpl:58
+//line views/nav.qtpl:59
 	}
-//line views/nav.qtpl:58
+//line views/nav.qtpl:59
 	qw422016.N().S(`
 `)
-//line views/nav.qtpl:59
+//line views/nav.qtpl:60
+	if user.AuthUsed && cfg.UseRegistration && u.Group == "anon" {
+//line views/nav.qtpl:60
+		qw422016.N().S(`
+	<li class="header-links__entry header-links__entry_register">
+		<a href="/register" class="header-links__link">Register</a>
+	</li>
+`)
+//line views/nav.qtpl:64
+	}
+//line views/nav.qtpl:64
+	qw422016.N().S(`
+`)
+//line views/nav.qtpl:65
 }
 
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 func WriteUserMenuHTML(qq422016 qtio422016.Writer, u *user.User) {
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 	StreamUserMenuHTML(qw422016, u)
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 	qt422016.ReleaseWriter(qw422016)
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 }
 
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 func UserMenuHTML(u *user.User) string {
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 	WriteUserMenuHTML(qb422016, u)
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 	qs422016 := string(qb422016.B)
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 	return qs422016
-//line views/nav.qtpl:59
+//line views/nav.qtpl:65
 }
 
-//line views/nav.qtpl:61
+//line views/nav.qtpl:67
 func StreamRelativeHyphaeHTML(qw422016 *qt422016.Writer, relatives string) {
-//line views/nav.qtpl:61
+//line views/nav.qtpl:67
 	qw422016.N().S(`
 <aside class="relative-hyphae layout-card">
 	<h2 class="relative-hyphae__title layout-card__title">Relative hyphae</h2>
 	`)
-//line views/nav.qtpl:64
+//line views/nav.qtpl:70
 	qw422016.N().S(relatives)
-//line views/nav.qtpl:64
+//line views/nav.qtpl:70
 	qw422016.N().S(`
 </aside>
 `)
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 }
 
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 func WriteRelativeHyphaeHTML(qq422016 qtio422016.Writer, relatives string) {
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 	StreamRelativeHyphaeHTML(qw422016, relatives)
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 	qt422016.ReleaseWriter(qw422016)
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 }
 
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 func RelativeHyphaeHTML(relatives string) string {
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 	WriteRelativeHyphaeHTML(qb422016, relatives)
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 	qs422016 := string(qb422016.B)
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 	return qs422016
-//line views/nav.qtpl:66
+//line views/nav.qtpl:72
 }
 
-//line views/nav.qtpl:68
+//line views/nav.qtpl:74
 func StreamSubhyphaeHTML(qw422016 *qt422016.Writer, subhyphae string) {
-//line views/nav.qtpl:68
+//line views/nav.qtpl:74
 	qw422016.N().S(`
 `)
-//line views/nav.qtpl:69
+//line views/nav.qtpl:75
 	if strings.TrimSpace(subhyphae) != "" {
-//line views/nav.qtpl:69
+//line views/nav.qtpl:75
 		qw422016.N().S(`
 <section class="subhyphae">
 	<h2 class="subhyphae__title">Subhyphae</h2>
 	<nav class="subhyphae__nav">
 		<ul class="subhyphae__list">
 		`)
-//line views/nav.qtpl:74
+//line views/nav.qtpl:80
 		qw422016.N().S(subhyphae)
-//line views/nav.qtpl:74
+//line views/nav.qtpl:80
 		qw422016.N().S(`
 		</ul>
 	</nav>
 </section>
 `)
-//line views/nav.qtpl:78
+//line views/nav.qtpl:84
 	}
-//line views/nav.qtpl:78
+//line views/nav.qtpl:84
 	qw422016.N().S(`
 `)
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 }
 
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 func WriteSubhyphaeHTML(qq422016 qtio422016.Writer, subhyphae string) {
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 	StreamSubhyphaeHTML(qw422016, subhyphae)
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 	qt422016.ReleaseWriter(qw422016)
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 }
 
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 func SubhyphaeHTML(subhyphae string) string {
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 	WriteSubhyphaeHTML(qb422016, subhyphae)
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 	qs422016 := string(qb422016.B)
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 	return qs422016
-//line views/nav.qtpl:79
+//line views/nav.qtpl:85
 }