diff options
author | George Moschovitis <george.moschovitis@gmail.com> | 2019-01-30 20:28:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-30 20:28:33 +0200 |
commit | e86dd64903abd1f97a83bf4809af931142f8e344 (patch) | |
tree | e0d1f64e405e57cc01bb4cc79053196d413bc358 /web | |
parent | 43628db5e954e0376e5cf8c27573e83c1cd702f4 (diff) |
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
Diffstat (limited to 'web')
-rw-r--r-- | web/gui/dashboard.html | 2 | ||||
-rw-r--r-- | web/gui/index.html | 8 | ||||
-rw-r--r-- | web/gui/main.css | 15 | ||||
-rw-r--r-- | web/gui/main.js | 11 |
4 files changed, 20 insertions, 16 deletions
diff --git a/web/gui/dashboard.html b/web/gui/dashboard.html index e0afefda08..d322248022 100644 --- a/web/gui/dashboard.html +++ b/web/gui/dashboard.html @@ -696,4 +696,4 @@ So, to avoid flashing the charts, we destroy and re-create the charts on each up <!-- load the dashboard manager - it will do the rest --> <!-- <script>var netdataTheme = 'slate';</script> --> -<script type="text/javascript" src="dashboard.js?v20170815-15"></script> +<script type="text/javascript" src="dashboard.js?v20180130-1"></script> diff --git a/web/gui/index.html b/web/gui/index.html index 85e72ae00b..b17c94ab3d 100644 --- a/web/gui/index.html +++ b/web/gui/index.html @@ -20,7 +20,7 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="author" content="costa@tsaousis.gr"> - <link rel="stylesheet" type="text/css" href="main.css?v=2"> + <link rel="stylesheet" type="text/css" href="main.css?v=4"> <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"> @@ -58,7 +58,7 @@ <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." /> <meta name="twitter:image" content="https://cloud.githubusercontent.com/assets/2662304/14092712/93b039ea-f551-11e5-822c-beadbf2b2a2e.gif" /> - <script src="main.js?v=2"></script> + <script src="main.js?v=4"></script> </head> <body data-spy="scroll" data-target="#sidebar" data-offset="100"> @@ -134,7 +134,7 @@ <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> <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> <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> - <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> + <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> <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> <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> <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 @@ </div> <iframe id="ssoifrm" width="0" height="0"></iframe> <div id="hiddenDownloadLinks" style="display: none;" hidden></div> - <script type="text/javascript" src="dashboard.js?v20181211-1"></script> + <script type="text/javascript" src="dashboard.js?v20190130-1"></script> </body> </html> diff --git a/web/gui/main.css b/web/gui/main.css index 51f2a7cd94..b1fb94fdd5 100644 --- a/web/gui/main.css +++ b/web/gui/main.css @@ -634,12 +634,11 @@ body.modal-open { #my-netdata-menu-filter-input { color: #fff; - /* background: none; */ - /* border: 1px solid #616161; */ border: none; background-color: #4b4f55; + width: 472px; margin: 5px 14px; - width: 90%; + margin-right: 0; padding: 2px 5px; outline: none; } @@ -649,7 +648,6 @@ body.modal-open { } #my-netdata-dropdown-content.theme-white #my-netdata-menu-filter-input { - /* border: 1px solid #ddd; */ background-color: #e7e7e7; color: #555; } @@ -660,14 +658,11 @@ body.modal-open { .filter-control .filter-control__clear { cursor: pointer; - position: relative; - left: -36px; + position: absolute; + top: 7px; + right: 19px; } -/* .collapse a.btn { - text-align: left; -} */ - #hostname { font-size: 18px; } diff --git a/web/gui/main.js b/web/gui/main.js index 8dfd019aa4..dae164a33e 100644 --- a/web/gui/main.js +++ b/web/gui/main.js @@ -729,6 +729,7 @@ function renderMyNetdataMenu(machinesArray) { id="my-netdata-menu-filter-input" type="text" placeholder="filter nodes..." + autofocus autocomplete="off" value="${myNetdataMenuFilterValue}" onkeydown="myNetdataFilterDidChange(event)" @@ -4064,6 +4065,7 @@ function runOnceOnDashboardWithjQuery() { }) .on('shown.bs.dropdown', function () { Ps.update(document.getElementById('my-netdata-dropdown-content')); + myNetdataMenuDidShow(); }) .on('hidden.bs.dropdown', function () { NETDATA.unpause(); @@ -4625,6 +4627,13 @@ function updateMyNetdataAfterFilterChange() { } } +function myNetdataMenuDidShow() { + const filterEl = document.getElementById("my-netdata-menu-filter-input"); + if (filterEl) { + filterEl.focus(); + } +} + function myNetdataFilterDidChange(e) { const inputEl = e.target; setTimeout(() => { @@ -4712,7 +4721,7 @@ function handleMessage(e) { break; default: - console.log("Unknown message", e); + return; } } |