diff --git a/package.json b/package.json index 8fca82b2..19333940 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.4-a", + "version": "0.3.4-c", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/images/clipboard-128.png b/public/images/clipboard-128.png new file mode 100644 index 00000000..7e1d74ac Binary files /dev/null and b/public/images/clipboard-128.png differ diff --git a/public/images/computers-128.png b/public/images/computers-128.png new file mode 100644 index 00000000..f6ef2517 Binary files /dev/null and b/public/images/computers-128.png differ diff --git a/public/images/gears-128.png b/public/images/gears-128.png new file mode 100644 index 00000000..160ffe7c Binary files /dev/null and b/public/images/gears-128.png differ diff --git a/public/images/icons200-1-1.jpg b/public/images/icons200-1-1.jpg deleted file mode 100644 index ff4e49d3..00000000 Binary files a/public/images/icons200-1-1.jpg and /dev/null differ diff --git a/public/images/icons200-2-1.jpg b/public/images/icons200-2-1.jpg deleted file mode 100644 index 2b337d30..00000000 Binary files a/public/images/icons200-2-1.jpg and /dev/null differ diff --git a/public/images/icons200-3-1.jpg b/public/images/icons200-3-1.jpg deleted file mode 100644 index 45dcf1e1..00000000 Binary files a/public/images/icons200-3-1.jpg and /dev/null differ diff --git a/public/images/icons200-4-1.jpg b/public/images/icons200-4-1.jpg deleted file mode 100644 index 34cb5fe7..00000000 Binary files a/public/images/icons200-4-1.jpg and /dev/null differ diff --git a/public/images/icons200-5-1.jpg b/public/images/icons200-5-1.jpg deleted file mode 100644 index 7f8aad6d..00000000 Binary files a/public/images/icons200-5-1.jpg and /dev/null differ diff --git a/public/images/icons200-6-1.jpg b/public/images/icons200-6-1.jpg deleted file mode 100644 index b0ae1b53..00000000 Binary files a/public/images/icons200-6-1.jpg and /dev/null differ diff --git a/public/images/icons256-1-1.png b/public/images/icons256-1-1.png new file mode 100644 index 00000000..ba3def1d Binary files /dev/null and b/public/images/icons256-1-1.png differ diff --git a/public/images/icons256-2-1.png b/public/images/icons256-2-1.png new file mode 100644 index 00000000..a22ae56f Binary files /dev/null and b/public/images/icons256-2-1.png differ diff --git a/public/images/icons256-3-1.png b/public/images/icons256-3-1.png new file mode 100644 index 00000000..80b02f60 Binary files /dev/null and b/public/images/icons256-3-1.png differ diff --git a/public/images/icons256-4-1.png b/public/images/icons256-4-1.png new file mode 100644 index 00000000..cab4c53b Binary files /dev/null and b/public/images/icons256-4-1.png differ diff --git a/public/images/icons256-5-1.png b/public/images/icons256-5-1.png new file mode 100644 index 00000000..126a6602 Binary files /dev/null and b/public/images/icons256-5-1.png differ diff --git a/public/images/icons256-6-1.png b/public/images/icons256-6-1.png new file mode 100644 index 00000000..347aa178 Binary files /dev/null and b/public/images/icons256-6-1.png differ diff --git a/public/images/icons50.png b/public/images/icons50.png index 1581f2e9..ca16c28c 100644 Binary files a/public/images/icons50.png and b/public/images/icons50.png differ diff --git a/public/images/icons64.png b/public/images/icons64.png new file mode 100644 index 00000000..d8d25ceb Binary files /dev/null and b/public/images/icons64.png differ diff --git a/public/images/images16.png b/public/images/images16.png index d62a2d55..de4a3cf9 100644 Binary files a/public/images/images16.png and b/public/images/images16.png differ diff --git a/public/images/leftbar-64.png b/public/images/leftbar-64.png new file mode 100644 index 00000000..1299fed8 Binary files /dev/null and b/public/images/leftbar-64.png differ diff --git a/public/images/mainaccount.jpg b/public/images/mainaccount.jpg deleted file mode 100644 index 24aca8d2..00000000 Binary files a/public/images/mainaccount.jpg and /dev/null differ diff --git a/public/images/mesh-200.jpg b/public/images/mesh-200.jpg deleted file mode 100644 index 9c31262b..00000000 Binary files a/public/images/mesh-200.jpg and /dev/null differ diff --git a/public/images/mesh-256.png b/public/images/mesh-256.png new file mode 100644 index 00000000..a13e242f Binary files /dev/null and b/public/images/mesh-256.png differ diff --git a/public/images/meshicon16.png b/public/images/meshicon16.png index 64fbc826..6e5a0517 100644 Binary files a/public/images/meshicon16.png and b/public/images/meshicon16.png differ diff --git a/public/images/meshicon256.png b/public/images/meshicon256.png new file mode 100644 index 00000000..93a81860 Binary files /dev/null and b/public/images/meshicon256.png differ diff --git a/public/images/meshicon50.png b/public/images/meshicon50.png index 7fe1eb1c..d20fd43b 100644 Binary files a/public/images/meshicon50.png and b/public/images/meshicon50.png differ diff --git a/public/images/server-256.png b/public/images/server-256.png new file mode 100644 index 00000000..cf9a6a27 Binary files /dev/null and b/public/images/server-256.png differ diff --git a/public/images/user-128.png b/public/images/user-128.png new file mode 100644 index 00000000..1f18d0f6 Binary files /dev/null and b/public/images/user-128.png differ diff --git a/public/images/user-200.jpg b/public/images/user-200.jpg deleted file mode 100644 index 691e4962..00000000 Binary files a/public/images/user-200.jpg and /dev/null differ diff --git a/public/images/user-256.png b/public/images/user-256.png new file mode 100644 index 00000000..345e801c Binary files /dev/null and b/public/images/user-256.png differ diff --git a/public/images/webp/mesh-200.webp b/public/images/webp/mesh-200.webp deleted file mode 100644 index 60a23e6c..00000000 Binary files a/public/images/webp/mesh-200.webp and /dev/null differ diff --git a/public/images/webp/mesh-256.webp b/public/images/webp/mesh-256.webp new file mode 100644 index 00000000..545b1395 Binary files /dev/null and b/public/images/webp/mesh-256.webp differ diff --git a/public/images/webp/user-200.webp b/public/images/webp/user-200.webp deleted file mode 100644 index 5a1fa73e..00000000 Binary files a/public/images/webp/user-200.webp and /dev/null differ diff --git a/public/images/webp/user-256.webp b/public/images/webp/user-256.webp new file mode 100644 index 00000000..74a4c832 Binary files /dev/null and b/public/images/webp/user-256.webp differ diff --git a/public/styles/style.css b/public/styles/style.css index d71c32d8..866e58c9 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -352,6 +352,7 @@ body { width: 300px; padding: 16px; text-align: center; + color: black; } #passwordPolicyCallout, #rpasswordPolicyCallout { @@ -460,6 +461,7 @@ body { top: 180px; left: calc((100% / 2) - 200px); width: 400px; + color:black; } #dialogHeader { @@ -615,6 +617,31 @@ body { text-align: center; } +.deviceBarCheckbox { + width:22px; + float:left; + background-color:white; +} + +.night .deviceBarCheckbox { + background-color:black; +} + +#devs { + color:black; +} + +.deviceBarIcon { + float:left; + height:18px; + width:18px; + background-color:white +} + +.night .deviceBarIcon { + background-color:black; +} + #devListToolbarViewIcons { float: right; } @@ -739,8 +766,8 @@ NoMeshesPanel img { } #p2AccountImage { - width: 150px; - height: 103px; + width: 128px; + height: 128px; margin-bottom: 10px; margin-right: 20px; float: right; @@ -1172,6 +1199,10 @@ a { opacity: 0.5; } + .night .lbbutton { + background-color: black; + } + .lbbutton:hover { opacity: 1; } @@ -1187,7 +1218,7 @@ a { } .lb1 { - background: url(../images/leftbar-62.jpg) -0px 0px; + background: url(../images/leftbar-64.png) -1px -2px; height: 62px; width: 62px; cursor: pointer; @@ -1198,7 +1229,7 @@ a { } .lb2 { - background: url(../images/leftbar-62.jpg) -75px 0px; + background: url(../images/leftbar-64.png) -66px -2px; height: 62px; width: 62px; cursor: pointer; @@ -1209,7 +1240,7 @@ a { } .lb3 { - background: url(../images/leftbar-62.jpg) -150px 0px; + background: url(../images/leftbar-64.png) -130px -2px; height: 62px; width: 62px; cursor: pointer; @@ -1220,7 +1251,7 @@ a { } .lb4 { - background: url(../images/leftbar-62.jpg) -225px 0px; + background: url(../images/leftbar-64.png) -194px -2px; height: 62px; width: 62px; cursor: pointer; @@ -1231,7 +1262,7 @@ a { } .lb5 { - background: url(../images/leftbar-62.jpg) -294px 0px; + background: url(../images/leftbar-64.png) -257px -2px; height: 62px; width: 62px; cursor: pointer; @@ -1242,7 +1273,7 @@ a { } .lb6 { - background: url(../images/leftbar-62.jpg) -360px 0px; + background: url(../images/leftbar-64.png) -318px -2px; height: 62px; width: 62px; cursor: pointer; @@ -1675,6 +1706,11 @@ a { margin-bottom: 2px; } +.night .bar { + color: black; +} + + #p3users .bar { width: 100%; font-size: medium; @@ -1687,6 +1723,10 @@ a { background-color: white; } + .night .baricon { + background-color: black; + } + .baricon div { width: 16px; margin-top: 4px; @@ -1707,6 +1747,7 @@ a { height: 18px; float: left; margin-bottom: 2px; + color: black; } .bar182 { @@ -2020,6 +2061,7 @@ a { top: 24px; bottom: 0px; width: 100%; + color:black; } .deskToolsBar { @@ -2047,6 +2089,19 @@ a { margin-left: 6px; } +.serverStateTableCell { + width: 300px; + height: 24px; + background-color: #d3d9d6; + margin-bottom: 4px; + vertical-align: middle; + border-spacing: 0; +} + +.night .serverStateTableCell { + color: black; +} + .userTableHeader { border-bottom: 1pt solid lightgray; padding-top: 4px; diff --git a/views/default-min.handlebars b/views/default-min.handlebars index c68e3def..cbfedebc 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

 

