From 04fdd2ae8e41bc8eacb0d02c25e662921828ea86 Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Sun, 11 Dec 2022 20:23:20 -0800 Subject: [PATCH 1/2] Move user-mini display to subtemplate --- src/main/controllers.zig | 1 + .../web/_components/mini-user.tmpl.html | 13 +++++++++++++ src/main/controllers/web/signup.tmpl.html | 14 +------------- 3 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 src/main/controllers/web/_components/mini-user.tmpl.html diff --git a/src/main/controllers.zig b/src/main/controllers.zig index adc48c2..b34a95f 100644 --- a/src/main/controllers.zig +++ b/src/main/controllers.zig @@ -231,6 +231,7 @@ pub const Response = struct { writer, .{ ._page = templ, + .@"mini-user" = @embedFile("./controllers/web/_components/mini-user.tmpl.html"), }, @embedFile("./controllers/web/_format.tmpl.html"), data, diff --git a/src/main/controllers/web/_components/mini-user.tmpl.html b/src/main/controllers/web/_components/mini-user.tmpl.html new file mode 100644 index 0000000..b54d6a6 --- /dev/null +++ b/src/main/controllers/web/_components/mini-user.tmpl.html @@ -0,0 +1,13 @@ +
+ +
+
+ {=#if .display_name |$name|=} + {$name} + {= #else =} + {.username} + {= /if =} +
+
@{.username}@{.host}
+
+
diff --git a/src/main/controllers/web/signup.tmpl.html b/src/main/controllers/web/signup.tmpl.html index e8f1f7a..9df51e5 100644 --- a/src/main/controllers/web/signup.tmpl.html +++ b/src/main/controllers/web/signup.tmpl.html @@ -9,19 +9,7 @@ {#if .invite |$invite| =}
You are about to accept an invite from:
-
- -
-
- {=#if $invite.creator.display_name |$name|=} - {$name} - {= #else =} - {$invite.creator.username} - {= /if =} -
-
@{$invite.creator.username}@{$invite.creator.host}
-
-
+ {#template mini-user $invite.creator} {#if @isTag($invite.kind, community_owner) =}
This act will make your new account the owner of { %community.name }.
{/if =} From 6d18209d2923d2c8d8a5fb0b4d44e8ab790b79b1 Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Sun, 11 Dec 2022 20:36:22 -0800 Subject: [PATCH 2/2] Use multipart/form-data for forms --- src/main/controllers/web/about.tmpl.html | 2 +- src/main/controllers/web/cluster/community-create.tmpl.html | 2 +- src/main/controllers/web/signup.tmpl.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/controllers/web/about.tmpl.html b/src/main/controllers/web/about.tmpl.html index 7891621..f4c8b24 100644 --- a/src/main/controllers/web/about.tmpl.html +++ b/src/main/controllers/web/about.tmpl.html @@ -1,7 +1,7 @@

{ %community.name }

-
+

Login