b398cb7f · cryptotaxi247/MeshCentral

@@ -943,54 +943,43 @@

943 <div id="p11numlock" style="display:inline-block;margin-left:1px;border-radius:5px;background-color:#A3FFB8;padding:2px">NUM</div>

944 </div>

945 <div id=deskarea0 cellpadding=0 cellspacing=0>

946 - <div id=deskarea1 class="areaHead">

947 - <div class="toright2">

948 - <div id="idx_deskFullBtn2" onclick=deskToggleFull(event) style="float:right"> ✖</div>

949 - <span id="p11power"></span> 

950 - <div class='deskareaicon' title="Toggle View Mode" onclick="toggleAspectRatio(1)">⇲</div>

951 - <div class='deskareaicon' title="Rotate Left" onclick="drotate(-1)"><i class="fa-solid fa-rotate-left"></i></div>

952 - <div class='deskareaicon' title="Rotate Right" onclick="drotate(1)"><i class="fa-solid fa-rotate-right"></i></div>

953 - <div id="deskRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px"></div>

954 - <input id="deskFocusBtn" type="button"

955 - title="Toggle focus mode, when active only the region around the mouse is updated"

956 - onkeypress="return false" onkeydown="return false" value="Focus All"

957 - onclick="deskToggleFocus()" style="margin-right:3px;display:none" />

958 - <input id="deskActionsBtn" type=button class="btn btn-outline-primary btn-sm m-1"

959 - title="Perform power actions on the device" onkeypress="return false"

960 - onkeydown="return false" value=Actions onclick=deviceActionFunction() class="mR" />

961 - <input id="deskActionsSettings" type="button" class="btn btn-outline-primary btn-sm m-1"

962 - value="Settings..." title="Edit remote desktop settings" onkeypress="return false"

963 - onkeydown="return false" onclick="showDesktopSettings()" class="mR" />

964 - <input type="button" class="btn btn-outline-primary btn-sm m-1"

965 - title="Change the power state of the remote machine" onkeypress="return false"

966 - onkeydown="return false" value="Power Actions..." onclick="showPowerActionDlg()"

967 - style="display:none" />

968 - <div id="desktopCustomUpperRight" style="float:left;margin-right:6px"></div>

969 - <div id="desktopCustomUiButtons" style="float:left"></div>

970 - </div>

971 - <div>

972 - <input type="button" class="btn btn-outline-primary btn-sm m-1" id="autoconnectbutton1"

946 + <div id=deskarea1 class="areaHead d-flex flex-wrap">

947 + <div class="d-flex align-items-center">

948 + <input type="button" class="btn btn-outline-primary btn-sm mx-1" id="autoconnectbutton1"

949 value="AutoConnect" onclick=autoConnectDesktop(event) onkeypress="return false"

950 onkeydown="return false" style="display:none;margin-right:4px" />

975 - <span id=connectbutton1span><button class="btn btn-primary btn-sm me-2" type=button

951 + <span id=connectbutton1span><button class="btn btn-primary btn-sm mx-1" type=button

952 id=connectbutton1 cmenu="deskConnectButton"

953 title="Connect using MeshAgent remote desktop" onclick=connectDesktop(event,3)

954 onkeypress="return false" onkeydown="return false" disabled="disabled"><i

955 class="fa-solid fa-circle-play"></i> Connect</button></span>

980 - <span id=connectbutton1rspan><button class="btn btn-primary btn-sm me-2" type=button

956 + <span id=connectbutton1rspan><button class="btn btn-primary btn-sm mx-1" type=button

957 id=connectbutton1r cmenu="altPortContextMenu" title="Connect using RDP"

958 onclick=askRdpCredentials() onkeypress="return false" onkeydown="return false"

959 disabled="disabled"><i class="fa-solid fa-circle-play"></i> RDP Connect</button></span>

984 - <span id=connectbutton1hspan><button class="btn btn-primary btn-sm me-2" type=button

960 + <span id=connectbutton1hspan><button class="btn btn-primary btn-sm mx-1" type=button

961 id=connectbutton1h title="Connect using hardware KVM"

962 onclick=connectDesktop(event,2) onkeypress="return false" onkeydown="return false"

963 disabled="disabled"><i class="fa-solid fa-circle-play"></i> HW Connect</button></span>

988 - <span id=disconnectbutton1span><button class="btn btn-primary btn-sm me-2" type=button

964 + <span id=disconnectbutton1span><button class="btn btn-primary btn-sm mx-1" type=button

965 id=disconnectbutton1 cmenu="deskDisconnectButton" value="Disconnect"

966 onclick=connectDesktop(event,0) onkeypress="return false"

967 onkeydown="return false"><i class="fa-solid fa-power-off"></i> Disconnect</button></span>

992 - <span id="deskstatus" style="line-height:22px">Disconnected</span><span

993 - id="deskmetadata"></span>

968 + <span id="deskstatus" style="line-height:22px">Disconnected</span><span id="deskmetadata"></span>

969 + </div>

970 + <div class="d-flex align-items-center ms-auto">

971 + <div id="desktopCustomUiButtons" style="float:left"></div>

972 + <div id="desktopCustomUpperRight" style="float:left;margin-right:6px"></div>

973 + <input type="button" class="btn btn-outline-primary btn-sm" title="Change the power state of the remote machine" onkeypress="return false" onkeydown="return false" value="Power Actions..." onclick="showPowerActionDlg()" style="display:none" />

974 + <input id="deskActionsBtn" type=button class="btn btn-outline-primary btn-sm mx-1" title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() class="mR" />

975 + <input id="deskActionsSettings" type="button" class="btn btn-outline-primary btn-sm mx-1" value="Settings" title="Edit remote desktop settings" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" class="mR" />

976 + <input id="deskFocusBtn" type="button" title="Toggle focus mode, when active only the region around the mouse is updated" onkeypress="return false" onkeydown="return false" value="Focus All" onclick="deskToggleFocus()" style="margin-right:3px;display:none" />

977 + <div id="deskRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px"></div>

978 + <div class='deskareaicon' title="Rotate Right" onclick="drotate(1)"><i class="fa-solid fa-rotate-right"></i></div>

