The network layout and shaped devices are a bit less shouty

This commit is contained in:
Herbert Wolverson 2024-07-24 09:19:22 -05:00
parent 8ea687679a
commit 549927acb3
3 changed files with 26 additions and 22 deletions

View File

@ -386,13 +386,13 @@ function iterateNetJson(level, depth) {
html += "<div>";
html += "<strong>" + key + "</strong>";
if (depth > 0) {
html += " <button class='btn btn-sm btn-secondary' onclick='window.promoteNode(\"" + key + "\") '><i class='fa fa-arrow-left'></i> Promote</button>";
html += " <button class='btn btn-sm btn-outline-secondary' onclick='window.promoteNode(\"" + key + "\") '><i class='fa fa-arrow-left'></i> Promote</button>";
}
html += " <button class='btn btn-sm btn-secondary' onclick='window.renameNode(\"" + key + "\") '><i class='fa fa-pencil'></i> Rename</button>";
html += " <button class='btn btn-sm btn-warning' onclick='window.deleteNode(\"" + key + "\") '><i class='fa fa-trash'></i> Delete</button>";
html += " <button class='btn btn-sm btn-outline-secondary' onclick='window.renameNode(\"" + key + "\") '><i class='fa fa-pencil'></i> Rename</button>";
html += " <button class='btn btn-sm btn-outline-warning' onclick='window.deleteNode(\"" + key + "\") '><i class='fa fa-trash'></i> Delete</button>";
html += "<br />";
html += "Download: " + value.downloadBandwidthMbps + " Mbps <button type='button' class='btn btn-sm btn-secondary' onclick='window.nodeSpeedChange(\"" + key + "\", \"d\")'><i class='fa fa-pencil'></i></button><br />";
html += "Upload: " + value.uploadBandwidthMbps + " Mbps <button type='button' class='btn btn-sm btn-secondary' onclick='window.nodeSpeedChange(\"" + key + "\", \"u\")'><i class='fa fa-pencil'></i></button><br />";
html += "Download: " + value.downloadBandwidthMbps + " Mbps <button type='button' class='btn btn-sm btn-outline-secondary' onclick='window.nodeSpeedChange(\"" + key + "\", \"d\")'><i class='fa fa-pencil'></i></button><br />";
html += "Upload: " + value.uploadBandwidthMbps + " Mbps <button type='button' class='btn btn-sm btn-outline-secondary' onclick='window.nodeSpeedChange(\"" + key + "\", \"u\")'><i class='fa fa-pencil'></i></button><br />";
let num_children = 0;
for (let i=0; i<shaped_devices.length; i++) {
if (shaped_devices[i].parent_node === key) {
@ -1076,7 +1076,7 @@ function shapedDevices() {
html += makeSheetNumberBox(i, "download_max_mbps", row.download_max_mbps);
html += makeSheetNumberBox(i, "upload_max_mbps", row.upload_max_mbps);
html += makeSheetBox(i, "comment", row.comment, true);
html += "<td><button class='btn btn-sm btn-warning' type='button' onclick='window.deleteSdRow(" + i + ")'><i class='fa fa-trash'></i></button></td>";
html += "<td><button class='btn btn-sm btn-secondary' type='button' onclick='window.deleteSdRow(" + i + ")'><i class='fa fa-trash'></i></button></td>";
html += "</tr>";
}

View File

@ -5,9 +5,9 @@
<h5><i class="fa fa-users"></i> Configuration</h5>
</div>
<div class="col-10">
<a href="#" class="btn btn-sm btn-primary" id="btnSaveIspConfig"><i class="fa fa-save"></i> Save
<a href="#" class="btn btn-sm btn-secondary" id="btnSaveIspConfig"><i class="fa fa-save"></i> Save
Configuration</a>
<button type="button" class="btn btn-sm btn-primary" id="btnSaveNetDevices"><i
<button type="button" class="btn btn-sm btn-secondary" id="btnSaveNetDevices"><i
class="fa fa-save"></i> Save network.json and ShapedDevices.csv
</button>
</div>
@ -566,19 +566,20 @@
<h2><i class="fa fa-map"></i> Network.Json - Network Layout</h2>
<h3>Network Adjustment Options</h3>
<div>
<button type="button" class="btn btn-danger" id="btnFlattenNetwork"><i
class="fa fa-warning"></i> Flatten Network
</button>
</div>
<div style="margin-top: 8px;">
<strong>Add Node to Root</strong>
<input type="text" value="" placeholder="New Node Name" id="njsNewNodeName"/> <br/>
<input type="number" min="1" max="100000" placeholder="Max Download" id="njsNewNodeDown"/> <br/>
<input type="number" min="1" max="100000" placeholder="Max Upload" id="njsNewNodeUp"/> <br/>
<button type="button" class="btn btn-primary" id="btnAddNetworkNode"><i
class="fa fa-plus"></i> Add Node to Root
</button>
<div class="row">
<div class="col-3">
<button type="button" class="btn btn-outline-danger" id="btnFlattenNetwork"><i
class="fa fa-warning"></i> Flatten Network
</button>
</div>
<div style="margin-top: 8px;" class="col-3">
<input type="text" value="" placeholder="New Node Name" id="njsNewNodeName"/> <br/>
<input type="number" min="1" max="100000" placeholder="Max Download" id="njsNewNodeDown"/> <br/>
<input type="number" min="1" max="100000" placeholder="Max Upload" id="njsNewNodeUp"/> <br/>
<button type="button" class="btn btn-outline-success" id="btnAddNetworkNode"><i
class="fa fa-plus"></i> Add Node to Root
</button>
</div>
</div>
<hr/>
@ -591,7 +592,7 @@
<h2><i class="fa table"></i> Shaped Devices</h2>
<p>All Shaped Devices. Note that if you have an integration enabled, this will be overwritten
periodically.</p>
<button type="button" class="btn btn-sm btn-success" onclick="window.newSdRow()"><i class="fa fa-plus"></i>
<button type="button" class="btn btn-sm btn-secondary" onclick="window.newSdRow()"><i class="fa fa-plus"></i>
Add Row
</button>

View File

@ -90,6 +90,9 @@ body {
font-size: 9pt;
text-overflow: ellipsis;
}
h2 {
color: var(--bs-secondary-text-emphasis)
}
h5 {
color: var(--bs-secondary-text-emphasis)
}