Dynamically size device headers colspan
Noah Zalev committed
Jul 29, 2021 at 11:56 UTC
e13958d4f46aeafe0b398dcd1fd90751a9660255
1 file changed
+3
-3
views/default.handlebars
+3
-3
@@ -3794,7 +3794,7 @@
3794
if (((view == 1) || (view == 3) || (view == 5)) && (current != null)) { r += '</div>'; } // Close collapse div
3795
deviceHeaderSet();
3796
var extra = '';
3797
- if (view == 2) { r += '<tr><td colspan=99>'; }
3797
+ if (view == 2) { r += '<tr><td colspan=' + (deviceViewSettings.devsCols.length + 1) + '>'; }
3798
if (meshes[node.meshid] && (meshes[node.meshid].mtype == 1)) { extra = '<span class=devHeaderx>' + ", Intel® AMT only" + '</span>'; }
3799
if (meshes[node.meshid] && (meshes[node.meshid].mtype == 3)) { extra = '<span class=devHeaderx>' + ", Local Devices" + '</span>'; }
3800
if ((view == 1) && (current != null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
@@ -3826,7 +3826,7 @@
3826
deviceHeaderSet();
3827
if ((view == 1) && (current !== null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
3828
3829
- if (view == 2) { r += '<tr><td colspan=5>'; }
3829
+ if (view == 2) { r += '<tr><td colspan=' + (deviceViewSettings.devsCols.length + 1) + '>'; }
3830
r += '<div class=DevSt style=width:100%;padding-top:4px><span id=DevxHeader' + deviceHeaderId + ' class=devHeaderx style=float:right></span>';
3831
if ((view == 1) || (view == 2) || (view == 3) || (view == 5)) {
3832
var collapsed = CollapsedGroups['pwr:' + pwr];
@@ -3903,7 +3903,7 @@
3903
for (var j in groupNames) {
3904
var i = groupNames[j];
3905
if (view == 2) {
3906
- r += '<tr><td colspan=4><div class=DevSt style=width:100%;padding-top:4px>';
3906
+ r += '<tr><td colspan=' + (deviceViewSettings.devsCols.length + 1) + '><div class=DevSt style=width:100%;padding-top:4px>';
3907
var collapsed = CollapsedGroups['tag:' + encodeURIComponentEx(i)];
3908
r += '<img class=collapseImage cmenu=expandAllContextMenu id="DevxColImg' + tagDeviceHeaderId + '" src=images/c' + ((collapsed === true)?'1':'2') + '.png height=8 width=8 style=margin-left:2px;margin-right:2px;cursor:pointer onclick=toggleCollapseGroup("' + tagDeviceHeaderId + '","tag:' + encodeURIComponentEx(i) + '",2)></img>'; // Collapse action
3909
r += '<span class=devHeaderx style=float:right>' + groupCount[i] + ' node' + ((groupCount[i] > 1) ? 's' : '') + '</span><span>' + EscapeHtml(i).split('|').join(' → ').split('**INDV*~*DEVS**').join('<i>' + "Individual Devices" + '</i>') + '</span></div>' + groups[i];