\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

 

\ No newline at end of file diff --git a/views/default.handlebars b/views/default.handlebars index 74bd78b9..c0750b56 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -245,7 +245,7 @@ @@ -34,7 +35,7 @@ - + @@ -254,8 +255,10 @@ var features = parseInt('{{{features}}}'); var welcomeText = decodeURIComponent("{{{welcometext}}}"); var currentpanel = 0; - var uiMode = parseInt(getstore('uiMode', 1)); + var uiMode = parseInt(getstore('uiMode', '1')); var webPageFullScreen = true; + var nightMode = (getstore('_nightMode', '0') == '1'); + //var webPageFullScreen = getstore('webPageFullScreen', true); //if (webPageFullScreen == 'false') { webPageFullScreen = false; } //if (webPageFullScreen == 'true') { webPageFullScreen = true; } @@ -269,6 +272,8 @@ if (top != self && (loc == null || top.active == false)) { top.location = self.location; return; } } + if (nightMode) { QC('body').add('night'); } + QV('createPanelHint', passRequirements.hint === true); QV('resetpasswordpanelHint', passRequirements.hint === true); @@ -645,6 +650,7 @@ Q('uiViewButton3').classList.remove('uiSelectorSel'); try { Q('uiViewButton' + uiMode).classList.add('uiSelectorSel'); } catch (ex) { } QV('uiMenu', (QS('uiMenu').display == 'none')); + if (nightMode) { Q('uiViewButton4').classList.add('uiSelectorSel'); } } function userInterfaceSelectMenu(s) { @@ -655,6 +661,12 @@ //toggleStackMenu(0); } + function toggleNightMode() { + nightMode = !nightMode; + if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + putstore('_nightMode', (nightMode ? '1' : '0')); + } + function center() { /* Now we use CSS media to achive the same effect as deleted JS */ diff --git a/views/messenger-min.handlebars b/views/messenger-min.handlebars index 1af3a5b4..f7125b6a 100644 --- a/views/messenger-min.handlebars +++ b/views/messenger-min.handlebars @@ -1 +1 @@ - MeshMessenger
MeshMessenger
\ No newline at end of file + MeshMessenger
MeshMessenger
\ No newline at end of file diff --git a/webserver.js b/webserver.js index 1ea4d4ed..aa8c28e6 100644 --- a/webserver.js +++ b/webserver.js @@ -2705,18 +2705,18 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { // Server picture obj.app.get(url + 'serverpic.ashx', function (req, res) { // Check if we have "server.jpg" in the data folder, if so, use that. - if ((parent.configurationFiles != null) && (parent.configurationFiles['server.jpg'] != null)) { - res.set({ 'Content-Type': 'image/jpeg' }); - res.send(parent.configurationFiles['server.jpg']); + if ((parent.configurationFiles != null) && (parent.configurationFiles['server.png'] != null)) { + res.set({ 'Content-Type': 'image/png' }); + res.send(parent.configurationFiles['server.png']); } else { // Check if we have "server.jpg" in the data folder, if so, use that. - var p = obj.path.join(obj.parent.datapath, 'server.jpg'); + var p = obj.path.join(obj.parent.datapath, 'server.png'); if (obj.fs.existsSync(p)) { // Use the data folder server picture try { res.sendFile(p); } catch (e) { res.sendStatus(404); } } else { // Use the default server picture - try { res.sendFile(obj.path.join(obj.parent.webPublicPath, 'images/server-200.jpg')); } catch (e) { res.sendStatus(404); } + try { res.sendFile(obj.path.join(obj.parent.webPublicPath, 'images/server-256.png')); } catch (e) { res.sendStatus(404); } } } });