q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some whitespace and reworked custom title to always include an "OctoPrint" prefix (gotta protect the "brand" here ;))

master
Gina Häußge 2013-03-02 12:42:35 +01:00
parent bd28c73bc5
commit e0b405054a
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
octoprint/server.py
View File

@ -336,10 +336,10 @@ def getSettings():
[movementSpeedX, movementSpeedY, movementSpeedZ, movementSpeedE] = s.get(["printerParameters", "movementSpeed", ["x", "y", "z", "e"]]) [movementSpeedX, movementSpeedY, movementSpeedZ, movementSpeedE] = s.get(["printerParameters", "movementSpeed", ["x", "y", "z", "e"]])
return jsonify({ return jsonify({
"appearance": { "appearance": {
"name": s.get(["appearance", "name"]), "name": s.get(["appearance", "name"]),
"color": s.get(["appearance", "color"]) "color": s.get(["appearance", "color"])
}, },
"printer": { "printer": {
"movementSpeedX": movementSpeedX, "movementSpeedX": movementSpeedX,
"movementSpeedY": movementSpeedY, "movementSpeedY": movementSpeedY,

8
octoprint/settings.py
View File

@ -48,10 +48,10 @@ old_default_settings = {
default_settings = old_default_settings.copy() default_settings = old_default_settings.copy()
default_settings.update({ default_settings.update({
"appearance": { "appearance": {
"name": "OctoPrint", "name": "OctoPrint",
"color": "white" "color": "white"
}, },
"controls": [], "controls": [],
"printerParameters": { "printerParameters": {
"movementSpeed": { "movementSpeed": {

7
octoprint/static/js/ui.js
View File

@ -207,6 +207,13 @@ function AppearanceViewModel(settingsViewModel) {
self.name = settingsViewModel.appearance_name; self.name = settingsViewModel.appearance_name;
self.color = settingsViewModel.appearance_color; self.color = settingsViewModel.appearance_color;
self.title = ko.computed(function() {
if (self.name())
return "OctoPrint: " + self.name();
else
return "OctoPrint";
})
} }

4
octoprint/templates/index.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title data-bind="text: name">OctoPrint</title> <title data-bind="text: title">OctoPrint</title>
<link rel="shortcut icon" href="{{ url_for('static', filename='img/tentacle-32x32.png') }}"> <link rel="shortcut icon" href="{{ url_for('static', filename='img/tentacle-32x32.png') }}">
<link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='img/apple-touch-icon-114x114.png') }}"> <link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='img/apple-touch-icon-114x114.png') }}">
@ -26,7 +26,7 @@
<div id="navbar" class="navbar navbar-fixed-top"> <div id="navbar" class="navbar navbar-fixed-top">
<div class="navbar-inner" data-bind="css: color"> <div class="navbar-inner" data-bind="css: color">
<div class="container"> <div class="container">
<a class="brand" href="#"><img src="{{ url_for('static', filename='img/tentacle-20x20.png') }}"> <span data-bind="text: name">OctoPrint</span></a> <a class="brand" href="#"><img src="{{ url_for('static', filename='img/tentacle-20x20.png') }}"> <span data-bind="text: title">OctoPrint</span></a>
<div class="nav-collapse"> <div class="nav-collapse">
<ul class="nav pull-right"> <ul class="nav pull-right">
<li><a id="navbar_show_settings" class="pull-right" href="#settings_dialog"><i class="icon-wrench"></i> Settings</a></li> <li><a id="navbar_show_settings" class="pull-right" href="#settings_dialog"><i class="icon-wrench"></i> Settings</a></li>