Merge branch 'master' into develop

evennia/accounts/accounts.py

@@ -566,7 +566,8 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
         """
         # A basic security setup
         lockstring = "examine:perm(Admin);edit:perm(Admin);" \
-                     "delete:perm(Admin);boot:perm(Admin);msg:all()"
+                     "delete:perm(Admin);boot:perm(Admin);msg:all();" \
+                     "noidletimeout:perm(Builder) or perm(noidletimeout)"
         self.locks.add(lockstring)
 
         # The ooc account cmdset
@@ -582,8 +583,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
         """
         # set an (empty) attribute holding the characters this account has
         lockstring = "attrread:perm(Admins);attredit:perm(Admins);" \
-                     "attrcreate:perm(Admins);" \
-                     "noidletimeout:perm(Builder) or perm(noidletimeout)"
+                     "attrcreate:perm(Admins);"
         self.attributes.add("_playable_characters", [], lockstring=lockstring)
         self.attributes.add("_saved_protocol_flags", {}, lockstring=lockstring)
 

evennia/commands/default/admin.py

@@ -525,13 +525,13 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
                     return
 
                 if perm in permissions:
-                    caller_result.append("\nPermission '%s' is already defined on %s." % (rhs, obj.name))
+                    caller_result.append("\nPermission '%s' is already defined on %s." % (perm, obj.name))
                 else:
                     obj.permissions.add(perm)
                     plystring = "the Account" if accountmode else "the Object/Character"
-                    caller_result.append("\nPermission '%s' given to %s (%s)." % (rhs, obj.name, plystring))
+                    caller_result.append("\nPermission '%s' given to %s (%s)." % (perm, obj.name, plystring))
                     target_result.append("\n%s gives you (%s, %s) the permission '%s'."
-                                         % (caller.name, obj.name, plystring, rhs))
+                                         % (caller.name, obj.name, plystring, perm))
         caller.msg("".join(caller_result).strip())
         if target_result:
             obj.msg("".join(target_result).strip())

evennia/contrib/rpsystem.py

@@ -858,7 +858,7 @@ class CmdSay(RPCommand):  # replaces standard say
             return
 
         # calling the speech hook on the location
-        speech = caller.location.at_before_say(caller, self.args)
+        speech = caller.location.at_before_say(self.args)
         # preparing the speech with sdesc/speech parsing.
         speech = "/me says, \"{speech}\"".format(speech=speech)
         targets = self.caller.location.contents

evennia/web/website/templates/website/registration/logged_out.html

@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col">
     <div class="card">
-      <div class="card-block">
+      <div class="card-body">
         <h1 class="card-title">Logged Out</h1>
         <p>You have been logged out.</p>
         <p>Redirecting in 2 seconds...</p>

evennia/web/website/templates/website/registration/login.html

@@ -11,7 +11,7 @@ Login
 <div class="row">
   <div class="col">
     <div class="card">
-      <div class="card-block">
+      <div class="card-body">
         <h1 class="card-title">Login</h1>
         <hr />
         {% if user.is_authenticated %}