From d3a00fc887c2bd0399e7da59cc5822fa8a6f964f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 9 Feb 2015 16:12:07 +0100 Subject: [PATCH] Properly disable UI elements again after change in templating --- src/octoprint/server/__init__.py | 27 ++-- .../dialogs/settings/accesscontrol.jinja2 | 2 - src/octoprint/templates/navbar/login.jinja2 | 2 - .../templates/navbar/systemmenu.jinja2 | 2 - .../templates/tabs/gcodeviewer.jinja2 | 2 - src/octoprint/templates/tabs/timelapse.jinja2 | 118 +++++++++--------- 6 files changed, 76 insertions(+), 77 deletions(-) diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index 46aee6a7..b2f424a1 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -108,6 +108,13 @@ def get_locale(): @util.flask.cached(refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values) def index(): + #~~ a bunch of settings + + enable_gcodeviewer = settings().getBoolean(["gcodeViewer", "enabled"]) + enable_timelapse = (settings().get(["webcam", "snapshot"]) and settings().get(["webcam", "ffmpeg"])) + enable_systemmenu = settings().get(["system"]) is not None and settings().get(["system", "actions"]) is not None and len(settings().get(["system", "actions"])) > 0 + enable_accesscontrol = userManager is not None + #~~ extract data from asset plugins asset_plugins = pluginManager.get_implementations(octoprint.plugin.AssetPlugin) @@ -126,10 +133,12 @@ def index(): #~~ navbar templates["navbar"]["entries"] = dict( - settings=dict(template="navbar/settings.jinja2", _div="navbar_settings", styles=["display: none"], data_bind="visible: loginState.isAdmin", custom_bindings=False), - systemmenu=dict(template="navbar/systemmenu.jinja2", _div="navbar_systemmenu", styles=["display: none"], classes=["dropdown"], data_bind="visible: loginState.isAdmin", custom_bindings=False), - login=dict(template="navbar/login.jinja2", _div="navbar_login", classes=["dropdown"], custom_bindings=False) + settings=dict(template="navbar/settings.jinja2", _div="navbar_settings", styles=["display: none"], data_bind="visible: loginState.isAdmin", custom_bindings=False) ) + if enable_accesscontrol: + templates["navbar"]["entries"]["login"] = dict(template="navbar/login.jinja2", _div="navbar_login", classes=["dropdown"], custom_bindings=False) + if enable_systemmenu: + templates["navbar"]["entries"]["systemmenu"] = dict(template="navbar/systemmenu.jinja2", _div="navbar_systemmenu", styles=["display: none"], classes=["dropdown"], data_bind="visible: loginState.isAdmin", custom_bindings=False), #~~ sidebar @@ -144,10 +153,12 @@ def index(): templates["tab"]["entries"] = dict( temperature=(gettext("Temperature"), dict(template="tabs/temperature.jinja2", _div="temp")), control=(gettext("Control"), dict(template="tabs/control.jinja2", _div="control")), - gcodeviewer=(gettext("GCode Viewer"), dict(template="tabs/gcodeviewer.jinja2", _div="gcode")), terminal=(gettext("Terminal"), dict(template="tabs/terminal.jinja2", _div="term")), - timelapse=(gettext("Timelapse"), dict(template="tabs/timelapse.jinja2", _div="timelapse")) ) + if enable_gcodeviewer: + templates["tab"]["entries"]["gcodeviewer"] = (gettext("GCode Viewer"), dict(template="tabs/gcodeviewer.jinja2", _div="gcode")) + if enable_timelapse: + templates["tab"]["entries"]["timelapse"] = (gettext("Timelapse"), dict(template="tabs/timelapse.jinja2", _div="timelapse")) #~~ settings dialog @@ -163,7 +174,6 @@ def index(): features=(gettext("Features"), dict(template="dialogs/settings/features.jinja2", _div="settings_features", custom_bindings=False)), webcam=(gettext("Webcam"), dict(template="dialogs/settings/webcam.jinja2", _div="settings_webcam", custom_bindings=False)), - accesscontrol=(gettext("Access Control"), dict(template="dialogs/settings/accesscontrol.jinja2", _div="settings_users", custom_bindings=False)), api=(gettext("API"), dict(template="dialogs/settings/api.jinja2", _div="settings_api", custom_bindings=False)), section_octoprint=(gettext("OctoPrint"), None), @@ -172,6 +182,8 @@ def index(): appearance=(gettext("Appearance"), dict(template="dialogs/settings/appearance.jinja2", _div="settings_appearance", custom_bindings=False)), logs=(gettext("Logs"), dict(template="dialogs/settings/logs.jinja2", _div="settings_logs")), ) + if enable_accesscontrol: + templates["settings"]["entries"]["accesscontrol"] = (gettext("Access Control"), dict(template="dialogs/settings/accesscontrol.jinja2", _div="settings_users", custom_bindings=False)) #~~ extract data from template plugins @@ -252,10 +264,7 @@ def index(): render_kwargs = dict( webcamStream=settings().get(["webcam", "stream"]), - enableTimelapse=(settings().get(["webcam", "snapshot"]) is not None and settings().get(["webcam", "ffmpeg"]) is not None), - enableGCodeVisualizer=settings().get(["gcodeViewer", "enabled"]), enableTemperatureGraph=settings().get(["feature", "temperatureGraph"]), - enableSystemMenu=settings().get(["system"]) is not None and settings().get(["system", "actions"]) is not None and len(settings().get(["system", "actions"])) > 0, enableAccessControl=userManager is not None, enableSdSupport=settings().get(["feature", "sdSupport"]), firstRun=settings().getBoolean(["server", "firstRun"]) and (userManager is None or not userManager.hasBeenCustomized()), diff --git a/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 b/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 index 2420017e..0ab00fdb 100644 --- a/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 +++ b/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 @@ -1,4 +1,3 @@ -{% if enableAccessControl %} @@ -161,4 +160,3 @@ -{% endif %} diff --git a/src/octoprint/templates/navbar/login.jinja2 b/src/octoprint/templates/navbar/login.jinja2 index 1b776aaf..f7e25593 100644 --- a/src/octoprint/templates/navbar/login.jinja2 +++ b/src/octoprint/templates/navbar/login.jinja2 @@ -1,4 +1,3 @@ -{% if enableAccessControl %} {{ _('Login') }} @@ -17,4 +16,3 @@
  • {{ _('Change Password') }}
  • {{ _('Logout') }}
    • -{% endif %} diff --git a/src/octoprint/templates/navbar/systemmenu.jinja2 b/src/octoprint/templates/navbar/systemmenu.jinja2 index b14c83c3..0e8ba5a1 100644 --- a/src/octoprint/templates/navbar/systemmenu.jinja2 +++ b/src/octoprint/templates/navbar/systemmenu.jinja2 @@ -1,4 +1,3 @@ -{% if enableSystemMenu %} {{ _('System') }} @@ -6,4 +5,3 @@ -{% endif %} diff --git a/src/octoprint/templates/tabs/gcodeviewer.jinja2 b/src/octoprint/templates/tabs/gcodeviewer.jinja2 index ad986db7..7c9385a1 100644 --- a/src/octoprint/templates/tabs/gcodeviewer.jinja2 +++ b/src/octoprint/templates/tabs/gcodeviewer.jinja2 @@ -1,4 +1,3 @@ -{% if enableGCodeVisualizer %}
    @@ -74,4 +73,3 @@ Yes, please visualize regardless of its size
    -{% endif %} diff --git a/src/octoprint/templates/tabs/timelapse.jinja2 b/src/octoprint/templates/tabs/timelapse.jinja2 index e3d187e0..5c24d750 100644 --- a/src/octoprint/templates/tabs/timelapse.jinja2 +++ b/src/octoprint/templates/tabs/timelapse.jinja2 @@ -1,69 +1,67 @@ -{% if enableTimelapse %} -
    -

    {{ _('Timelapse Configuration') }}

    +
    +

    {{ _('Timelapse Configuration') }}

    - - + + - + +
    + + {{ _('sec') }} +
    + +
    +
    - + {{ _('sec') }}
    - -
    - -
    - - {{ _('sec') }} -
    -
    - -
    - -
    - -
    - -
    -

    {{ _('Finished Timelapses') }}

    +
    + +
    -
    - {{ _('Sort by') }}: {{ _('Name') }} ({{ _('ascending') }}) | {{ _('Creation date') }} ({{ _('descending') }}) | {{ _('Size') }} ({{ _('descending') }}) +
    +
    -
    - - - - - - - - - - - - - - -
    {{ _('Name') }}{{ _('Size') }}{{ _('Action') }}
     | 
    - -{% endif %} + + +

    {{ _('Finished Timelapses') }}

    + +
    + {{ _('Sort by') }}: {{ _('Name') }} ({{ _('ascending') }}) | {{ _('Creation date') }} ({{ _('descending') }}) | {{ _('Size') }} ({{ _('descending') }}) +
    + + + + + + + + + + + + + + + +
    {{ _('Name') }}{{ _('Size') }}{{ _('Action') }}
     | 
    +