979 + <div class='deskareaicon' title="Rotate Left" onclick="drotate(-1)"><i class="fa-solid fa-rotate-left"></i></div>

980 + <div class='deskareaicon' title="Toggle View Mode" onclick="toggleAspectRatio(1)">⇲</div>

981 + <span id="p11power"></span> 

982 + <div id="idx_deskFullBtn2" onclick=deskToggleFull(event) style="float:right"> ✖</div>

983 </div>

984 </div>

985 <div id=deskarea3x>

@@ -1036,73 +1025,62 @@

1025 style="display:none;position:absolute;left:30px;top:17px;right:30px;bottom:17px;overflow-y:auto">

1026 </div>

1027 </div>

1039 - <div id=deskarea4 class="areaFoot">

1040 - <div class="toright2">

1041 - <span id="DeskLatency" style="line-height:22px;width:50px" title="Desktop Session Latency"></span>

1042 - <span id="DeskTimer" style="line-height:22px" title="Session time"></span>

1043 - <input id=DeskToolsButton type=button class="btn btn-outline-primary btn-sm m-1" value=Tools title="Toggle tools view" onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()" />

1044 - <span> </span>

1045 - <span id=DeskRunButton cmenu="deskPreConfigScriptContextMenu" class="deskarea" title="Run a script on this computer" role="button">

1046 - <i class="fa-solid fa-fw fa-play" onclick=runDeviceCmd()></i>

1047 - </span>

1048 - <span id=DeskChatButton class="deskarea" title="Open chat window to this computer" role="button">

1049 - <i class="fa-solid fa-fw fa-message" onclick=deviceChat(event)></i>

1028 + <div id=deskarea4 class="areaFoot d-flex flex-wrap">

1029 + <div class="d-flex align-items-center">

1030 + <select id="deskkeys" class="form-select-sm mx-1" cmenu=deskKeyShortcutContextMenu></select>

1031 + <input id="DeskWD" type=button class="btn btn-outline-primary btn-sm mx-1" value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()" />

1032 + <input id="DeskESC" style="display:none" type="button" class="btn btn-outline-primary btn-sm mx-1" value="ESC" onkeypress="return false" onkeydown="return false" onclick="sendDeskEsc()" />

1033 + <input id="DeskClip" type="button" class="btn btn-outline-primary btn-sm mx-1" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()" />

1034 + <input id="DeskType" class="btn btn-outline-primary btn-sm mx-1" cmenu="deskPreConfigShortcutContextMenu" type="button" value="Type" onkeypress="return false" onkeydown="return false" onclick="showDeskType()" />

1035 + <label><span id="DeskControlSpan" title="Toggle mouse and keyboard input"><input id="DeskControl" type="checkbox" class="form-check-input" onkeypress="return false" onkeydown="return false" onclick="toggleKvmControl()" />Input</span></label> 

1036 + </div>

1037 + <div class="d-flex ms-auto align-items-center">

1038 + <span id=DeskMonitorSelectionSpan></span>

1039 + <span id="DeskLatency" style="width:70px" class="text-center" title="Desktop Session Latency"></span>

1040 + <span id="DeskTimer" style="width:70px" class="text-center" title="Session time"></span>

1041 + <input id=DeskToolsButton type=button class="btn btn-outline-primary btn-sm mx-1" value=Tools title="Toggle tools view" onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()" />

1042 + <span id=DeskGuestShareButton title="Share the device with a guest" role="button">

1043 + <i class="fa-solid fa-fw fa-share-nodes" id=DeskInputUnLockedButtonImage onclick=showShareDevice()></i>

1044 </span>

1051 - <span id=DeskNotifyButton title="Display a notification on the remote computer" role="button">

1052 - <i class="fa-solid fa-fw fa-bell" onclick=deviceToastFunction()></i>

1045 + <span id=DeskInputUnLockedButton title="Remote input is unlocked" role="button">

1046 + <i class="fa-solid fa-fw fa-keyboard" onclick=deskInputLockFunction(1)></i>

1047 </span>

1054 - <span id=DeskLockButton title="Lock the remote computer" role="button">

1055 - <i class="fa-solid fa-fw fa-lock" onclick=deviceLockFunction()></i>

1048 + <span id=DeskInputLockedButton title="Remote input is locked" role="button">

1049 + <i class="fa-solid fa-fw fa-keyboard" style=color:red onclick=deskInputLockFunction(0)></i>

1050 </span>

1057 - <span id=DeskOpenWebButton title="Open a web address on the remote computer" role="button">

1058 - <i class="fa-solid fa-fw fa-globe" onclick=deviceUrlFunction()></i>

1051 + <span id=DeskRefreshButton title="Refresh the desktop" role="button">

1052 + <i class="fa-solid fa-fw fa-rotate" onclick=deskRefreshFunction()></i>

1053 </span>

1060 - <span id=DeskBackgroundButton title="Toggle remote desktop background" role="button">

1061 - <i class="fa-solid fa-fw fa-image" onclick=deviceToggleBackground(event) id=DeskBackgroundButtonImage >></i>

1054 + <span id=DeskClipboardOutButton title="Upload local clipboard to remote device" role="button">

1055 + <i class="fa-solid fa-fw fa-up-long" data-fa-transform="shrink-9 down-4" data-fa-mask="fa-solid fa-clipboard" onclick=deskClipboardOutFunction()></i>

1056 </span>

1063 - <span id=DeskSaveImageButton title="Save a screenshot of the remote desktop" role="button">

1064 - <i class="fa-solid fa-fw fa-camera" onclick=deskSaveImage()></i>

1057 + <span id=DeskClipboardInButton title="Download remote clipboard to local clipboard" style="display:none" role="button">

1058 + <i class="fa-solid fa-fw fa-down-long" data-fa-transform="shrink-9 down-4" data-fa-mask="fa-solid fa-clipboard" onclick=deskClipboardInFunction()></i>

1059 </span>

1060 <span id=DeskRecordButton cmenu=deskPlayerContextMenu title="Record remote desktop session to file" style="display:none" role="button">

1061 <i class="fa-solid fa-fw fa-video" onclick=deskRecordSession() id=DeskRecordButtonImage></i>

