From 95b68fb2a5066da5eae4a1601fbb5cf7be859994 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Mon, 7 Sep 2020 20:35:13 -0700 Subject: [PATCH] SMBIOS is no longer saved by default. --- meshagent.js | 2 +- public/styles/style.css | 4 ++-- translate/translate.json | 8 +------- views/default.handlebars | 24 ++++++++++++------------ 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/meshagent.js b/meshagent.js index 05dbd81c..b23c076e 100644 --- a/meshagent.js +++ b/meshagent.js @@ -1165,7 +1165,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) { case 'smbios': { // See if we need to save SMBIOS information - if (domain.smbios !== false) { + if (domain.smbios === true) { // Store the RAW SMBios table of this computer // Perform sanity checks before storing try { diff --git a/public/styles/style.css b/public/styles/style.css index 0d9f4993..691f0ac8 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -1220,11 +1220,11 @@ NoMeshesPanel img { .p10html3right { float: right; - font-size: x-small; + font-size: small; } .p10html3left { - font-size: x-small; + font-size: small; } #dp10devicevalue { diff --git a/translate/translate.json b/translate/translate.json index 4947704e..5d2ca8fc 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -6652,12 +6652,6 @@ "default.handlebars->27->1214" ] }, - { - - "tr": "Çince (Traditioneel)", - "zh-chs": "中国传统的", - "zh-cht": "中國傳統的)" - }, { "cs": "ChromeOS", "de": "ChromeOS", @@ -38390,4 +38384,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/views/default.handlebars b/views/default.handlebars index 6d64d6d7..93abb389 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -3624,7 +3624,7 @@ } // Add a "Add Device Group" option - r += '
'; + r += '
'; if ((view < 3) && (sort == 0) && (Object.keys(meshes).length > 0) && ((userinfo.siteadmin == 0xFFFFFFFF) || ((userinfo.siteadmin & 64) == 0))) { r += '' + "Add Device Group" + ' '; } @@ -3904,22 +3904,22 @@ if ((meshrights & 4) == 0) return ''; var r = ''; if ((features & 1024) == 0) { // If CIRA is allowed - r += ' ' + "Add CIRA" + ''; + r += ' ' + "Add CIRA" + ''; } if (mesh.mtype == 1) { if ((features & 1) == 0) { // If not WAN-Only - r += ' ' + "Add Local" + ''; - r += ' ' + "Scan Network" + ''; + r += ' ' + "Add Local" + ''; + r += ' ' + "Scan Network" + ''; } if (mesh.amt && (mesh.amt.type == 2)) { // CCM activation - r += ' ' + "Activation" + ''; + r += ' ' + "Activation" + ''; } else if (mesh.amt && (mesh.amt.type == 3) && ((features & 0x00100000) != 0)) { // ACM activation - r += ' ' + "Activation" + ''; + r += ' ' + "Activation" + ''; } } if (mesh.mtype == 2) { - r += ' ' + "Add Agent" + ''; - if ((features & 2) == 0) { r += ' ' + "Invite" + ''; } + r += ' ' + "Add Agent" + ''; + if ((features & 2) == 0) { r += ' ' + "Invite" + ''; } } return r; } @@ -9403,7 +9403,7 @@ x += ''; // If we are full administrator on this mesh, allow deletion of the mesh - if (meshrights == 0xFFFFFFFF) { x += '
' + "Delete Group" + '
'; } + if (meshrights == 0xFFFFFFFF) { x += '
' + "Delete Group" + '
'; } QH('p20info', x); @@ -11527,7 +11527,7 @@ x += ''; if ((userinfo.siteadmin & 256) != 0) { - x += '
' + "Delete User Group" + '
'; + x += '
' + "Delete User Group" + '
'; } QH('p51group2', x); @@ -11822,9 +11822,9 @@ var userAdminRights = (((userinfo.siteadmin != null) && (userinfo.siteadmin & 2) && (user.siteadmin != 0xFFFFFFFF)) || (userinfo.siteadmin == 0xFFFFFFFF)); // Show bottom buttons - x = '
'; + x = '
'; if (userAdminRights) { x += '' + "Delete User" + ''; } - x += '
'; + x += '
'; // If user admin rights and not SSPI/LDAP and UserID does not start with ~, show change password if (userAdminRights && ((features & 0x00080000) == 0) && (user._id.split('/')[2][0] != '~')) { x += '' + "Change Password" + ''; } x += '

'