diff --git a/public/styles/style.css b/public/styles/style.css index 866e58c9..5b5a4881 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -818,7 +818,7 @@ NoMeshesPanel img { } #p3users { - max-height: calc(100vh - 243px); + max-height: calc(100vh - 244px); overflow-y: auto; } @@ -1088,7 +1088,7 @@ a { } .night a { - color: #369; + color: #69B; } .i1 { @@ -1927,10 +1927,13 @@ a { #deskarea0 { width: 100%; padding: 0px; - padding: 0px; margin-top: 0px; } +.night #deskarea0 { + color: black; +} + .fulldesk #deskarea0 { min-width: 100%; min-height: 0px; @@ -1976,8 +1979,8 @@ a { position: relative; overflow: hidden; width: 100%; - max-height: calc(100vh - 296px); /* + 24px hight of submenu */ - height: calc(100vh - 296px); + max-height: calc(100vh - 270px); /* + 24px hight of submenu */ + height: calc(100vh - 270px); } .room4submenu #deskarea3x { @@ -2158,11 +2161,15 @@ a { #p13filetable { width: 100%; - height: calc(100vh - 349px); + height: calc(100vh - 323px); overflow: auto; -webkit-user-select: none; } +.room4submenu #p13filetable { + height: calc(100vh - 349px); +} + #p13bigok { width: 256px; overflow: hidden; @@ -2217,6 +2224,10 @@ a { margin-top: 0px; } +.night #consoleTable { + color: black; +} + #p15statetext { padding: 4px; height: 15px; @@ -2228,9 +2239,8 @@ a { padding: 0; color: lightgray; width: 100%; - /* */ - height: calc(100vh - 299px); - max-height: calc(100vh - 299px); + height: calc(100vh - 276px); + max-height: calc(100vh - 276px); position: relative; } @@ -2245,17 +2255,14 @@ a { } #p15agentConsoleText { - /* position: absolute; */ margin: 0; padding: 0; top: 0; bottom: 0; - /* left: 0; - right: 0; */ overflow-y: scroll; overflow-x: auto; - height: calc(100vh - 299px); - max-height: calc(100vh - 299px); + height: calc(100vh - 279px); + max-height: calc(100vh - 279px); width: 930px; } @@ -2270,10 +2277,14 @@ a { } #p16events, #p31events { - max-height: calc(100vh - 269px); + max-height: calc(100vh - 245px); overflow-y: auto; } +.room4submenu #p16events, #p31events { + max-height: calc(100vh - 269px); +} + .night #p16events, #p31events { color: #222; } diff --git a/views/default-min.handlebars b/views/default-min.handlebars index cbfedebc..3cfa49e6 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 c0750b56..4307fb77 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -1085,6 +1085,7 @@ webPageStackMenu = (uiMode > 1); toggleFullScreen(0); toggleStackMenu(0); + if (webPageStackMenu && (xxcurrentView >= 10)) { QC('column_l').add('room4submenu'); } else { QC('column_l').remove('room4submenu'); } } function toggleNightMode() { @@ -3010,6 +3011,14 @@ } else { // Go to the right panel gotoDevice(nodeid, panel); + + // If possible, connect... + var mesh = meshes[currentNode.meshid]; + if ((currentNode.conn & 1) && (mesh.mtype == 2)) { + if ((panel == 11) && (desktop == null) && (currentNode.agent.caps & 1)) { connectDesktop(null, 1); } // Desktop + if ((panel == 12) && (terminal == null) && (currentNode.agent.caps & 2)) { connectTerminal(null, 1); } // Terminal + if ((panel == 13) && (files == null)) { connectFiles(null); } // files + } } } } @@ -5678,7 +5687,7 @@ if (e.shiftKey == true) { meshserver.send({ action: 'uploadagentcore', nodeid: consoleNode._id, type: 'default' }); } // Upload default core else if (e.altKey == true) { meshserver.send({ action: 'uploadagentcore', nodeid: consoleNode._id, type: 'clear' }); } // Clear the core else if (e.ctrlKey == true) { p15uploadCore2(); } // Upload the core from a file - else { setDialogMode(2, "Change Mesh Agent Core", 3, p15uploadCoreEx, '
Change Core
'); } + else { setDialogMode(2, "Perform Agent Action", 3, p15uploadCoreEx, addHtmlValue('Action', '')); } } function p15uploadCoreEx() { @@ -7769,11 +7778,7 @@ if ((x == 6) || (x == 115) || (x == 40)) QC('LeftMenuMyServer').add(leftMenuActiveClass); // column_l max-height - if (!webPageFullScreen && x >= 10) { - QC('column_l').add('room4submenu'); - } else { - QC('column_l').remove('room4submenu'); - } + if (webPageStackMenu && (x >= 10)) { QC('column_l').add('room4submenu'); } else { QC('column_l').remove('room4submenu'); } // If we are going to panel 0 in "full screen mode", hide the left bar. QV('topbar', x != 0); diff --git a/views/login-min.handlebars b/views/login-min.handlebars index 649efae5..3b655241 100644 --- a/views/login-min.handlebars +++ b/views/login-min.handlebars @@ -1 +1 @@ - {{{title}}} - Login
{{{title}}}
{{{title2}}}
♦

Welcome


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

Welcome


\ No newline at end of file diff --git a/views/messenger-min.handlebars b/views/messenger-min.handlebars index f7125b6a..c0b87922 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