1062 </span>

1069 - <span id=DeskClipboardInButton title="Download remote clipboard to local clipboard" style="display:none">

1070 - <i class="fa-solid fa-fw fa-down-long" data-fa-transform="shrink-9 down-4" data-fa-mask="fa-solid fa-clipboard" onclick=deskClipboardInFunction()></i>

1063 + <span id=DeskSaveImageButton title="Save a screenshot of the remote desktop" role="button">

1064 + <i class="fa-solid fa-fw fa-camera" onclick=deskSaveImage()></i>

1065 </span>

1072 - <span id=DeskClipboardOutButton title="Upload local clipboard to remote device">

1073 - <i class="fa-solid fa-fw fa-up-long" data-fa-transform="shrink-9 down-4" data-fa-mask="fa-solid fa-clipboard" onclick=deskClipboardOutFunction()></i>

1066 + <span id=DeskBackgroundButton title="Toggle remote desktop background" role="button">

1067 + <i class="fa-solid fa-fw fa-image" onclick=deviceToggleBackground(event) id=DeskBackgroundButtonImage></i>

1068 </span>

1075 - <span id=DeskRefreshButton title="Refresh the desktop" role="button">

1076 - <i class="fa-solid fa-fw fa-rotate" onclick=deskRefreshFunction()></i>

1069 + <span id=DeskOpenWebButton title="Open a web address on the remote computer" role="button">

1070 + <i class="fa-solid fa-fw fa-globe" onclick=deviceUrlFunction()></i>

1071 </span>

1078 - <span id=DeskInputLockedButton title="Remote input is locked">

1079 - <i class="fa-solid fa-fw fa-keyboard" style=color:red onclick=deskInputLockFunction(0)></i>

1072 + <span id=DeskLockButton title="Lock the remote computer" role="button">

1073 + <i class="fa-solid fa-fw fa-lock" onclick=deviceLockFunction()></i>

1074 </span>

1081 - <span id=DeskInputUnLockedButton title="Remote input is unlocked" role="button">

1082 - <i class="fa-solid fa-fw fa-keyboard" onclick=deskInputLockFunction(1)></i>

1075 + <span id=DeskNotifyButton title="Display a notification on the remote computer" role="button">

1076 + <i class="fa-solid fa-fw fa-bell" onclick=deviceToastFunction()></i>

1077 </span>

1084 - <span id=DeskGuestShareButton title="Share the device with a guest">

1085 - <i class="fa-solid fa-fw fa-share-nodes" id=DeskInputUnLockedButtonImage onclick=showShareDevice()></i>

1078 + <span id=DeskChatButton class="deskarea" title="Open chat window to this computer" role="button">

1079 + <i class="fa-solid fa-fw fa-message" onclick=deviceChat(event)></i>

1080 + </span>

1081 + <span id=DeskRunButton cmenu="deskPreConfigScriptContextMenu" class="deskarea" title="Run a script on this computer" role="button">

1082 + <i class="fa-solid fa-fw fa-play" onclick=runDeviceCmd()></i>

1083 </span>

1087 - </div>

1088 - <div class="toright2"><span id=DeskMonitorSelectionSpan></span></div>

1089 - <div>

1090 - <select id="deskkeys" class="form-select-sm me-2" cmenu=deskKeyShortcutContextMenu></select>

1091 - <input id="DeskWD" type=button class="btn btn-outline-primary btn-sm m-1" value="Send"

1092 - onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()" />

1093 - <input id="DeskESC" style="display:none" type="button"

1094 - class="btn btn-outline-primary btn-sm m-1" value="ESC" onkeypress="return false"

1095 - onkeydown="return false" onclick="sendDeskEsc()" />

1096 - <input id="DeskClip" type="button" class="btn btn-outline-primary btn-sm m-1"

1097 - value="Clipboard" onkeypress="return false" onkeydown="return false"

1098 - onclick="showDeskClip()" />

1099 - <input id="DeskType" class="btn btn-outline-primary btn-sm m-1"

1100 - cmenu="deskPreConfigShortcutContextMenu" type="button" value="Type"

1101 - onkeypress="return false" onkeydown="return false" onclick="showDeskType()" />

1102 - <label><span id="DeskControlSpan" title="Toggle mouse and keyboard input"><input

1103 - id="DeskControl" type="checkbox" class="form-check-input me-2"

1104 - onkeypress="return false" onkeydown="return false"

1105 - onclick="toggleKvmControl()" />Input</span></label> 

1084 </div>

1085 </div>

1086 </div>

@@ -3495,13 +3473,13 @@

3473 var splitip = currentNode.lastaddr.split(':');

