Minor fixes (#5294)
* Bumped the cachebusters when including main.js/dashboard.js * Fix for #5202 * Don't report unknown messages (can come from plugins) * Minor * Autofocus the filter field when the menu expands * Aesthetic fixes for filter input
George Moschovitis committed
Jan 30, 2019 at 20:28 UTC
e86dd64903abd1f97a83bf4809af931142f8e344
4 files changed
+20
-16
web/gui/dashboard.html
+1
-1
@@ -696,4 +696,4 @@ So, to avoid flashing the charts, we destroy and re-create the charts on each up
696
697
<!-- load the dashboard manager - it will do the rest -->
698
<!-- <script>var netdataTheme = 'slate';</script> -->
699
-<script type="text/javascript" src="dashboard.js?v20170815-15"></script>
699
+<script type="text/javascript" src="dashboard.js?v20180130-1"></script>
web/gui/index.html
+4
-4
@@ -20,7 +20,7 @@
20
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
21
<meta name="author" content="costa@tsaousis.gr">
22
23
- <link rel="stylesheet" type="text/css" href="main.css?v=2">
23
+ <link rel="stylesheet" type="text/css" href="main.css?v=4">
24
25
<link rel="icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACyklEQVRYhcWXz0sUYRjHP8+wLItImEhnEfEgEVJk+56CbCECQWezOkTQTTp6kejgKUSoEAoK/wAhaaeDBkLoIahZIWIJo0U8hHQJJBYJERGfDrOju7PjuO5u6/c0PM/7zvfzvvP+eEaoVu6wBZIA3cW82wtvY7cD1xEWSTpb1bxWjm2RtbtQxoF7iLSA7gO/UL4A74G3mBIzNz0Peg1hFmUK46zXBuDaCYQJlDFE4ke/QreAZyhPMc42rt2PyEoxt4cyDUxgnO3qAVy7C8gg0hdFHwBZA0ZIOt9w7e+I9B6mdBVhmGTlbFQCuPYFhA8g56o3P3D6CwyiDCIyFshtgqRIZnKlUStg3lW7OYC0AvPATkiuA9U3uOlEOEDWTgCZ2s3LIMbCU9ID3A8HUCZO9s2jGCRxdFIflDUF/EX3I3q1N0iq+8BZf+v6MzDeFHMAEQvoJpuOAwiu3Qr89g6ZJkm5CnoHeBwDbjTV3CPoRRhF+WQBA801B+AJiAUMWMDFptuLtBef+iygs+kAh+q0gDOnCNBmETyOmywLKJyifyEG/ATqPP+LUt0FZoAlIA6MgNyKqDo2YkAO6G+QeQrjfCyJzuHaoyCvjuiVs4q0jdBMwNyTcV6j+jm0h7BkAYuohpZLJ1TUQJYrIqo7KAtW8VaabQBA1GVWmROZwzgFfwtOoRpealevdGg0a8eAoUB0D9VJ8M8A46yDTNdlL9wmaz8MMX9RrIQOpfoS4+S9br7cdAvoCiLn6wLxFtwyQhxlKMQ8j3CJpFeml+9QN90N6iLSURfEkXD8AQwms+aHyo9hk1kHSaG6+Z/MU6XmlQAeRA7EoLraQPM83si/BlPhF5E3E1dQfY5S++5Q/9dMLwdH7uv4n1PX7gEeAXejy+0y4x2QOWASk8lHNT0e4AAk3QZ6E6+E68MrZNqK2QKwgXevLCEskHSqumX/AUXU5QBtOC5FAAAAAElFTkSuQmCC">
26
@@ -58,7 +58,7 @@
58
<meta name="twitter:description" content="Unparalleled insights, in real-time, of everything happening on your Linux systems and applications, with stunning, interactive web dashboards and powerful performance and health alarms." />
59
<meta name="twitter:image" content="https://cloud.githubusercontent.com/assets/2662304/14092712/93b039ea-f551-11e5-822c-beadbf2b2a2e.gif" />
60
61
- <script src="main.js?v=2"></script>
61
+ <script src="main.js?v=4"></script>
62
</head>
63
64
<body data-spy="scroll" data-target="#sidebar" data-offset="100">
@@ -134,7 +134,7 @@
134
<li id="alarmsButton" title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i> <span class="hidden-sm hidden-md">Alarms </span><span id="alarms_count_badge" class="badge"></span></a></li>
135
<li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i> <span class="hidden-sm hidden-md">Settings</span></a></li>
136
<li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
137
- <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata/wiki" class="btn" target="_blank"><i class="fab fa-github"></i></a></li>
137
+ <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li>
138
<li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li>
139
<li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li>
140
<li title="import / load a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="loadButton"><a href="#" class="btn" data-toggle="modal" data-target="#loadSnapshotModal"><i class="fas fa-download"></i> <span class="hidden-sm hidden-md hidden-lg">Import</span></a></li>
@@ -1366,6 +1366,6 @@
1366
</div>
1367
<iframe id="ssoifrm" width="0" height="0"></iframe>
1368
<div id="hiddenDownloadLinks" style="display: none;" hidden></div>
1369
- <script type="text/javascript" src="dashboard.js?v20181211-1"></script>
1369
+ <script type="text/javascript" src="dashboard.js?v20190130-1"></script>
1370
</body>
1371
</html>
web/gui/main.css
+5
-10
@@ -634,12 +634,11 @@ body.modal-open {
634
635
#my-netdata-menu-filter-input {
636
color: #fff;
637
- /* background: none; */
638
- /* border: 1px solid #616161; */
637
border: none;
638
background-color: #4b4f55;
639
+ width: 472px;
640
margin: 5px 14px;
642
- width: 90%;
641
+ margin-right: 0;
642
padding: 2px 5px;
643
outline: none;
644
}
@@ -649,7 +648,6 @@ body.modal-open {
648
}
649
650
#my-netdata-dropdown-content.theme-white #my-netdata-menu-filter-input {
652
- /* border: 1px solid #ddd; */
651
background-color: #e7e7e7;
652
color: #555;
653
}
@@ -660,14 +658,11 @@ body.modal-open {
658
659
.filter-control .filter-control__clear {
660
cursor: pointer;
663
- position: relative;
664
- left: -36px;
661
+ position: absolute;
662
+ top: 7px;
663
+ right: 19px;
664
}
665
667
-/* .collapse a.btn {
668
- text-align: left;
669
-} */
670
-
666
#hostname {
667
font-size: 18px;
668
}
web/gui/main.js
+10
-1
@@ -729,6 +729,7 @@ function renderMyNetdataMenu(machinesArray) {
729
id="my-netdata-menu-filter-input"
730
type="text"
731
placeholder="filter nodes..."
732
+ autofocus
733
autocomplete="off"
734
value="${myNetdataMenuFilterValue}"
735
onkeydown="myNetdataFilterDidChange(event)"
@@ -4064,6 +4065,7 @@ function runOnceOnDashboardWithjQuery() {
4065
})
4066
.on('shown.bs.dropdown', function () {
4067
Ps.update(document.getElementById('my-netdata-dropdown-content'));
4068
+ myNetdataMenuDidShow();
4069
})
4070
.on('hidden.bs.dropdown', function () {
4071
NETDATA.unpause();
@@ -4625,6 +4627,13 @@ function updateMyNetdataAfterFilterChange() {
4627
}
4628
}
4629
4630
+function myNetdataMenuDidShow() {
4631
+ const filterEl = document.getElementById("my-netdata-menu-filter-input");
4632
+ if (filterEl) {
4633
+ filterEl.focus();
4634
+ }
4635
+}
4636
+
4637
function myNetdataFilterDidChange(e) {
4638
const inputEl = e.target;
4639
setTimeout(() => {
@@ -4712,7 +4721,7 @@ function handleMessage(e) {
4721
break;
4722
4723
default:
4715
- console.log("Unknown message", e);
4724
+ return;
4725
}
4726
}
4727