From 4bfcf1893c59a111bf9a127d70d538d04ed998b8 Mon Sep 17 00:00:00 2001 From: vitormhenrique Date: Thu, 22 Oct 2020 05:00:02 +0100 Subject: [PATCH] starting setting up templates --- octoprint_enclosure/__init__.py | 27 ++++++++-------- octoprint_enclosure/static/js/enclosure.js | 31 +++++++++++++++++++ .../templates/enclosure_settings.jinja2 | 5 +++ .../templates/outputSettingsEditor.jinja2 | 13 ++++++++ .../templates/outputTable.jinja2 | 16 ++++++++++ 5 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 octoprint_enclosure/templates/enclosure_settings.jinja2 create mode 100644 octoprint_enclosure/templates/outputSettingsEditor.jinja2 create mode 100644 octoprint_enclosure/templates/outputTable.jinja2 diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 0d64784..139464c 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -12,24 +12,23 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, octoprint.plugin.TemplateP # ~~ TemplatePlugin - # def get_template_configs(self): - # return [dict(type="settings", custom_bindings=True), dict(type="tab", custom_bindings=True), - # dict(type="navbar", custom_bindings=True, suffix="_1", classes=["dropdown"]), - # dict(type="navbar", custom_bindings=True, template="enclosure_navbar_input.jinja2", suffix="_2", - # classes=["dropdown"])] + def get_template_configs(self): + return [ + dict(type="settings", template="enclosure_settings.jinja2", custom_bindings=True) + ] # ~~ AssetPlugin mixin - # def get_assets(self): - # return dict(js=["js/enclosure.js", "js/bootstrap-colorpicker.min.js"], - # css=["css/bootstrap-colorpicker.css", "css/enclosure.css"]) + def get_assets(self): + return dict(js=["js/enclosure.js", "js/bootstrap-colorpicker.min.js"], + css=["css/bootstrap-colorpicker.css", "css/enclosure.css"]) # ~~ Softwareupdate hook - # def get_update_information(self): - # return dict(enclosure=dict(displayName="Enclosure Plugin", displayVersion=self._plugin_version, - # # version check: github repository - # type="github_release", user="vitormhenrique", repo="OctoPrint-Enclosure", current=self._plugin_version, - # # update method: pip - # pip="https://github.com/vitormhenrique/OctoPrint-Enclosure/archive/{target_version}.zip")) + def get_update_information(self): + return dict(enclosure=dict(displayName="Enclosure Plugin", displayVersion=self._plugin_version, + # version check: github repository + type="github_release", user="vitormhenrique", repo="OctoPrint-Enclosure", current=self._plugin_version, + # update method: pip + pip="https://github.com/vitormhenrique/OctoPrint-Enclosure/archive/{target_version}.zip")) diff --git a/octoprint_enclosure/static/js/enclosure.js b/octoprint_enclosure/static/js/enclosure.js index e69de29..af6d044 100644 --- a/octoprint_enclosure/static/js/enclosure.js +++ b/octoprint_enclosure/static/js/enclosure.js @@ -0,0 +1,31 @@ +$(function () { + function EnclosureViewModel(parameters) { + + self.showAddOutputDialog = function (data) { + var editDialog = $("#settings_outputs_editDialog"); + + editDialog.modal({ + minHeight: function () { + return Math.max($.fn.modal.defaults.maxHeight() - 80, 250); + } + }).css({ + width: 'auto', + 'margin-left': function () { + return -($(this).width() / 2); + } + }); + } + + + }; + + + OCTOPRINT_VIEWMODELS.push({ + construct: EnclosureViewModel, + // ViewModels your plugin depends on, e.g. loginStateViewModel, settingsViewModel, ... + dependencies: ["settingsViewModel", "connectionViewModel", "printerStateViewModel"], + // Elements to bind to, e.g. #settings_plugin_tasmota-mqtt, #tab_plugin_tasmota-mqtt, ... + elements: ["#settings_plugin_enclosure"] + }); + +}); \ No newline at end of file diff --git a/octoprint_enclosure/templates/enclosure_settings.jinja2 b/octoprint_enclosure/templates/enclosure_settings.jinja2 new file mode 100644 index 0000000..cb73115 --- /dev/null +++ b/octoprint_enclosure/templates/enclosure_settings.jinja2 @@ -0,0 +1,5 @@ +

{{ _('Raspberry Pi Outputs Testaaa') }}

+ +{% include "outputTable.jinja2" %} + +{% include "outputSettingsEditor.jinja2" %} \ No newline at end of file diff --git a/octoprint_enclosure/templates/outputSettingsEditor.jinja2 b/octoprint_enclosure/templates/outputSettingsEditor.jinja2 new file mode 100644 index 0000000..becb6d2 --- /dev/null +++ b/octoprint_enclosure/templates/outputSettingsEditor.jinja2 @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/octoprint_enclosure/templates/outputTable.jinja2 b/octoprint_enclosure/templates/outputTable.jinja2 new file mode 100644 index 0000000..70de5e8 --- /dev/null +++ b/octoprint_enclosure/templates/outputTable.jinja2 @@ -0,0 +1,16 @@ + + + + + + + + + + + +
IdTypeGPIO
+ +
+ +