Fix path #6085 (#6093)
* Minor change from @VLegakis * console/index.html -> console.html and other fixes for #6085 * Removed file again
George Moschovitis committed
May 23, 2019 at 11:12 UTC
f016ce4ad816da09bc313eb6a39a08cc172c113c
5 files changed
+7
-16
web/gui/Makefile.am
+1
-6
@@ -61,6 +61,7 @@ dist_web_DATA = \
61
index.html \
62
main.css \
63
main.js \
64
+ console.html \
65
infographic.html \
66
robots.txt \
67
refresh-badges.js \
@@ -69,12 +70,6 @@ dist_web_DATA = \
70
version.txt \
71
$(NULL)
72
72
-
73
-webconsoledir=$(webdir)/console
74
-dist_webconsole_DATA = \
75
- console/index.html \
76
- $(NULL)
77
-
73
webstaticdir=$(webdir)/static/img
74
dist_webstatic_DATA = \
75
static/img/netdata-logomark.svg \
web/gui/console.html
renamed
+2
-2
@@ -10,7 +10,7 @@
10
<meta name="viewport" content="width=device-width, initial-scale=1" />
11
<meta name="apple-mobile-web-app-capable" content="yes" />
12
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
13
- <link rel="icon" href="/favicon.ico" />
13
+ <link rel="icon" href="favicon.ico" />
14
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
15
<!-- Google Tag Manager -->
16
<script>(function (w, d, s, l, i) {
@@ -66,7 +66,7 @@
66
var netdataTheme = "white"
67
var netdataNoBootstrap = true
68
</script>
69
- <script type="text/javascript" src="/dashboard.js?v20190515"></script>
69
+ <script type="text/javascript" src="dashboard.js?v20190523"></script>
70
</body>
71
72
</html>
\ No newline at end of file
web/gui/index.html
+1
-1
@@ -124,7 +124,7 @@
124
</div>
125
<nav class="collapse navbar-collapse navbar-right" role="navigation">
126
<ul class="nav navbar-nav">
127
- <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console/index.html');" class="btn" target="_blank"><i class="fas fa-tv"></i> <span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li>
127
+ <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i> <span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li>
128
<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>
129
<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>
130
<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>
web/gui/main.js
+3
-4
@@ -775,7 +775,7 @@ function renderMyNetdataMenu(machinesArray) {
775
html += (
776
`<div class="agent-item">
777
<i class="fas fa-tv"></i>
778
- <a onClick="openAuthenticatedUrl('console/index.html');" target="_blank">Nodes<sup class="beta"> beta</sup></a>
778
+ <a onClick="openAuthenticatedUrl('console.html');" target="_blank">Nodes<sup class="beta"> beta</sup></a>
779
<div></div>
780
</div>
781
<div class="agent-item">
@@ -793,7 +793,7 @@ function renderMyNetdataMenu(machinesArray) {
793
html += (
794
`<div class="agent-item">
795
<i class="fas fa-tv"></i>
796
- <a onclick="openAuthenticatedUrl('console/index.html');" target="_blank">Nodes<sup class="beta"> beta</sup></a>
796
+ <a onclick="openAuthenticatedUrl('console.html');" target="_blank">Nodes<sup class="beta"> beta</sup></a>
797
<div></div>
798
</div>
799
<div class="agent-item">
@@ -4840,12 +4840,11 @@ function renderAccountUI() {
4840
container.removeAttribute("title");
4841
container.removeAttribute("data-original-title");
4842
container.removeAttribute("data-placement");
4843
- // <a href="/console/index.html#/charts/${NETDATA.registry.machine_guid}" target="_blank" class="btn">
4843
container.innerHTML = (
4844
`<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span id="amc-account-name"></span> <strong class="caret"></strong></a>
4845
<ul id="cloud-menu" class="dropdown-menu scrollable-menu inpagemenu" role="menu">
4846
<li>
4848
- <a onclick="openAuthenticatedUrl('console/index.html');" target="_blank" class="btn">
4847
+ <a onclick="openAuthenticatedUrl('console.html');" target="_blank" class="btn">
4848
<i class="fas fa-tv"></i> <span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span>
4849
</a>
4850
</li>
web/gui/static/static/img/netdata-logomark.svg
deleted
-3
@@ -1,3 +0,0 @@
1
-<svg width="1723" height="1723" viewBox="0 0 1723 1723" fill="none" xmlns="http://www.w3.org/2000/svg">
2
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0.628784 849.678C0.628784 473.909 235.042 153.621 563.766 30.7914C701.438 19.0613 843.892 50.2449 970.557 129.297C1052.47 180.42 1119.71 246.528 1170.96 321.982C1161.21 207.568 1122.97 96.4678 1058.94 0.187012C1220.56 38.587 1364.64 123.126 1476.91 239.343C1518.34 297.634 1548.55 365.545 1563.67 440.489C1578.54 514.244 1577.35 587.545 1562.5 656.661C1601.04 613.105 1632.22 563.24 1654.63 509.251C1698.41 613.852 1722.63 728.899 1722.63 849.678C1722.63 1331.55 1337.15 1722.19 861.629 1722.19C386.112 1722.19 0.628784 1331.55 0.628784 849.678ZM1178.87 1369.04C1286.71 1369.04 1374.13 1280.45 1374.13 1171.17C1374.13 1061.88 1286.71 973.293 1178.87 973.293C1071.03 973.293 983.603 1061.88 983.603 1171.17C983.603 1280.45 1071.03 1369.04 1178.87 1369.04Z" fill="#00C853"/>
3
-</svg>