-css for editor

-fix for FillDataset checkbox, before any Graph was shown
This commit is contained in:
thelastWallE 2021-03-30 21:25:25 +02:00
parent 2aec1a9eaa
commit 6b0928bfc6
3 changed files with 24 additions and 19 deletions

View File

@ -94,18 +94,23 @@ ul#klipper-settings {
}
#settings_plugin_klipper form .tab-content .tab-pane {
height: 100%;
height: calc(100% - 35px);
}
#settings_plugin_klipper form .tab-content .tap-pane#conf .control-group {
margin-bottom: 0px;
height: 99%;
height: 100%;
}
div#settings_plugin_klipper form div.tab-content #confdiv.tap-pane div.control-group button {
div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor {
height: 100%;
overflow: auto;
}
div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group button.btn.btn-small {
width: 30%;
display: inline-block;
margin: 2px;
margin: 0px 2px 2px 2px;
}
#macros #item.control-group {

View File

@ -35,6 +35,7 @@ function KlipperGraphViewModel(parameters) {
self.canvas;
self.canvasContext;
self.chart;
self.chart.update;
self.spinnerDialog;
self.onStartup = function() {
@ -94,16 +95,6 @@ function KlipperGraphViewModel(parameters) {
}
}
self.toggleDatasetFill = function() {
if(self.datasets) {
for (i=0; i < self.datasets().length; i++) {
self.datasets()[i].fill = self.datasetFill();
}
self.chart.update();
}
return true
}
self.convertTime = function(val) {
return moment(val, "X");
}
@ -220,6 +211,16 @@ function KlipperGraphViewModel(parameters) {
}
});
}
self.toggleDatasetFill = function() {
if(self.datasets) {
for (i=0; i < self.datasets().length; i++) {
self.datasets()[i].fill = self.datasetFill();
}
self.chart.update();
}
return true
}
}
OCTOPRINT_VIEWMODELS.push({

View File

@ -203,12 +203,11 @@
</button><button class="btn btn-small" data-bind='click: reloadFromFile'>
<i class="fas fa-upload"></i></a> {{ _('Reload from file') }}
</button>
<!--
<a href='#' data-bind='click: loadLastSession'><i class="fas fa-redo"></i></a> {{ _('Reload last changes') }}<a href='#' data-bind='click: loadLastSession'><i class="fas fa-upload"></i></a> {{ _('Reload from file') }}
-->
<div class="conf-editor">
<input id="hdnLoadKlipperConfig" type="hidden" data-bind="value: configBound(settings.settings.plugins.klipper.config)" />
<div id="plugin-klipper-config"></div>
</div>
</div>
</div>
</div>
</form>