Delete package views

All the remaining QTPL files were spread across the codebase. The plan is to get rid of them step by step and migrate to the new l10n approach, all based on Go std templates.
2026-10-09 19:01:41 +00:00 · 2022-08-06 16:35:17 +05:00
parent 4a9cbfd1eb
commit b1cdb1e279
22 changed files with 1094 additions and 1087 deletions
@@ -15,7 +15,6 @@ import (
 	"github.com/bouncepaw/mycorrhiza/l18n"
 	"github.com/bouncepaw/mycorrhiza/user"
 	"github.com/bouncepaw/mycorrhiza/util"
-	"github.com/bouncepaw/mycorrhiza/views"
 )

 // handlerAdmin provides the admin panel.
@@ -89,8 +88,8 @@ func handlerAdminUserEdit(w http.ResponseWriter, rq *http.Request) {
 	f.Put("group", u.Group)

 	var lc = l18n.FromRequest(rq)
-	html := views.AdminUserEdit(u, f, lc)
-	html = views.Base(viewutil.MetaFrom(w, rq), fmt.Sprintf(lc.Get("admin.user_title"), u.Name), html)
+	html := AdminUserEdit(u, f, lc)
+	html = viewutil.Base(viewutil.MetaFrom(w, rq), fmt.Sprintf(lc.Get("admin.user_title"), u.Name), html)

 	if f.HasError() {
 		w.WriteHeader(http.StatusBadRequest)
@@ -119,8 +118,8 @@ func handlerAdminUserDelete(w http.ResponseWriter, rq *http.Request) {
 	}

 	var lc = l18n.FromRequest(rq)
-	html := views.AdminUserDelete(u, util.NewFormData(), lc)
-	html = views.Base(viewutil.MetaFrom(w, rq), fmt.Sprintf(lc.Get("admin.user_title"), u.Name), html)
+	html := AdminUserDelete(u, util.NewFormData(), lc)
+	html = viewutil.Base(viewutil.MetaFrom(w, rq), fmt.Sprintf(lc.Get("admin.user_title"), u.Name), html)

 	if f.HasError() {
 		w.WriteHeader(http.StatusBadRequest)
@@ -133,8 +132,8 @@ func handlerAdminUserNew(w http.ResponseWriter, rq *http.Request) {
 	var lc = l18n.FromRequest(rq)
 	if rq.Method == http.MethodGet {
 		// New user form
-		html := views.AdminUserNew(util.NewFormData(), lc)
-		html = views.Base(viewutil.MetaFrom(w, rq), lc.Get("admin.newuser_title"), html)
+		html := AdminUserNew(util.NewFormData(), lc)
+		html = viewutil.Base(viewutil.MetaFrom(w, rq), lc.Get("admin.newuser_title"), html)

 		w.Header().Set("Content-Type", mime.TypeByExtension(".html"))
 		io.WriteString(w, html)
@@ -145,8 +144,8 @@ func handlerAdminUserNew(w http.ResponseWriter, rq *http.Request) {
 		err := user.Register(f.Get("name"), f.Get("password"), f.Get("group"), "local", true)

 		if err != nil {
-			html := views.AdminUserNew(f.WithError(err), lc)
-			html = views.Base(viewutil.MetaFrom(w, rq), lc.Get("admin.newuser_title"), html)
+			html := AdminUserNew(f.WithError(err), lc)
+			html = viewutil.Base(viewutil.MetaFrom(w, rq), lc.Get("admin.newuser_title"), html)

 			w.WriteHeader(http.StatusBadRequest)
 			w.Header().Set("Content-Type", mime.TypeByExtension(".html"))
@@ -0,0 +1,105 @@
+{% import "fmt" %}
+{% import "github.com/bouncepaw/mycorrhiza/l18n" %}
+{% import "github.com/bouncepaw/mycorrhiza/user" %}
+{% import "github.com/bouncepaw/mycorrhiza/util" %}
+
+{% func AdminUserNew(f util.FormData, lc *l18n.Localizer) %}
+<main class="main-width form-wrap">
+	<h1>{%s lc.Get("admin.newuser_title") %}</h1>
+
+	{% if f.HasError() %}
+	<div class="notice notice--error">
+		<strong>{%s lc.Get("ui.error") %}:</strong>
+		{%s f.Error() %}
+	</div>
+	{% endif %}
+
+	<form class="form--double" action="" method="post">
+		<div class="form-field">
+			<label for="name">{%s lc.Get("admin.users_name") %}:</label>
+			<input type="text" name="name" id="name" value="{%s f.Get("name") %}" autofocus>
+		</div>
+
+		<div class="form-field">
+			<label for="password">{%s lc.Get("admin.users_password") %}:</label>
+			<input type="password" name="password" id="password" value="{%s f.Get("password") %}">
+		</div>
+
+		<div class="form-field">
+			<label for="group">{%s lc.Get("admin.users_group") %}:</label>
+			<select id="group" name="group">
+				<option{% if f.Get("group") == "anon" %} selected{% endif %}>anon</option>
+				<option{% if f.Get("group") == "editor" %} selected{% endif %}>editor</option>
+				<option{% if f.Get("group") == "trusted" %} selected{% endif %}>trusted</option>
+				<option{% if f.Get("group") == "moderator" %} selected{% endif %}>moderator</option>
+				<option{% if f.Get("group") == "admin" %} selected{% endif %}>admin</option>
+			</select>
+		</div>
+
+		<div class="form-field">
+			<div class="form-field__input">
+				<button class="btn" type="submit">{%s lc.Get("admin.newuser_create") %}</button>
+				<a class="btn btn_weak" href="/admin/users/">{%s lc.Get("ui.cancel") %}</a>
+			</div>
+		</div>
+	</form>
+</main>
+{% endfunc %}
+
+{% func AdminUserEdit(u *user.User, f util.FormData, lc *l18n.Localizer) %}
+<main class="main-width form-wrap">
+	<h1>
+		<a href="/admin/users/">&larr;</a>
+		{%s u.Name %}
+	</h1>
+
+	<h2>{%s lc.Get("admin.user_group_heading") %}</h2>
+
+	{% if f.HasError() %}
+	<div class="notice notice--error">
+		<strong>{%s lc.Get("ui.error") %}:</strong>
+		{%s f.Error() %}
+	</div>
+	{% endif %}
+
+	<form action="" method="post">
+		<div class="form-field">
+			<select id="group" name="group" aria-label="{%s lc.Get("admin.users_group") %}">
+				<option{% if f.Get("group") == "anon" %} selected{% endif %}>anon</option>
+				<option{% if f.Get("group") == "editor" %} selected{% endif %}>editor</option>
+				<option{% if f.Get("group") == "trusted" %} selected{% endif %}>trusted</option>
+				<option{% if f.Get("group") == "moderator" %} selected{% endif %}>moderator</option>
+				<option{% if f.Get("group") == "admin" %} selected{% endif %}>admin</option>
+			</select>
+		</div>
+
+		<div class="form-field">
+			<button class="btn" type="submit">{%s lc.Get("admin.user_update") %}</button>
+		</div>
+	</form>
+
+	<h2>{%s lc.Get("admin.user_delete_heading") %}</h2>
+	<p>{%s lc.Get("admin.user_delete_tip") %}</p>
+	<a class="btn btn_destructive" href="/admin/users/{%u u.Name %}/delete">{%s lc.Get("admin.user_delete") %}</a>
+</main>
+{% endfunc %}
+
+{% func AdminUserDelete(u *user.User, f util.FormData, lc *l18n.Localizer) %}
+<main class="main-width form-wrap">
+	<h1>{%s lc.Get("admin.user_delete_heading") %}</h1>
+
+	{% if f.HasError() %}
+	<div class="notice notice--error">
+		<strong>{%s lc.Get("ui.error") %}:</strong>
+		{%s f.Error() %}
+	</div>
+	{% endif %}
+
+	<p>{%s= lc.Get("admin.user_delete_warn", &l18n.Replacements{"name": fmt.Sprintf("<strong>%s</strong>", u.Name)}) %}</p>
+
+	<form action="" method="post">
+		<button class="btn btn_destructive" type="submit">{%s lc.Get("admin.user_delete") %}</button>
+		<a class="btn btn_weak" href="/admin/users/{%u u.Name %}/edit">{%s lc.Get("ui.cancel") %}</a>
+	</form>
+</main>
+{% endfunc %}
@@ -0,0 +1,436 @@
+// Code generated by qtc from "admin.qtpl". DO NOT EDIT.
+// See https://github.com/valyala/quicktemplate for details.
+
+//line admin/admin.qtpl:1
+package admin
+
+//line admin/admin.qtpl:1
+import "fmt"
+
+//line admin/admin.qtpl:2
+import "github.com/bouncepaw/mycorrhiza/l18n"
+
+//line admin/admin.qtpl:3
+import "github.com/bouncepaw/mycorrhiza/user"
+
+//line admin/admin.qtpl:4
+import "github.com/bouncepaw/mycorrhiza/util"
+
+//line admin/admin.qtpl:6
+import (
+	qtio422016 "io"
+
+	qt422016 "github.com/valyala/quicktemplate"
+)
+
+//line admin/admin.qtpl:6
+var (
+	_ = qtio422016.Copy
+	_ = qt422016.AcquireByteBuffer
+)
+
+//line admin/admin.qtpl:6
+func StreamAdminUserNew(qw422016 *qt422016.Writer, f util.FormData, lc *l18n.Localizer) {
+//line admin/admin.qtpl:6
+	qw422016.N().S(`
+<main class="main-width form-wrap">
+	<h1>`)
+//line admin/admin.qtpl:8
+	qw422016.E().S(lc.Get("admin.newuser_title"))
+//line admin/admin.qtpl:8
+	qw422016.N().S(`</h1>
+
+	`)
+//line admin/admin.qtpl:10
+	if f.HasError() {
+//line admin/admin.qtpl:10
+		qw422016.N().S(`
+	<div class="notice notice--error">
+		<strong>`)
+//line admin/admin.qtpl:12
+		qw422016.E().S(lc.Get("ui.error"))
+//line admin/admin.qtpl:12
+		qw422016.N().S(`:</strong>
+		`)
+//line admin/admin.qtpl:13
+		qw422016.E().S(f.Error())
+//line admin/admin.qtpl:13
+		qw422016.N().S(`
+	</div>
+	`)
+//line admin/admin.qtpl:15
+	}
+//line admin/admin.qtpl:15
+	qw422016.N().S(`
+
+	<form class="form--double" action="" method="post">
+		<div class="form-field">
+			<label for="name">`)
+//line admin/admin.qtpl:19
+	qw422016.E().S(lc.Get("admin.users_name"))
+//line admin/admin.qtpl:19
+	qw422016.N().S(`:</label>
+			<input type="text" name="name" id="name" value="`)
+//line admin/admin.qtpl:20
+	qw422016.E().S(f.Get("name"))
+//line admin/admin.qtpl:20
+	qw422016.N().S(`" autofocus>
+		</div>
+
+		<div class="form-field">
+			<label for="password">`)
+//line admin/admin.qtpl:24
+	qw422016.E().S(lc.Get("admin.users_password"))
+//line admin/admin.qtpl:24
+	qw422016.N().S(`:</label>
+			<input type="password" name="password" id="password" value="`)
+//line admin/admin.qtpl:25
+	qw422016.E().S(f.Get("password"))
+//line admin/admin.qtpl:25
+	qw422016.N().S(`">
+		</div>
+
+		<div class="form-field">
+			<label for="group">`)
+//line admin/admin.qtpl:29
+	qw422016.E().S(lc.Get("admin.users_group"))
+//line admin/admin.qtpl:29
+	qw422016.N().S(`:</label>
+			<select id="group" name="group">
+				<option`)
+//line admin/admin.qtpl:31
+	if f.Get("group") == "anon" {
+//line admin/admin.qtpl:31
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:31
+	}
+//line admin/admin.qtpl:31
+	qw422016.N().S(`>anon</option>
+				<option`)
+//line admin/admin.qtpl:32
+	if f.Get("group") == "editor" {
+//line admin/admin.qtpl:32
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:32
+	}
+//line admin/admin.qtpl:32
+	qw422016.N().S(`>editor</option>
+				<option`)
+//line admin/admin.qtpl:33
+	if f.Get("group") == "trusted" {
+//line admin/admin.qtpl:33
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:33
+	}
+//line admin/admin.qtpl:33
+	qw422016.N().S(`>trusted</option>
+				<option`)
+//line admin/admin.qtpl:34
+	if f.Get("group") == "moderator" {
+//line admin/admin.qtpl:34
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:34
+	}
+//line admin/admin.qtpl:34
+	qw422016.N().S(`>moderator</option>
+				<option`)
+//line admin/admin.qtpl:35
+	if f.Get("group") == "admin" {
+//line admin/admin.qtpl:35
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:35
+	}
+//line admin/admin.qtpl:35
+	qw422016.N().S(`>admin</option>
+			</select>
+		</div>
+
+		<div class="form-field">
+			<div class="form-field__input">
+				<button class="btn" type="submit">`)
+//line admin/admin.qtpl:41
+	qw422016.E().S(lc.Get("admin.newuser_create"))
+//line admin/admin.qtpl:41
+	qw422016.N().S(`</button>
+				<a class="btn btn_weak" href="/admin/users/">`)
+//line admin/admin.qtpl:42
+	qw422016.E().S(lc.Get("ui.cancel"))
+//line admin/admin.qtpl:42
+	qw422016.N().S(`</a>
+			</div>
+		</div>
+	</form>
+</main>
+`)
+//line admin/admin.qtpl:47
+}
+
+//line admin/admin.qtpl:47
+func WriteAdminUserNew(qq422016 qtio422016.Writer, f util.FormData, lc *l18n.Localizer) {
+//line admin/admin.qtpl:47
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line admin/admin.qtpl:47
+	StreamAdminUserNew(qw422016, f, lc)
+//line admin/admin.qtpl:47
+	qt422016.ReleaseWriter(qw422016)
+//line admin/admin.qtpl:47
+}
+
+//line admin/admin.qtpl:47
+func AdminUserNew(f util.FormData, lc *l18n.Localizer) string {
+//line admin/admin.qtpl:47
+	qb422016 := qt422016.AcquireByteBuffer()
+//line admin/admin.qtpl:47
+	WriteAdminUserNew(qb422016, f, lc)
+//line admin/admin.qtpl:47
+	qs422016 := string(qb422016.B)
+//line admin/admin.qtpl:47
+	qt422016.ReleaseByteBuffer(qb422016)
+//line admin/admin.qtpl:47
+	return qs422016
+//line admin/admin.qtpl:47
+}
+
+//line admin/admin.qtpl:49
+func StreamAdminUserEdit(qw422016 *qt422016.Writer, u *user.User, f util.FormData, lc *l18n.Localizer) {
+//line admin/admin.qtpl:49
+	qw422016.N().S(`
+<main class="main-width form-wrap">
+	<h1>
+		<a href="/admin/users/">&larr;</a>
+		`)
+//line admin/admin.qtpl:53
+	qw422016.E().S(u.Name)
+//line admin/admin.qtpl:53
+	qw422016.N().S(`
+	</h1>
+
+	<h2>`)
+//line admin/admin.qtpl:56
+	qw422016.E().S(lc.Get("admin.user_group_heading"))
+//line admin/admin.qtpl:56
+	qw422016.N().S(`</h2>
+
+	`)
+//line admin/admin.qtpl:58
+	if f.HasError() {
+//line admin/admin.qtpl:58
+		qw422016.N().S(`
+	<div class="notice notice--error">
+		<strong>`)
+//line admin/admin.qtpl:60
+		qw422016.E().S(lc.Get("ui.error"))
+//line admin/admin.qtpl:60
+		qw422016.N().S(`:</strong>
+		`)
+//line admin/admin.qtpl:61
+		qw422016.E().S(f.Error())
+//line admin/admin.qtpl:61
+		qw422016.N().S(`
+	</div>
+	`)
+//line admin/admin.qtpl:63
+	}
+//line admin/admin.qtpl:63
+	qw422016.N().S(`
+
+	<form action="" method="post">
+		<div class="form-field">
+			<select id="group" name="group" aria-label="`)
+//line admin/admin.qtpl:67
+	qw422016.E().S(lc.Get("admin.users_group"))
+//line admin/admin.qtpl:67
+	qw422016.N().S(`">
+				<option`)
+//line admin/admin.qtpl:68
+	if f.Get("group") == "anon" {
+//line admin/admin.qtpl:68
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:68
+	}
+//line admin/admin.qtpl:68
+	qw422016.N().S(`>anon</option>
+				<option`)
+//line admin/admin.qtpl:69
+	if f.Get("group") == "editor" {
+//line admin/admin.qtpl:69
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:69
+	}
+//line admin/admin.qtpl:69
+	qw422016.N().S(`>editor</option>
+				<option`)
+//line admin/admin.qtpl:70
+	if f.Get("group") == "trusted" {
+//line admin/admin.qtpl:70
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:70
+	}
+//line admin/admin.qtpl:70
+	qw422016.N().S(`>trusted</option>
+				<option`)
+//line admin/admin.qtpl:71
+	if f.Get("group") == "moderator" {
+//line admin/admin.qtpl:71
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:71
+	}
+//line admin/admin.qtpl:71
+	qw422016.N().S(`>moderator</option>
+				<option`)
+//line admin/admin.qtpl:72
+	if f.Get("group") == "admin" {
+//line admin/admin.qtpl:72
+		qw422016.N().S(` selected`)
+//line admin/admin.qtpl:72
+	}
+//line admin/admin.qtpl:72
+	qw422016.N().S(`>admin</option>
+			</select>
+		</div>
+
+		<div class="form-field">
+			<button class="btn" type="submit">`)
+//line admin/admin.qtpl:77
+	qw422016.E().S(lc.Get("admin.user_update"))
+//line admin/admin.qtpl:77
+	qw422016.N().S(`</button>
+		</div>
+	</form>
+
+	<h2>`)
+//line admin/admin.qtpl:81
+	qw422016.E().S(lc.Get("admin.user_delete_heading"))
+//line admin/admin.qtpl:81
+	qw422016.N().S(`</h2>
+	<p>`)
+//line admin/admin.qtpl:82
+	qw422016.E().S(lc.Get("admin.user_delete_tip"))
+//line admin/admin.qtpl:82
+	qw422016.N().S(`</p>
+	<a class="btn btn_destructive" href="/admin/users/`)
+//line admin/admin.qtpl:83
+	qw422016.N().U(u.Name)
+//line admin/admin.qtpl:83
+	qw422016.N().S(`/delete">`)
+//line admin/admin.qtpl:83
+	qw422016.E().S(lc.Get("admin.user_delete"))
+//line admin/admin.qtpl:83
+	qw422016.N().S(`</a>
+</main>
+`)
+//line admin/admin.qtpl:85
+}
+
+//line admin/admin.qtpl:85
+func WriteAdminUserEdit(qq422016 qtio422016.Writer, u *user.User, f util.FormData, lc *l18n.Localizer) {
+//line admin/admin.qtpl:85
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line admin/admin.qtpl:85
+	StreamAdminUserEdit(qw422016, u, f, lc)
+//line admin/admin.qtpl:85
+	qt422016.ReleaseWriter(qw422016)
+//line admin/admin.qtpl:85
+}
+
+//line admin/admin.qtpl:85
+func AdminUserEdit(u *user.User, f util.FormData, lc *l18n.Localizer) string {
+//line admin/admin.qtpl:85
+	qb422016 := qt422016.AcquireByteBuffer()
+//line admin/admin.qtpl:85
+	WriteAdminUserEdit(qb422016, u, f, lc)
+//line admin/admin.qtpl:85
+	qs422016 := string(qb422016.B)
+//line admin/admin.qtpl:85
+	qt422016.ReleaseByteBuffer(qb422016)
+//line admin/admin.qtpl:85
+	return qs422016
+//line admin/admin.qtpl:85
+}
+
+//line admin/admin.qtpl:87
+func StreamAdminUserDelete(qw422016 *qt422016.Writer, u *user.User, f util.FormData, lc *l18n.Localizer) {
+//line admin/admin.qtpl:87
+	qw422016.N().S(`
+<main class="main-width form-wrap">
+	<h1>`)
+//line admin/admin.qtpl:89
+	qw422016.E().S(lc.Get("admin.user_delete_heading"))
+//line admin/admin.qtpl:89
+	qw422016.N().S(`</h1>
+
+	`)
+//line admin/admin.qtpl:91
+	if f.HasError() {
+//line admin/admin.qtpl:91
+		qw422016.N().S(`
+	<div class="notice notice--error">
+		<strong>`)
+//line admin/admin.qtpl:93
+		qw422016.E().S(lc.Get("ui.error"))
+//line admin/admin.qtpl:93
+		qw422016.N().S(`:</strong>
+		`)
+//line admin/admin.qtpl:94
+		qw422016.E().S(f.Error())
+//line admin/admin.qtpl:94
+		qw422016.N().S(`
+	</div>
+	`)
+//line admin/admin.qtpl:96
+	}
+//line admin/admin.qtpl:96
+	qw422016.N().S(`
+
+	<p>`)
+//line admin/admin.qtpl:98
+	qw422016.N().S(lc.Get("admin.user_delete_warn", &l18n.Replacements{"name": fmt.Sprintf("<strong>%s</strong>", u.Name)}))
+//line admin/admin.qtpl:98
+	qw422016.N().S(`</p>
+
+	<form action="" method="post">
+		<button class="btn btn_destructive" type="submit">`)
+//line admin/admin.qtpl:101
+	qw422016.E().S(lc.Get("admin.user_delete"))
+//line admin/admin.qtpl:101
+	qw422016.N().S(`</button>
+		<a class="btn btn_weak" href="/admin/users/`)
+//line admin/admin.qtpl:102
+	qw422016.N().U(u.Name)
+//line admin/admin.qtpl:102
+	qw422016.N().S(`/edit">`)
+//line admin/admin.qtpl:102
+	qw422016.E().S(lc.Get("ui.cancel"))
+//line admin/admin.qtpl:102
+	qw422016.N().S(`</a>
+	</form>
+</main>
+`)
+//line admin/admin.qtpl:105
+}
+
+//line admin/admin.qtpl:105
+func WriteAdminUserDelete(qq422016 qtio422016.Writer, u *user.User, f util.FormData, lc *l18n.Localizer) {
+//line admin/admin.qtpl:105
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line admin/admin.qtpl:105
+	StreamAdminUserDelete(qw422016, u, f, lc)
+//line admin/admin.qtpl:105
+	qt422016.ReleaseWriter(qw422016)
+//line admin/admin.qtpl:105
+}
+
+//line admin/admin.qtpl:105
+func AdminUserDelete(u *user.User, f util.FormData, lc *l18n.Localizer) string {
+//line admin/admin.qtpl:105
+	qb422016 := qt422016.AcquireByteBuffer()
+//line admin/admin.qtpl:105
+	WriteAdminUserDelete(qb422016, u, f, lc)
+//line admin/admin.qtpl:105
+	qs422016 := string(qb422016.B)
+//line admin/admin.qtpl:105
+	qt422016.ReleaseByteBuffer(qb422016)
+//line admin/admin.qtpl:105
+	return qs422016
+//line admin/admin.qtpl:105
+}