MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for #2967

This commit is contained in:
Ylian Saint-Hilaire 2021-07-30 02:11:51 -07:00
parent 1cbb697d51
commit bb88f9cc2f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
translate/translate.json
View File

@ -756,7 +756,7 @@
"fi": ", vain Intel® AMT",
"fr": ", Intel® AMT uniquement",
"hi": ", Intel® AMT केवल",
"it": ", Intel & reg; Solo AMT",
"it": ", Intel® Solo AMT",
"ja": "、Intel® AMTのみ",
"ko": ", Intel® AMT 만",
"nl": ", Intel® AMT alleen",

13
views/default.handlebars
View File

@ -3781,6 +3781,13 @@
var deviceBoxWidth = Math.floor(totalDeviceViewWidth / 301);
deviceBoxWidth = 301 + Math.floor((totalDeviceViewWidth - (deviceBoxWidth * 301)) / deviceBoxWidth);
// Compute number of colums
var colcount = 4;
if (deviceViewSettings && deviceViewSettings.devsCols) {
colcount = deviceViewSettings.devsCols.length + 1;
if (deviceViewSettings.devsCols.indexOf('desc') >= 0) { colcount--; } // Description is not an extra column.
}
// Go thru the list of nodes and display them
for (var i in nodes) {
var node = nodes[i];
@ -3794,7 +3801,7 @@
if (((view == 1) || (view == 3) || (view == 5)) && (current != null)) { r += '</div>'; } // Close collapse div
deviceHeaderSet();
var extra = '';
if (view == 2) { r += '<tr><td colspan=' + (deviceViewSettings.devsCols.length + 1) + '>'; }
if (view == 2) { r += '<tr><td colspan=' + colcount + '>'; }
if (meshes[node.meshid] && (meshes[node.meshid].mtype == 1)) { extra = '<span class=devHeaderx>' + ", Intel&reg; AMT only" + '</span>'; }
if (meshes[node.meshid] && (meshes[node.meshid].mtype == 3)) { extra = '<span class=devHeaderx>' + ", Local Devices" + '</span>'; }
if ((view == 1) && (current != null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
@ -3826,7 +3833,7 @@
deviceHeaderSet();
if ((view == 1) && (current !== null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
if (view == 2) { r += '<tr><td colspan=' + (deviceViewSettings.devsCols.length + 1) + '>'; }
if (view == 2) { r += '<tr><td colspan=' + colcount + '>'; }
r += '<div class=DevSt style=width:100%;padding-top:4px><span id=DevxHeader' + deviceHeaderId + ' class=devHeaderx style=float:right></span>';
if ((view == 1) || (view == 2) || (view == 3) || (view == 5)) {
var collapsed = CollapsedGroups['pwr:' + pwr];
@ -3903,7 +3910,7 @@
for (var j in groupNames) {
var i = groupNames[j];
if (view == 2) {
r += '<tr><td colspan=' + (deviceViewSettings.devsCols.length + 1) + '><div class=DevSt style=width:100%;padding-top:4px>';
r += '<tr><td colspan=' + colcount + '><div class=DevSt style=width:100%;padding-top:4px>';
var collapsed = CollapsedGroups['tag:' + encodeURIComponentEx(i)];
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
r += '<span class=devHeaderx style=float:right>' + groupCount[i] + ' node' + ((groupCount[i] > 1) ? 's' : '') + '</span><span>' + EscapeHtml(i).split('|').join(' &rarr; ').split('**INDV*~*DEVS**').join('<i>' + "Individual Devices" + '</i>') + '</span></div>' + groups[i];