From 727080ab6812ac3bf024a7d0ff0276a0f1e6f480 Mon Sep 17 00:00:00 2001 From: si458 Date: Fri, 15 Nov 2024 16:04:08 +0000 Subject: [PATCH] bootstrap: more fixes and icon changes Signed-off-by: si458 --- views/default3.handlebars | 69 ++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/views/default3.handlebars b/views/default3.handlebars index b0061296c9..9713d4b408 100644 --- a/views/default3.handlebars +++ b/views/default3.handlebars @@ -1,4 +1,4 @@ - + @@ -487,7 +487,10 @@    
Device Groups - - + -

@@ -1977,10 +1980,10 @@
- - - - + + + +
@@ -3581,7 +3584,7 @@ showModal('xxAddAgentModal', 'idx_dlgOkButton'); } else { var x = '
' + EscapeHtml(message.data) + '
'; - x += '
'; + x += '
'; x += '
'; setModalContent('xxAddAgent', 'MeshCentral Server Errors', x); showModal('xxAddAgentModal', 'idx_dlgOkButton', server_showErrorsDlgEx); @@ -3595,12 +3598,9 @@ if (message.data == null) { setModalContent('xxAddAgent', 'Server Configuration', 'Server has no config file.', 'extra-large'); } else { - var x = ''; - x += ''; - x += ''; - x += ''; - setModalContent('xxAddAgent', 'Server Configuration', x, 'extra-large'); + setModalContent('xxAddAgent', 'Server Configuration', 4, 'extra-large'); QV('d4EncodingButton', false); + QV('d4LineBreakButton', false); Q('d4editorarea').value = message.data; Q('d4editorarea').setAttribute('readonly', 'readonly'); } @@ -6494,6 +6494,7 @@ xxModal = new bootstrap.Modal(document.getElementById(modalId)); document.getElementById(modalId).addEventListener('hidden.bs.modal', function (event) { if (xxModal) { xxModal.dispose(); xxModal = null; } + if (xxdialogMode != 0) { xxdialogMode = 0; } }); } xxModal.show(); @@ -10039,6 +10040,8 @@ if (xxdialogMode) return; var x = ''; var y = ''; + var v = currentNode[showEditNodeValueDialog_modes2[mode]]; + if (v == null) v = ''; if (mode == 3) { // Get a list of all possible device tags x = ''); setModalContent('xxAddAgent', 'Edit Device', x); + if (Array.isArray(v)) { v = v.join(', '); } + Q('dp10devicevalue').value = v; showModal('xxAddAgentModal', 'idx_dlgOkButton', function () { showEditNodeValueDialogEx(3, mode); }); } - var v = currentNode[showEditNodeValueDialog_modes2[mode]]; - if (v == null) v = ''; - if (Array.isArray(v)) { v = v.join(', '); } - Q('dp10devicevalue').value = v; p10editdevicevalueValidate(); showModal('xxAddAgentModal', 'idx_dlgOkButton', function () { showEditNodeValueDialogEx(3, mode); }); Q('dp10devicevalue').focus(); @@ -14534,7 +14535,8 @@ function updateLoginTokens() { var x = '', count = 1; if ((loginTokens != null) && (loginTokens.length > 0)) { - x += '

' + "Active Login Tokens" + ' - ' + "New" + '

'; + x += '

' + "Active Login Tokens" + ' -

'; + x += '
' + "Name" + '' + "Username" + '
'; for (var i = 0; i < loginTokens.length; i++) { var ltoken = loginTokens[i]; var trash = ''; @@ -14625,6 +14627,7 @@ if (xxdialogMode) return false; xxdialogMode = 2; xxdialogTag = 'MeshCentralServerUpdate'; setModalContent('xxAddAgent', 'MeshCentral Version', 'Loading...'); + showModal('xxAddAgentModal', 'idx_dlgOkButton'); meshserver.send({ action: 'serverversion' }); return false; } @@ -16832,7 +16835,7 @@ } function addUserHtml(user, sessions) { - var x = '', gray = ' gray', icon = 'm2', msg = '', self = (user._id != userinfo._id), lastAccess = '', permissions = ''; + var x = '', gray = ' gray', msg = '', self = (user._id != userinfo._id), lastAccess = '', permissions = ''; if (sessions != null) { gray = ''; if (self) { @@ -16889,11 +16892,11 @@ if ((user.otpsecret > 0) || (user.otphkeys > 0) || ((user.otpekey == 1) && (features & 0x00800000)) || ((user.phone != null) && (features & 0x04000000))) { username += ' '; } if (user.phone != null) { username += ' '; } if ((user.siteadmin != null) && ((user.siteadmin & 32) != 0) && (user.siteadmin != 0xFFFFFFFF)) { username += ' '; } - if ((user.msghandle != null) && (features2 & 0x02000000)) { username += ' '; } + if ((user.msghandle != null) && (features2 & 0x02000000)) { username += ' '; } x += ''; + x += ''; ++count; } @@ -18736,8 +18739,8 @@ x += '
' + "No recordings." + '
'; } else { // Display the users using the sorted list - x += '
' + "Name" + '' + "Username" + '
'; x += '
'; x += '
'; - x += '
'; + x += '
'; x += '
'; x += '
' + username + '' + msg + '
' + groups + '' + lastAccess + '' + permissions; return x; @@ -17548,7 +17551,7 @@ var x = '
'; x += '
'; x += '
'; - x += '
'; + x += '
'; x += '
'; x += '
' + name + '
' + usercount + '' + meshcount + '' + devicecount; return x; @@ -17742,7 +17745,7 @@ if (currentUserGroup.membershipType == null) { trash = ''; } var username = EscapeHtml(decodeURIComponent(sortedusers[i].name)); if (users != null) { username = '' + username + ''; } - x += '
 ' + username + '
' + trash + '
 ' + username + '
' + trash + '
'; - x += '
' + "Session" + '' + nobreak("Start Time") + '' + "Duration" + '' + "Size"; + x += ''; + x += ''; if (p52recordings != null) { var recdate = null; for (var i in p52recordings) { @@ -18746,7 +18749,7 @@ x += addRecordingHtml(i, rec); } } - x += '
' + "Session" + '' + nobreak("Start Time") + '' + "Duration" + '' + "Size" + '
'; + x += '
'; } QH('p52recordings', x); @@ -18793,17 +18796,17 @@ if (rec.protocol == 101) { sessionName += ' - ' + "Intel® AMT Redirection"; } if (rec.protocol == 200) { sessionName += ' - ' + "Messenger"; } - var actions = '', icon = 'm0'; + var actions = '', icon = 'fa-circle-xmark text-danger'; if (rec.present == 1) { - icon = 'm1'; - actions = '
 
'; - actions += '
 
'; + icon = 'fa-circle-check text-success'; + actions = '
 
'; + actions += '
 
'; } var x = ''; x += '
'; //x += '
'; x += '
'; - x += '
'; + x += '
'; x += '
'; x += '
' + actions + '
' + sessionName + '
' + sessionStartStr + '' + sessionLengthStr + '' + sessionSize; return x;