Commit 2a2d0f7c authored by Klaus Franken's avatar Klaus Franken
Browse files

Merge branch 'master' into 'prod'

Sync Lennart letzte Änderungen

See merge request !10
parents 986d97fe 1de433cb
Pipeline #260 passed with stage
in 10 minutes and 9 seconds
......@@ -38,6 +38,9 @@
body:
add: False
status_code: 200
- hosts: localhost
tasks:
- name: Message devel server
uri:
url: http://localhost:8081/api/globalmessages
......@@ -45,6 +48,6 @@
body_format: json
body:
add: True
message: "This is a devel server. Productive server is at https://webvokabeln.de"
message: "This is a devel server. Productive server is at <a href='https://webvokabeln.de' style='margin-left: 6px'> https://webvokabeln.de</a>"
status_code: 200
when: is_devel
restart_sleep: 30
git_version: master
\ No newline at end of file
git_version: master
is_devel: yes
\ No newline at end of file
restart_sleep: 600
git_version: prod
\ No newline at end of file
git_version: prod
is_devel: no
\ No newline at end of file
......@@ -30,7 +30,7 @@ def render_showuser(self):
def render_log(self):
for logentry in self.user.database.logs[::-1]:
self.addtohtml("""<div class="logentry">[%s] %s at %s:<br>%s</div>""" % (logentry["type"], str(logentry["user"]["name"])+" / "+str(logentry["user"]["id"]), datetime.datetime.fromtimestamp(logentry["time"]), logentry["message"]))
self.addtohtml("""<div class="logentry">[%s] %s at %s:<br>%s</div>""" % (logentry["type"], str(logentry["user"]["name"])+" / "+str(logentry["user"]["id"]), datetime.datetime.fromtimestamp(logentry["time"]), tohtml(logentry["message"])))
def render_globalmessage(self):
self.addtohtml(button("globalmessage_set"), button("globalmessage_remove"))
def render_donators(self):
......
......@@ -58,7 +58,7 @@ def static(path):
raise StaticNoPermission()
def addglobalmessage(message):
generalplacements["globalwarnings"] += """<center><p class="warning">%s</p></center>""" % tohtml(message)
generalplacements["globalwarnings"] += """<center><p class="warning">%s</p></center>""" % message
def generate_setting(setting, usersettings):
if setting[1]["type"]=="select":
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment