diff --git a/src/blenderbim/blenderbim/bim/data/webui/sioserver.py b/src/blenderbim/blenderbim/bim/data/webui/sioserver.py index 5521a8c182..e195635952 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/sioserver.py +++ b/src/blenderbim/blenderbim/bim/data/webui/sioserver.py @@ -2,7 +2,9 @@ import sys import os import webbrowser -blenderbim_lib_path = os.environ.get("blenderbim_lib_path") +blenderbim_lib_path = os.environ.get("BLENDERBIM_LIB_PATH") +blender_version = os.environ.get("BLENDER_VERSION") + if blenderbim_lib_path: sys.path.insert(0, blenderbim_lib_path) @@ -120,14 +122,14 @@ sio.register_namespace(BlenderNamespace("/blender")) async def index(request): with open("templates/index.html", "r") as f: template = f.read() - html_content = pystache.render(template, {"port": sio_port}) + html_content = pystache.render(template, {"port": sio_port, "version": blender_version}) return web.Response(text=html_content, content_type="text/html") async def gantt(request): with open("templates/gantt.html", "r") as f: template = f.read() - html_content = pystache.render(template, {"port": sio_port}) + html_content = pystache.render(template, {"port": sio_port, "version": blender_version}) return web.Response(text=html_content, content_type="text/html") diff --git a/src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css b/src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css index bad0ccad59..fda2dbc600 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css +++ b/src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css @@ -59,9 +59,13 @@ body { color: var(--primary-text-color); margin: 0; font-family: var(--font-family); + display: flex; + flex-direction: column; + min-height: 100vh; } #container { + flex: 1; margin-top: var(--margin-medium); margin-left: var(--margin-small); margin-right: var(--margin-small); @@ -215,6 +219,20 @@ nav ul li a.active { margin-top: var(--margin-small); } +footer { + background-color: var(--nav-bg-color); + text-align: right; + padding: var(--padding-tiny); + border-top: 1px solid var(--nav-border-color); +} + +footer p { + margin: 0; + color: var(--text-color); + margin-right: var(--margin-small); + font-size: 0.8rem; +} + .gantt-info { margin: 0.5rem; font-size: var(--font-size-small); diff --git a/src/blenderbim/blenderbim/bim/data/webui/static/css/index.css b/src/blenderbim/blenderbim/bim/data/webui/static/css/index.css index d8a46fa708..dfed2fad62 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/static/css/index.css +++ b/src/blenderbim/blenderbim/bim/data/webui/static/css/index.css @@ -46,9 +46,13 @@ body { color: var(--text-color); margin: 0; font-family: var(--font-family); + display: flex; + flex-direction: column; + min-height: 100vh; } #container { + flex: 1; margin-top: var(--margin-medium); margin-left: var(--margin-small); margin-right: var(--margin-small); @@ -185,6 +189,19 @@ nav ul li a.active { margin-top: var(--margin-small); } +footer { + background-color: var(--nav-bg-color); + text-align: right; + padding: var(--padding-tiny); + border-top: 1px solid var(--nav-border-color); +} + +footer p { + margin: 0; + color: var(--text-color); + margin-right: var(--margin-small); + font-size: 0.8rem; +} .table-container { margin-bottom: var(--margin-large); diff --git a/src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html b/src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html index aa28ce3705..1454158ba2 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html +++ b/src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html @@ -49,5 +49,8 @@
+ diff --git a/src/blenderbim/blenderbim/bim/data/webui/templates/index.html b/src/blenderbim/blenderbim/bim/data/webui/templates/index.html index ac50f5b224..9ffda835b1 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/templates/index.html +++ b/src/blenderbim/blenderbim/bim/data/webui/templates/index.html @@ -56,5 +56,8 @@
+ diff --git a/src/blenderbim/blenderbim/tool/web.py b/src/blenderbim/blenderbim/tool/web.py index d15d5f0a6f..116841289b 100644 --- a/src/blenderbim/blenderbim/tool/web.py +++ b/src/blenderbim/blenderbim/tool/web.py @@ -122,7 +122,8 @@ class Web(blenderbim.core.tool.Web): blenderbim_lib_path = os.path.join(blenderbim_path, "libs", "site", "packages") env = os.environ.copy() - env["blenderbim_lib_path"] = str(blenderbim_lib_path) + env["BLENDERBIM_LIB_PATH"] = str(blenderbim_lib_path) + env["BLENDER_VERSION"] = ".".join(map(str, bpy.app.version)) ws_process = subprocess.Popen( [sys.executable, ws_path, "--p", str(port), "--host", "127.0.0.1"],