Master

code/app/webserver.py

@@ -153,7 +153,16 @@ def app_urls(fullurl):
                     if "allowPOST" in content and content["allowPOST"]:
                         content["content"] = addPOSTForm(content["content"], content["POSTto"] if "POSTto" in content else url, postid = None, allowFileUpload=content["allowFileUpload"] if "allowFileUpload" in content else False)
                     if content["type"] == "packed":
-                        return(render.final_render(database=data, user=user, lang=lang, title="{translation:%s/title}" % appid, content=content["content"], css=content["css"] if "css" in content else [], loadscripts=content["loadscripts"] if "loadscripts" in content else [], scripts=content["scripts"] if "scripts" in content else [], usermessages=content["usermessages"] if "usermessages" in content else []))
+                        if content.get("title"):
+                            if type(content["title"]) == str:
+                                title, addApp = content["title"], True
+                            else:
+                                title, addApp = content["title"]["str"], content["title"]["addApp"]
+                            if addApp:
+                                title += " - {translation:%s/title}" % appid
+                        else:
+                            title = "{translation:%s/title}" % appid
+                        return(render.final_render(database=data, user=user, lang=lang, title=title, content=content["content"], css=content["css"] if "css" in content else [], loadscripts=content["loadscripts"] if "loadscripts" in content else [], scripts=content["scripts"] if "scripts" in content else [], usermessages=content["usermessages"] if "usermessages" in content else []))
                     else:
                         if content.get("translate"):
                             return(translations.translate(content["content"], lang))