Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made settings listing from launcher alphabetical. Fixed bug in mxp-to-html for the webclient.

Browse source
This commit is contained in:
Griatch 2015-03-07 16:04:08 +01:00
parent 19b1ef8fc9
commit fe48757928
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/server/evennia_launcher.py
View file

@ -758,9 +758,9 @@ def list_settings(keys):
# show a list of all keys # show a list of all keys
# a specific key # a specific key
table = evtable.EvTable() table = evtable.EvTable()
confs = dict((key,var) for key, var in evsettings.__dict__.items() if key.isupper()) confs = [key for key in sorted(evsettings.__dict__) if key.isupper()]
for i in range(0, len(confs), 4): for i in range(0, len(confs), 4):
table.add_row(*confs.keys()[i:i+4]) table.add_row(*confs[i:i+4])
else: else:
# a specific key # a specific key
table = evtable.EvTable(width=131) table = evtable.EvTable(width=131)

5
evennia/utils/text2html.py
View file

@ -124,8 +124,9 @@ class TextToHTMLparser(object):
""" """
Replaces links with HTML code Replaces links with HTML code
""" """
html = "<a href='#' onclick='websocket.send(\"\\1\"); return false;'>\\2</a>" html = "<a href='#' onclick='websocket.send(\"CMD\\1\"); return false;'>\\2</a>"
return self.re_link.sub(html, text) repl = self.re_link.sub(html, text)
return repl
def do_sub(self, m): def do_sub(self, m):
"Helper method to be passed to re.sub." "Helper method to be passed to re.sub."