Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-29 17:04:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3649 from JSuenram/master

Browse Source 
#3640 Trailing coma typo in config-schema.json and new winagent.png
This commit is contained in:
Ylian Saint-Hilaire 2022-02-15 10:12:21 -08:00 committed by GitHub
commit 611af0a2b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meshcentral-config-schema.json
View File

@ -302,6 +302,7 @@
"mobileSite": { "type": "boolean", "default": true, "description": "When set to false, this setting will disable the mobile site." },
"unknownUserRootRedirect": { "type": "string", "default": null, "description": "Redirects HTTP root requests to this URL only where user is not already logged in. When in use, direct users to /login to see the normal login page." },
"nightMode": { "type": "integer", "default": 0, "description": "0 = User selects day/night mode, 1 = Always night mode, 2 = Always day mode" },
"agentInviteImagePreview": { "type": "string", "default": "images/winagent.png", "description": "The filename of a image file in .png format located in Meshcentral-Data to display in the MeshCentral Agent invitation page, image should be 549x393 but can be larger." },
"userQuota": { "type": "integer" },
"meshQuota": { "type": "integer" },
"loginKey": { "type": [ "string", "array" ], "items": { "type": "string" }, "default": null, "description": "Requires that users add the value ?key=xxx in the URL in order to see the web site." },
@ -588,7 +589,7 @@
"description": "Indicate what string the agent must write to the shell after starting a terminal session",
"linux": { "type": "string", "default": " alias ls=\\'ls --color=auto\\';clear\\n", "description": "String to write after opening a Linux terminal." },
"darwin": { "type": "string", "default": null, "description": "String to write after opening a macOS terminal." },
"freebsd": { "type": "string", "default": null, "description": "String to write after opening a FreeBSD terminal." },
"freebsd": { "type": "string", "default": null, "description": "String to write after opening a FreeBSD terminal." }
}
}
},

BIN
public/images/winagent.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 73 KiB

4
views/agentinvite.handlebars
View File

@ -92,7 +92,7 @@
<h3>Microsoft&trade; Windows 64bit</h3>
<p><a id="win64url">Download the software here</a>, run it and press "Install" or "Connect".</p>
<div style="text-align:center">
<img class="winagent-img" src="images/winagent.png" />
<img id="agentInviteImagePreview64" class="winagent-img" src="{{{agentInviteImagePreview}}}" />
</div>
</div>
@ -100,7 +100,7 @@
<h3>Microsoft&trade; Windows 32bit</h3>
<p><a id="win32url">Download the software here</a>, run it and press "Install" or "Connect".</p>
<div style="text-align:center">
<img class="winagent-img" src="images/winagent.png" />
<img id="agentInviteImagePreview32" class="winagent-img" src="{{{agentInviteImagePreview}}}" />
</div>
</div>

5
webserver.js
View File

@ -7504,6 +7504,11 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
xargs.min = minify ? '-min' : '';
xargs.titlehtml = domain.titlehtml;
xargs.title = (domain.title != null) ? domain.title : 'MeshCentral';
if (domain.agentinviteimagepreview == null) {
xargs.agentInviteImagePreview = 'images/winagent.png';
} else {
xargs.agentInviteImagePreview = domain.agentinviteimagepreview;
}
if (
((page == 'login2') && (domain.loginpicture == null) && (domain.titlehtml == null)) ||
((page != 'login2') && (domain.titlepicture == null) && (domain.titlehtml == null))