3474 if (splitip.length > 2) {

3475 // IPv6

3498 - x += addHtmlValue2("Last agent address", currentNode.lastaddr + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(currentNode.lastaddr) + '") width=10 height=10>');

3476 + x += addHtmlValue2("Last agent address", currentNode.lastaddr + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(currentNode.lastaddr) + '")></i>');

3477 } else {

3478 // IPv4

3479 if (isPrivateIP(currentNode.lastaddr)) {

3502 - x += addHtmlValue2("Last agent address", splitip[0] + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(splitip[0]) + '") width=10 height=10>');

3480 + x += addHtmlValue2("Last agent address", splitip[0] + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(splitip[0]) + '")></i>');

3481 } else {

3504 - x += addHtmlValue2("Last agent address", '<a href="https://iplocation.com/?ip=' + splitip[0] + '" rel="noreferrer noopener" target="MeshIPLoopup">' + splitip[0] + '</a> <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(splitip[0]) + '") width=10 height=10>');

3482 + x += addHtmlValue2("Last agent address", '<a href="https://iplocation.com/?ip=' + splitip[0] + '" rel="noreferrer noopener" target="MeshIPLoopup">' + splitip[0] + '</a> <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(splitip[0]) + '")></i>');

3483 }

3484 }

3485 }

@@ -3514,12 +3492,12 @@

3492 x += '<hr />'

3493 if (net.name) { x += addHtmlValue2("Name", '<b>' + EscapeHtml(net.name) + '</b>'); }

3494 if (net.desc) { x += addHtmlValue2("Description", EscapeHtml(net.desc).replace('(R)', '®').replace('(r)', '®')); }

3517 - if (net.dnssuffix) { x += addHtmlValue2("DNS suffix", EscapeHtml(net.dnssuffix) + ' <img src="images/link4.png" title="' + "Copy name to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(net.dnssuffix) + '") width=10 height=10>'); }

3518 - if (net.mac) { x += addHtmlValue2("MAC address", '<a href="https://dnslytics.com/mac-address-lookup/' + net.mac.substring(0, 6) + '" rel="noreferrer noopener" target="MeshMACLoopup">' + EscapeHtml(net.mac.toLowerCase()) + '</a> <img src="images/link4.png" title="' + "Copy MAC address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(net.mac.toLowerCase()) + '") width=10 height=10>'); }

3519 - if (net.v4addr) { x += addHtmlValue2("IPv4 address", EscapeHtml(net.v4addr) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(net.v4addr) + '") width=10 height=10>'); }

3520 - if (net.v4mask) { x += addHtmlValue2("IPv4 mask", EscapeHtml(net.v4mask) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(net.v4mask) + '") width=10 height=10>'); }

3521 - if (net.v4gateway) { x += addHtmlValue2("IPv4 gateway", EscapeHtml(net.v4gateway) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(net.v4gateway) + '") width=10 height=10>'); }

3522 - if (net.gatewaymac) { x += addHtmlValue2("Gateway MAC", '<a href="https://dnslytics.com/mac-address-lookup/' + net.gatewaymac.substring(0, 6) + '" rel="noreferrer noopener" target="MeshMACLoopup">' + EscapeHtml(net.gatewaymac.toLowerCase()) + '</a> <img src="images/link4.png" title="' + "Copy MAC address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(net.gatewaymac.toLowerCase()) + '") width=10 height=10>'); }

3495 + if (net.dnssuffix) { x += addHtmlValue2("DNS suffix", EscapeHtml(net.dnssuffix) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy name to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(net.dnssuffix) + '")></i>'); }

3496 + if (net.mac) { x += addHtmlValue2("MAC address", '<a href="https://dnslytics.com/mac-address-lookup/' + net.mac.substring(0, 6) + '" rel="noreferrer noopener" target="MeshMACLoopup">' + EscapeHtml(net.mac.toLowerCase()) + '</a> <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy MAC address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(net.mac.toLowerCase()) + '")></i>'); }

3497 + if (net.v4addr) { x += addHtmlValue2("IPv4 address", EscapeHtml(net.v4addr) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(net.v4addr) + '")></i>'); }

3498 + if (net.v4mask) { x += addHtmlValue2("IPv4 mask", EscapeHtml(net.v4mask) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(net.v4mask) + '")></i>'); }

3499 + if (net.v4gateway) { x += addHtmlValue2("IPv4 gateway", EscapeHtml(net.v4gateway) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(net.v4gateway) + '")></i>'); }

3500 + if (net.gatewaymac) { x += addHtmlValue2("Gateway MAC", '<a href="https://dnslytics.com/mac-address-lookup/' + net.gatewaymac.substring(0, 6) + '" rel="noreferrer noopener" target="MeshMACLoopup">' + EscapeHtml(net.gatewaymac.toLowerCase()) + '</a> <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy MAC address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(net.gatewaymac.toLowerCase()) + '")></i>'); }

3501 }

3502 } else if (message.netif2 != null) {

3503 // New style

@@ -3528,18 +3506,18 @@

3506 if ((Array.isArray(net) == false) || (net.length < 1) || (net[0] == null) || ((typeof net[0].mac == 'string') && (net[0].mac.startsWith('00:00:00:00')))) continue;

3507 x += '<hr />'

3508 x += addHtmlValue2("Name", '<b>' + EscapeHtml(i) + '</b>');

3531 - if (typeof net[0].mac == 'string') { x += addHtmlValue2("MAC address", '<a href="https://dnslytics.com/mac-address-lookup/' + net[0].mac.split(':').join('').substring(0, 6) + '" rel="noreferrer noopener" target="MeshMACLoopup">' + EscapeHtml(net[0].mac.toLowerCase()) + '</a> <img src="images/link4.png" title="' + "Copy MAC address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(net[0].mac.toLowerCase()) + '") width=10 height=10>'); }

3509 + if (typeof net[0].mac == 'string') { x += addHtmlValue2("MAC address", '<a href="https://dnslytics.com/mac-address-lookup/' + net[0].mac.split(':').join('').substring(0, 6) + '" rel="noreferrer noopener" target="MeshMACLoopup">' + EscapeHtml(net[0].mac.toLowerCase()) + '</a> <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy MAC address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(net[0].mac.toLowerCase()) + '")></i>'); }

3510 if (net[0].fqdn) { x += addHtmlValue2("FQDN", net[0].fqdn); }

3511 for (var j = 0; j < net.length; j++) {

3512 var netif = net[j];

3513 if (netif.family == 'IPv6') {

3536 - if (netif.address) { x += addHtmlValue2("IPv6 address", EscapeHtml(netif.address) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.address) + '") width=10 height=10>'); }

3537 - if (netif.netmask) { x += addHtmlValue2("IPv6 mask", EscapeHtml(netif.netmask) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.netmask) + '") width=10 height=10>'); }

3538 - if (netif.gateway) { x += addHtmlValue2("IPv6 gateway", EscapeHtml(netif.gateway) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.gateway) + '") width=10 height=10>'); }

3514 + if (netif.address) { x += addHtmlValue2("IPv6 address", EscapeHtml(netif.address) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.address) + '")></i>'); }

3515 + if (netif.netmask) { x += addHtmlValue2("IPv6 mask", EscapeHtml(netif.netmask) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.netmask) + '")></i>'); }

3516 + if (netif.gateway) { x += addHtmlValue2("IPv6 gateway", EscapeHtml(netif.gateway) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.gateway) + '")></i>'); }

3517 } else if (netif.family == 'IPv4') {

3540 - if (netif.address) { x += addHtmlValue2("IPv4 address", EscapeHtml(netif.address) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.address) + '") width=10 height=10>'); }

3541 - if (netif.netmask) { x += addHtmlValue2("IPv4 mask", EscapeHtml(netif.netmask) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.netmask) + '") width=10 height=10>'); }

3542 - if (netif.gateway) { x += addHtmlValue2("IPv4 gateway", EscapeHtml(netif.gateway) + ' <img src="images/link4.png" title="' + "Copy address to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.gateway) + '") width=10 height=10>'); }

3518 + if (netif.address) { x += addHtmlValue2("IPv4 address", EscapeHtml(netif.address) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.address) + '")></i>'); }

3519 + if (netif.netmask) { x += addHtmlValue2("IPv4 mask", EscapeHtml(netif.netmask) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.netmask) + '")></i>'); }

3520 + if (netif.gateway) { x += addHtmlValue2("IPv4 gateway", EscapeHtml(netif.gateway) + ' <i class="fa-fw fa-regular fa-clipboard fa-sm" role=button title="' + "Copy address to clipboard" + '" onclick=copyTextToClip2("' + encodeURIComponentEx(netif.gateway) + '")></i>'); }

3521 }

3522 }

3523 }

