diff --git a/octoprint/server.py b/octoprint/server.py index 2a49645..0fcdd52 100644 --- a/octoprint/server.py +++ b/octoprint/server.py @@ -336,10 +336,10 @@ def getSettings(): [movementSpeedX, movementSpeedY, movementSpeedZ, movementSpeedE] = s.get(["printerParameters", "movementSpeed", ["x", "y", "z", "e"]]) return jsonify({ - "appearance": { - "name": s.get(["appearance", "name"]), - "color": s.get(["appearance", "color"]) - }, + "appearance": { + "name": s.get(["appearance", "name"]), + "color": s.get(["appearance", "color"]) + }, "printer": { "movementSpeedX": movementSpeedX, "movementSpeedY": movementSpeedY, diff --git a/octoprint/settings.py b/octoprint/settings.py index e0bb981..fe398eb 100644 --- a/octoprint/settings.py +++ b/octoprint/settings.py @@ -48,10 +48,10 @@ old_default_settings = { default_settings = old_default_settings.copy() default_settings.update({ - "appearance": { - "name": "OctoPrint", - "color": "white" - }, + "appearance": { + "name": "OctoPrint", + "color": "white" + }, "controls": [], "printerParameters": { "movementSpeed": { diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js index 7a069a3..492ed1e 100644 --- a/octoprint/static/js/ui.js +++ b/octoprint/static/js/ui.js @@ -207,6 +207,13 @@ function AppearanceViewModel(settingsViewModel) { self.name = settingsViewModel.appearance_name; self.color = settingsViewModel.appearance_color; + + self.title = ko.computed(function() { + if (self.name()) + return "OctoPrint: " + self.name(); + else + return "OctoPrint"; + }) } diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html index 131b2cc..0eb142a 100644 --- a/octoprint/templates/index.html +++ b/octoprint/templates/index.html @@ -1,7 +1,7 @@ - OctoPrint + OctoPrint @@ -26,7 +26,7 @@