+
@@ -1420,6 +1420,8 @@
QV('p31title', !(hide & 8));
QV('p40title', !(hide & 8));
QV('p41title', !(hide & 8));
+ QV('p50title', !(hide & 8));
+ QV('p51title', !(hide & 8));
//if (hide & 16) { QV('page_leftbar', false); QS('page_content').left = '0px'; }
if (!footerBar) { QC('body').add('nofooter'); } else { QC('body').remove('nofooter'); }
@@ -4919,9 +4921,10 @@
currentNode = node;
// Add node name
- var nname = EscapeHtml(node.name);
+ var nname = EscapeHtml(node.name), nnameEx;
if (nname.length == 0) { nname = '
' + "None" + ''; }
if (((meshrights & 4) != 0) && ((!mesh.flags) || ((mesh.flags & 2) == 0))) { nname = '
' + nname + ' 
'; }
+ nnameEx = nname;
if (mesh) { nname += '
- ' + EscapeHtml(mesh.name) + ''; }
QH('p10deviceName', nname);
QH('p11deviceName', nname);
@@ -4936,11 +4939,14 @@
// Node attributes
var x = '
';
+ // If title bar is hidden, display the device name here
+ if ((args.hide & 8) != 0) { x += '
' + addDeviceAttribute("Name", nnameEx); }
+
// Attribute: Mesh
if (mesh) { x += addDeviceAttribute('' + "Group" + '', '' + EscapeHtml(meshes[node.meshid].name) + ''); }
// Attribute: Name
- if ((node.rname != null) && (node.name != node.rname)) { x += addDeviceAttribute('' + "Name" + '', '' + EscapeHtml(node.rname) + ''); }
+ if ((node.rname != null) && (node.name != node.rname)) { x += addDeviceAttribute('' + "OS Name" + '', '' + EscapeHtml(node.rname) + ''); }
// Attribute: Host
if ((features & 1) == 0) { // If not WAN-only, local hostname is in use
@@ -8461,7 +8467,9 @@
if (currentMesh.mtype == 1) meshtype = "Intel® AMT only, no agent";
if (currentMesh.mtype == 2) meshtype = "Managed using a software agent";
- var x = addHtmlValue("Description", addLinkConditional(((currentMesh.desc && currentMesh.desc != '')?EscapeHtml(currentMesh.desc):('' + "None" + '')), 'p20editmesh(2)', (meshrights & 1) != 0));
+ var x = '';
+ if ((args.hide & 8) != 0) { x += addHtmlValue("Name", mname); } // If title bar is hidden, display the mesh name here
+ x += addHtmlValue("Description", addLinkConditional(((currentMesh.desc && currentMesh.desc != '')?EscapeHtml(currentMesh.desc):('' + "None" + '')), 'p20editmesh(2)', (meshrights & 1) != 0));
// Display group type
x += addHtmlValue("Type", meshtype);
@@ -10458,6 +10466,7 @@
if ((desc == null) || (desc == '')) { desc = '' + "None" + ''; } else { desc = EscapeHtml(desc); }
var x = '';
+ if ((args.hide & 8) != 0) { x += '
' + addDeviceAttribute("Name", gname); } // If title bar is hidden, display the user group name here
if ((userinfo.siteadmin & 256) != 0) {
x += addDeviceAttribute("Description", '' + desc + ' ');
} else {
@@ -10737,6 +10746,7 @@
// Show user attributes
var x = '';
+ if ((args.hide & 8) != 0) { x += '
' + addDeviceAttribute("Name", user.name); } // If title bar is hidden, display the user name here
var email = user.email?EscapeHtml(user.email):'' + "Not set" + '', everify = '';
if (serverinfo.emailcheck) { everify = ((user.emailVerified == true) ? '✓ ' : '✗ '); }
if (user.name.toLowerCase() != user._id.split('/')[2]) { x += addDeviceAttribute("User Identifier", user._id.split('/')[2]); }