@@ -6448,9 +6426,11 @@

6426 // Set the modal body content based on the bodyContent Type

6427 if (typeof bodyContent == 'number') {

6428 for (var i = 1; i < 24; i++) { QV('dialog' + i, i == bodyContent); } // Edit this line when more dialogs are added

6429 + xxdialogMode = i;

6430 } else if (typeof bodyContent == 'string'){

6431 Q('dialog2').innerHTML = bodyContent;

6432 for (var i = 1; i < 24; i++) { QV('dialog' + i, i == 2); } // Edit this line when more dialogs are added

6433 + xxdialogMode = 2;

6434 }

6435 // If size is provided, set the modal size class

6436 if (size) {

@@ -9858,49 +9838,52 @@

9838 var d2map = null;

9839 function p10showNodeLocationDialog() {

9840 if ((xxdialogMode != null) && (xxdialogTag == '@xxmap')) { setDialogMode(0); } else { if (xxdialogMode) return false; }

9861 - var markers = [], types = ['iploc', 'wifiloc', 'gpsloc', 'userloc'], boundingBox = null;

9841 + var showLocation = function (event) {

9842 + var markers = [], types = ['iploc', 'wifiloc', 'gpsloc', 'userloc'], boundingBox = null;

9843 +

9844 + for (var loctype in types) {

9845 + if (currentNode[types[loctype]] != null) {

9846 + var loc = currentNode[types[loctype]].split(','), lat = parseFloat(loc[0]), lon = parseFloat(loc[1]);

9847 + if ((lat < 90) && (lat > -90) && (lon < 180) && (lon > -180)) { // Check valid lat/lon

9848 + var deviceMark = new ol.Feature({ geometry: new ol.geom.Point(ol.proj.fromLonLat([lon, lat])) });

9849 + deviceMark.setStyle(markerStyle(currentNode, parseInt(loctype) + 1));

9850 + markers.push(deviceMark);

9851 +

9852 + if (boundingBox == null) { boundingBox = [lat, lon, lat, lon, 0]; } else { if (lat < boundingBox[0]) { boundingBox[0] = lat; } if (lon < boundingBox[1]) { boundingBox[1] = lon; } if (lat > boundingBox[2]) { boundingBox[2] = lat; } if (lon > boundingBox[3]) { boundingBox[3] = lon; } }

9853 + }

9854 + }

9855 + }

9856

9863 - for (var loctype in types) {

9864 - if (currentNode[types[loctype]] != null) {

9865 - var loc = currentNode[types[loctype]].split(','), lat = parseFloat(loc[0]), lon = parseFloat(loc[1]);

9866 - if ((lat < 90) && (lat > -90) && (lon < 180) && (lon > -180)) { // Check valid lat/lon

9867 - var deviceMark = new ol.Feature({ geometry: new ol.geom.Point(ol.proj.fromLonLat([lon, lat])) });

9868 - deviceMark.setStyle(markerStyle(currentNode, parseInt(loctype) + 1));

9869 - markers.push(deviceMark);

9857 + // Setup the device mark layer

9858 + var vectorSource = new ol.source.Vector({ features: markers });

9859 + var vectorLayer = new ol.layer.Vector({ source: vectorSource });

9860

9871 - if (boundingBox == null) { boundingBox = [lat, lon, lat, lon, 0]; } else { if (lat < boundingBox[0]) { boundingBox[0] = lat; } if (lon < boundingBox[1]) { boundingBox[1] = lon; } if (lat > boundingBox[2]) { boundingBox[2] = lat; } if (lon > boundingBox[3]) { boundingBox[3] = lon; } }

9872 - }

9861 + var clng = 0, clat = 0, zoom = 8;

9862 + if (boundingBox != null) {

9863 + var clat = (boundingBox[0] + boundingBox[2]) / 2;

9864 + var clng = (boundingBox[1] + boundingBox[3]) / 2;

9865 + var cscale = Math.max(Math.abs(boundingBox[0] - boundingBox[2]), Math.abs(boundingBox[1] - boundingBox[3]));

9866 + var i = 360, zoom = -2;

9867 + while (i > cscale) { zoom++; i = i / 2; }

9868 }

9874 - }

9869

9876 - // Setup the device mark layer

9877 - var vectorSource = new ol.source.Vector({ features: markers });

9878 - var vectorLayer = new ol.layer.Vector({ source: vectorSource });

9870 + if (markers.length == 1) { zoom = 8; }

9871

9872 + // Setup the map

9873 + d2map = new ol.Map({

9874 + target: 'd2map',

9875 + interactions: ol.interaction.defaults({ dragPan: false, mouseWheelZoom: false }),

9876 + layers: [new ol.layer.Tile({ source: new ol.source.OSM() }), vectorLayer],

9877 + view: new ol.View({ center: ol.proj.fromLonLat([clng, clat]), zoom: zoom })

9878 + });

9879 + document.getElementById('xxAddAgentModal').removeEventListener('shown.bs.modal', showLocation);

9880 + }

9881 + document.getElementById('xxAddAgentModal').addEventListener('shown.bs.modal', showLocation);

9882 //var x = '<div><a href="https://www.google.com/maps/preview/@' + lat + ',' + lng + ',12z" rel="noreferrer noopener" target=_blank>Open in Google maps</a></div>';

9883 var x = '<div id=d2map style=width:100%;height:300px></div>';

9884 xxdialogTag = '@xxmap';

9885 setModalContent('xxAddAgent', 'Device Location', x);

9886 showModal('xxAddAgentModal', 'idx_dlgOkButton');

9885 -

9886 - var clng = 0, clat = 0, zoom = 8;

9887 - if (boundingBox != null) {

9888 - var clat = (boundingBox[0] + boundingBox[2]) / 2;

9889 - var clng = (boundingBox[1] + boundingBox[3]) / 2;

9890 - var cscale = Math.max(Math.abs(boundingBox[0] - boundingBox[2]), Math.abs(boundingBox[1] - boundingBox[3]));

9891 - var i = 360, zoom = -2;

9892 - while (i > cscale) { zoom++; i = i / 2; }

9893 - }

9894 -

9895 - if (markers.length == 1) { zoom = 8; }

9896 -

9897 - // Setup the map

9898 - d2map = new ol.Map({

9899 - target: 'd2map',

9900 - interactions: ol.interaction.defaults({ dragPan: false, mouseWheelZoom: false }),

9901 - layers: [new ol.layer.Tile({ source: new ol.source.OSM() }), vectorLayer],

9902 - view: new ol.View({ center: ol.proj.fromLonLat([clng, clat]), zoom: zoom })

9903 - });

9887 return false;

9888 }

9889

@@ -10482,6 +10465,7 @@

10465 }

10466

10467 function askRdpCredentialsEx() {

10468 + xxdialogMode = 0;

10469 var width = null, height = null;

10470 if (desktopsettings.rdpsize) {

10471 if (desktopsettings.rdpsize == 'browser') {

@@ -11562,7 +11546,12 @@

11546 var str = displays[i], allDisplays = 1;

11547 if (str == 'All Displays') { str = "All Displays"; allDisplays = 2; } // Language translation

11548 if (str.startsWith('Display ')) { str = format("Display {0}", str.substring(8)); } // Language translation

11565 - displaySelector += '<img id=DeskMonitorSelectionX' + i + ' class="' + ((selDisplay == i) ? '' : ' gray') + '" src=\'images/icon-monitor' + allDisplays + '.png\' title="' + EscapeHtml(str) + '" onclick=deskSetDisplay(' + i + ') height=16 width=16 style=padding-top:2px;margin-left:2px />';

11549 + var maintext = 'id=DeskMonitorSelectionX' + i + ' title="' + EscapeHtml(str) + '" onclick=deskSetDisplay(' + i + ') role=button'

11550 + if (allDisplays == 2) {

11551 + displaySelector += '<span ' + maintext + ' class="fa-layers fa-fw ' + ((selDisplay == i) ? '' : ' gray') + '"><i class="fa-solid fa-desktop"></i><i class="fa-solid fa-square" data-fa-transform="shrink-12 left-3 up-3"></i><i class="fa-solid fa-square" data-fa-transform="shrink-12 right-3 up-3"></i></span>';

11552 + } else {

11553 + displaySelector += '<i ' + maintext + ' class="fa-fw fa-solid fa-desktop ' + ((selDisplay == i) ? '' : ' gray') + '"></i>';

11554 + }

11555 if ((deskPreferedStickyDisplay == i) && (selDisplay != deskPreferedStickyDisplay)) { desktop.m.SetDisplay(i); }

11556 deskPreferedStickyDisplay = -1;

11557 }

@@ -14536,13 +14525,13 @@

14525 var x = '', count = 1;

14526 if ((loginTokens != null) && (loginTokens.length > 0)) {

14527 x += '<p><strong>' + "Active Login Tokens" + '</strong> - <span id="p2createMeshLink1"> <button class="btn btn-primary btn-sm" onclick="return account_createLoginToken()"><i class="fa-fw fa-solid fa-plus-circle"></i> ' + "New" + '</button></span></p>';

14539 - x += '<div style=margin-left:40px><table class="table table-hover"><tbody><tr class="table-active"><th scope=col style=text-align:left;width:430px>' + "Name" + '</th><th scope=col style=text-align:left>' + "Username" + '</th></tr>';

14528 + x += '<div style=margin-left:40px><table class="table table-hover table-striped"><tbody><tr class="table-active"><th scope=col style=text-align:left;width:430px>' + "Name" + '</th><th scope=col style=text-align:left>' + "Username" + '</th></tr>';

14529 for (var i = 0; i < loginTokens.length; i++) {

14530 var ltoken = loginTokens[i];

14542 - var trash = '<a href=# onclick=\'return p2removeLoginToken(event,"' + encodeURIComponentEx(ltoken.tokenUser) + '")\' title="' + "Remove login token" + '" style=cursor:pointer><i class="fa-solid fa-trash text-danger hoverButton"></i></a>';

14531 + var trash = '<a href=# onclick=\'return p2removeLoginToken(event,"' + encodeURIComponentEx(ltoken.tokenUser) + '")\' title="' + "Remove login token" + '" role=button><i class="fa-solid fa-trash text-danger fa-xs"></i></a>';

14532 var details = '';

14533 if (ltoken.expire != 0) { details = EscapeHtml(format("Expires {0}", printDateTime(new Date(ltoken.expire)))) + ' '; }

14545 - x += '<tr ' + (((++count % 2) == 0) ? 'style=background-color:#DDD' : '') + '><td style=width:30%><div class=m' + 2 + '></div><div> ' + EscapeHtml(ltoken.name) + '<div></div></div></td><td style=width:70%><div style=float:right>' + details + trash + '</div><div>' + EscapeHtml(ltoken.tokenUser) + '</div></td></tr>';

14534 + x += '<tr ' + (((++count % 2) == 0) ? 'style=background-color:#DDD' : '') + '><td style=width:30%><i class="fa-fw fa-solid fa-user"></i> ' + EscapeHtml(ltoken.name) + '<div></div></div></td><td style=width:70%><div style=float:right>' + details + trash + '</div><div>' + EscapeHtml(ltoken.tokenUser) + '</div></td></tr>';

14535 }

14536 x += '</tbody></table></div><br />';

14537 QV('accountCreateLoginTokenSpan', false);

@@ -14675,7 +14664,7 @@

14664 // Add device group name

14665 var meshrights = GetMeshRights(currentMesh), mname = EscapeHtml(currentMesh.name);

14666 if (mname.length == 0) { mname = '<i>' + "None" + '</i>'; }

14678 - if ((meshrights & 1) != 0) { mname = '<span tabindex=0 title="' + "Click here to edit the device group name" + '" onclick=p20editmesh(1) onkeyup="if (event.key == \'Enter\') p20editmesh(1)" style=cursor:pointer>' + mname + ' <img class=hoverButton src="images/link5.png" /></span>'; }

14667 + if ((meshrights & 1) != 0) { mname = '<span role=button tabindex=0 title="' + "Click here to edit the device group name" + '" onclick=p20editmesh(1) onkeyup="if (event.key == \'Enter\') p20editmesh(1)">' + mname + ' <i class="fa-solid fa-pencil fa-2xs"></i></span>'; }

14668 QH('p20meshName', mname);

14669 QV('MeshSummary', (currentMesh.mtype != 4));

14670

@@ -14838,7 +14827,7 @@

14827 x += '<button class="btn btn-primary btn-sm me-2 mb-1" title="' + "Switch Intel AMT to Admin Control Mode (ACM)." + '" onclick=\'return showAmtAcmSetup()\'><i class="fa-solid fa-circle-arrow-down"></i> ' + "ACM" + '</button>';

14828 }

14829

14841 - x += '<table class="table table-hover" cellpadding=2 cellspacing=0><tbody><tr><th scope=col>' + "User Authorizations" + '</th><th scope=col></th></tr>';

14830 + x += '<table class="table table-hover table-striped" cellpadding=2 cellspacing=0><tbody><tr><th scope=col>' + "User Authorizations" + '</th><th scope=col></th></tr>';

14831

14832 // Sort the users for this mesh

14833 var count = 1, sortedusers = [];

@@ -14853,18 +14842,18 @@

14842

14843 // Display all users for this device group

14844 for (var i in sortedusers) {

14856 - var trash = '', r = sortedusers[i].rights, rights = makeDeviceGroupRightsString(r), icon = 2;

14845 + var trash = '', r = sortedusers[i].rights, rights = makeDeviceGroupRightsString(r), icon = 'fa-user';

14846 if ((sortedusers[i].id != userinfo._id) && (meshrights == 0xFFFFFFFF || (((meshrights & 2) != 0)))) {

14847 if ((meshrights == 0xFFFFFFFF) || (currentMesh.links[sortedusers[i].id].rights != 0xFFFFFFFF)) {

14859 - trash = '<a href=# onclick=\'return p20deleteUser(event,"' + encodeURIComponentEx(sortedusers[i].id) + '")\' title="' + "Remove user rights to this device group" + '" style=cursor:pointer><i class="fa-solid fa-trash text-danger hoverButton"></i></a>';

14848 + trash = '<a href=# onclick=\'return p20deleteUser(event,"' + encodeURIComponentEx(sortedusers[i].id) + '")\' title="' + "Remove user rights to this device group" + '"><i role=button class="fa-solid fa-trash text-danger fa-fw fa-xs"></i></a>';

14849 }

14861 - rights = '<span tabindex=0 style=cursor:pointer onclick=p20viewuser("' + encodeURIComponentEx(sortedusers[i].id) + '") onkeypress="if (event.key==\'Enter\') p20viewuser(\'' + encodeURIComponentEx(sortedusers[i].id) + '\')">' + rights + ' <i class="fa-solid fa-pencil hoverButton"></i></span>';

14850 + rights = '<span tabindex=0 style=cursor:pointer onclick=p20viewuser("' + encodeURIComponentEx(sortedusers[i].id) + '") onkeypress="if (event.key==\'Enter\') p20viewuser(\'' + encodeURIComponentEx(sortedusers[i].id) + '\')">' + rights + ' <i class="fa-fw fa-solid fa-pencil fa-xs"></i></span>';

14851 }

14863 - if (sortedusers[i].id.startsWith('ugrp/')) { icon = 4; }

14852 + if (sortedusers[i].id.startsWith('ugrp/')) { icon = 'fa-users'; }

14853 var username = EscapeHtml(decodeURIComponent(sortedusers[i].name));

14854 if ((usergroups != null) && sortedusers[i].id.startsWith('ugrp/')) { username = '<a tabindex=0 href=# onclick=\'gotoUserGroup("' + encodeURIComponentEx(sortedusers[i].id) + '");haltEvent(event);\'>' + username + '</a>'; }

14855 if ((users != null) && sortedusers[i].id.startsWith('user/')) { username = '<a tabindex=0 href=# onclick=\'gotoUser("' + encodeURIComponentEx(sortedusers[i].id) + '");haltEvent(event);\'>' + username + '</a>'; }

14867 - x += '<tr style=' + (((count % 2) == 0) ? ';background-color:#DDD' : '') + '><td style=width:30%><div title="' + "User" + '" class=m' + icon + '></div><div> ' + username + '<div></div></div></td><td style=width:70%><div style=float:right>' + trash + '</div><div>' + rights + '</div></td></tr>';

14856 + x += '<tr style=' + (((count % 2) == 0) ? ';background-color:#DDD' : '') + '><td style=width:30%><div><i title="' + "User" + '" class="fa-solid fa-fw ' + icon + '"></i> ' + username + '<div></div></div></td><td style=width:70%><div style=float:right>' + trash + '</div><div>' + rights + '</div></td></tr>';

14857 ++count;

14858 }

14859

@@ -14872,7 +14861,7 @@

14861

14862 // Show device shares

14863 if ((deviceShares != null) && (deviceSharesNode == currentMesh._id) && (deviceShares.length > 0)) {

14875 - x += '<p></p><table class="table table-hover" cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col style=text-align:left;width:430px>' + "Active Device Sharing" + '</th><th scope=col style=text-align:left><th scope=col style=text-align:left></th></tr>';

14864 + x += '<p></p><table class="table table-hover table-striped" cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col style=text-align:left;width:430px>' + "Active Device Sharing" + '</th><th scope=col style=text-align:left><th scope=col style=text-align:left></th></tr>';

14865 count = 1;

14866 for (var i = 0; i < deviceShares.length; i++) {

14867 var dshare = deviceShares[i], trash = '';

@@ -14924,7 +14913,7 @@

14913 if ((features & 1) == 0) { dllist += ' <a onclick=meshImportDeviceList()><img title="' + "Import device list" + '" src="images/link6.png" /></a>'; } // Show import only in LAN or Hybrid mode

14914 }

14915

14927 - var y = '<table class="table table-hover"><tbody><tr class="class="fw-bold"><th>' + "Devices" + '</th><th scope=col class="text-end">' + dllist + '</th></tr>';

14916 + var y = '<table class="table table-hover table-striped"><tbody><tr class="class="fw-bold"><th>' + "Devices" + '</th><th scope=col class="text-end">' + dllist + '</th></tr>';

14917 for (var i in nodes) {

14918 var node = nodes[i], gray = ((node.conn > 0) ? '' : ' gray');

14919 if (currentMesh._id != node.meshid) continue;

@@ -15940,7 +15929,7 @@

15929 // Add device group name

15930 var meshrights = GetMeshRights(currentMesh), mname = EscapeHtml(currentMesh.name);

15931 if (mname.length == 0) { mname = '<i>' + "None" + '</i>'; }

15943 - if ((meshrights & 1) != 0) { mname = '<span tabindex=0 title="' + "Click here to edit the device group name" + '" onclick=p20editmesh(1) onkeyup="if (event.key == \'Enter\') p20editmesh(1)" style=cursor:pointer>' + mname + ' <img class=hoverButton src="images/link5.png" /></span>'; }

15932 + if ((meshrights & 1) != 0) { mname = '<span tabindex=0 title="' + "Click here to edit the device group name" + '" onclick=p20editmesh(1) onkeyup="if (event.key == \'Enter\') p20editmesh(1)" role=button>' + mname + ' <i class="fa-solid fa-pencil fa-2xs"></i></span>'; }

15933 QH('p21meshName', mname);

15934

15935 // Update charts

@@ -15998,7 +15987,7 @@

15987 var xpowerStates = [];

15988 for (var i in powerStates) { xpowerStates.push([powerStatetable[i], powerStates[i]]); }

15989 xpowerStates.sort(function (a, b) { return -(a[1] - b[1]) });

16001 - x += '<table class="table table-hover" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col colspan=2 style=text-align:left;width:430px>' + "Power States" + '</th></tr>';

15990 + x += '<table class="table table-hover table-striped" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col colspan=2 style=text-align:left;width:430px>' + "Power States" + '</th></tr>';

15991 for (var i in xpowerStates) { x += '<tr style=' + (((++count % 2) == 0) ? 'background-color:#DDD' : '') + '><td style=text-align:right;width:60px>' + xpowerStates[i][1] + ' <td> ' + xpowerStates[i][0] + '</tr>'; }

15992 x += '</tbody></table>';

15993 }

@@ -16008,7 +15997,7 @@

15997 var xagentTypes = [];

15998 for (var i in agentTypes) { xagentTypes.push([xagentsStr[i], agentTypes[i]]); }

15999 xagentTypes.sort(function (a, b) { return -(a[1] - b[1]) });

16011 - x += '<table class="table table-hover" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col colspan=2 style=text-align:left;width:430px>' + "Agent Types" + '</th></tr>';

16000 + x += '<table class="table table-hover table-striped" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col colspan=2 style=text-align:left;width:430px>' + "Agent Types" + '</th></tr>';

16001 for (var i in xagentTypes) { x += '<tr style=' + (((++count % 2) == 0) ? 'background-color:#DDD' : '') + '><td style=text-align:right;width:60px>' + xagentTypes[i][1] + '<td> ' + xagentTypes[i][0] + '</tr>'; }

16002 x += '</tbody></table>';

16003 }

@@ -16018,7 +16007,7 @@

16007 var xconnectivityStates = [];

16008 for (var i = 0; i < 4; i++) { xconnectivityStates.push([["Not Connected", "Agent", "Intel® AMT", "Agent + Intel® AMT"][i], connectivityStates[i]]); }

16009 xconnectivityStates.sort(function (a, b) { return -(a[1] - b[1]) });

16021 - x += '<table class="table table-hover" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col colspan=2 style=text-align:left;width:430px>' + "Connectivity" + '</th></tr>';

16010 + x += '<table class="table table-hover table-striped" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col colspan=2 style=text-align:left;width:430px>' + "Connectivity" + '</th></tr>';

16011 for (var i = 0; i < 4; i++) { if (xconnectivityStates[i][1] > 0) { x += '<tr style=' + (((++count % 2) == 0) ? 'background-color:#DDD' : '') + '><td style=text-align:right;width:60px>' + xconnectivityStates[i][1] + '<td> ' + xconnectivityStates[i][0] + '</tr>'; } }

16012 x += '</tbody></table>';

16013 }

@@ -16036,7 +16025,7 @@

16025 ][i], securityStates[i]]);

16026 }

16027 xsecurityStates.sort(function (a, b) { return -(a[1] - b[1]) });

16039 - x += '<table class="table table-hover" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col colspan=2 style=text-align:left;width:430px>' + "Security" + '</th></tr>';

16028 + x += '<table class="table table-hover table-striped" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col colspan=2 style=text-align:left;width:430px>' + "Security" + '</th></tr>';

16029 for (var i = 0; i < 4; i++) { if (xsecurityStates[i][1] > 0) { x += '<tr style=' + (((++count % 2) == 0) ? 'background-color:#DDD' : '') + '><td style=text-align:right;width:60px>' + xsecurityStates[i][1] + '<td> ' + xsecurityStates[i][0] + '</tr>'; } }

16030 x += '</tbody></table>';

16031 }

bootstrap: more fixes and icon changes part 2