option to disable navbar

This commit is contained in:
Vitor de Miranda Henrique
2017-05-12 14:51:41 -05:00
parent 5d70671a49
commit bab692f85b
4 changed files with 21 additions and 14 deletions

View File

@@ -701,9 +701,6 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
self._logger.info("temperature_control: %s", self.temperature_control)
self._logger.info("rpi_outputs: %s", self.rpi_outputs)
self._logger.info("rpi_inputs: %s", self.rpi_inputs)
self._logger.info("notificationProvider: %s",self._settings.get(["notificationProvider"]))
self._logger.info("event_name: %s",self._settings.get(["event_name"]))
self._logger.info("apiKEY: %s",self._settings.get(["apiKEY"]))
self.startGPIO()
self.configureGPIO()
@@ -733,6 +730,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
notificationProvider = "disabled",
apiKEY = "",
event_name="printer_event",
showTempNavbar=False,
notifications=[{'printFinish':True,'filamentChange':True,'printerAction':True,'temperatureAction':True,'gpioAction':True}]
)

View File

@@ -22,6 +22,8 @@ $(function() {
self.navbarTemp= ko.observable();
self.navbarHum= ko.observable();
self.showTempNavbar= ko.observable();
self.notificationProvider = ko.observable();
self.event_name = ko.observable();
self.apiKEY = ko.observable();
@@ -115,6 +117,8 @@ $(function() {
self.filamentSensorGcode(self.settings.filamentSensorGcode());
self.notificationProvider(self.settings.notificationProvider());
self.showTempNavbar(self.settings.showTempNavbar());
self.event_name(self.settings.event_name());
self.apiKEY(self.settings.apiKEY());
self.notifications(self.settings.notifications());

View File

@@ -1,6 +1,8 @@
<div class="nav">
<p class="nav navbar-text" >
<span data-bind="html: $root.navbarTemp"></span>
</p>
<p class="nav navbar-text" ><span data-bind="html: $root.navbarHum"></span></p>
</div>
<!-- ko if: ($root.global_settings.settings.plugins.enclosure.showTempNavbar()) -->
<div class="nav">
<p class="nav navbar-text" >
<span data-bind="html: $root.navbarTemp"></span>
</p>
<p class="nav navbar-text" ><span data-bind="html: $root.navbarHum"></span></p>
</div>
<!-- /ko -->

View File

@@ -467,6 +467,14 @@
<span class="help-inline">Log adcitional information on octoprint log to help trouble shoot the plugin</span>
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" data-bind="checked: global_settings.settings.plugins.enclosure.showTempNavbar"> {{ _('Show temp navbar') }}
</label>
<span class="help-inline">Display enclosure temperature and humidity on navbar</span>
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">
@@ -548,10 +556,5 @@
</div>
</div>
<!-- /ko -->
</form>
</div>