From 23337a61d7e12b7e17491792e0e60b2a96c9014f Mon Sep 17 00:00:00 2001 From: CloudKeeper <46334817+CloudKeeper@users.noreply.github.com> Date: Sat, 9 Feb 2019 14:19:50 +1100 Subject: [PATCH 1/2] Correcting typo - "prot" to "proto" Caught by LilCasper --- evennia/commands/default/building.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py index 35a651f536..53b710d97c 100644 --- a/evennia/commands/default/building.py +++ b/evennia/commands/default/building.py @@ -3086,7 +3086,7 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS): return elif nprots > 1: caller.msg("Found {} prototypes matching '{}':\n {}".format( - nprots, prototype, ", ".join(prot.get('prototype_key', '') + nprots, prototype, ", ".join(proto.get('prototype_key', '') for proto in prototypes))) return # we have a prototype, check access From 48526517802a860f94d9d4ccd1036b1a65b06a36 Mon Sep 17 00:00:00 2001 From: poisonbl Date: Mon, 11 Feb 2019 21:27:12 -0500 Subject: [PATCH 2/2] Fix issue 1780 by switching card-block to card-body. --- evennia/web/website/templates/website/404.html | 2 +- evennia/web/website/templates/website/500.html | 2 +- evennia/web/website/templates/website/evennia_admin.html | 2 +- evennia/web/website/templates/website/flatpages/default.html | 2 +- evennia/web/website/templates/website/tbi.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/evennia/web/website/templates/website/404.html b/evennia/web/website/templates/website/404.html index f98e6522a1..5c10522423 100644 --- a/evennia/web/website/templates/website/404.html +++ b/evennia/web/website/templates/website/404.html @@ -10,7 +10,7 @@
-
+

Error 404

Page not found


diff --git a/evennia/web/website/templates/website/500.html b/evennia/web/website/templates/website/500.html index f40ed64725..0011dc0030 100644 --- a/evennia/web/website/templates/website/500.html +++ b/evennia/web/website/templates/website/500.html @@ -10,7 +10,7 @@
-
+

Error 500

Internal Server Error


diff --git a/evennia/web/website/templates/website/evennia_admin.html b/evennia/web/website/templates/website/evennia_admin.html index 8e88d9cc50..d490bf9155 100644 --- a/evennia/web/website/templates/website/evennia_admin.html +++ b/evennia/web/website/templates/website/evennia_admin.html @@ -6,7 +6,7 @@
-
+

Admin

Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game. diff --git a/evennia/web/website/templates/website/flatpages/default.html b/evennia/web/website/templates/website/flatpages/default.html index 5184c22deb..c15a7011ec 100644 --- a/evennia/web/website/templates/website/flatpages/default.html +++ b/evennia/web/website/templates/website/flatpages/default.html @@ -7,7 +7,7 @@

-
+

{{flatpage.title}}

{{flatpage.content}}
diff --git a/evennia/web/website/templates/website/tbi.html b/evennia/web/website/templates/website/tbi.html index b303a270c8..3b5bf9765a 100644 --- a/evennia/web/website/templates/website/tbi.html +++ b/evennia/web/website/templates/website/tbi.html @@ -12,7 +12,7 @@

To Be Implemented...

-
+
This feature has yet to be implemented, but rest assured that it will be!