Fixed some whitespace and reworked custom title to always include an "OctoPrint" prefix (gotta protect the "brand" here ;))
parent
bd28c73bc5
commit
e0b405054a
|
@ -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";
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in New Issue