Merge branch 'master' of https://github.com/Ylianst/MeshCentral

2025-01-23 12:43:14 -05:00 · 2022-01-20 12:58:12 -08:00 · 2022-01-20 12:58:12 -08:00 · 1e1ea0f3b1
commit 1e1ea0f3b1
parent 83aa34e613 70b499816f
5 changed files with 57 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -308,3 +308,4 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+.DS_Store
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,15 @@
+{
+    // Verwendet IntelliSense zum Ermitteln möglicher Attribute.
+    // Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
+    // Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}
--- a/public/styles/style.css
+++ b/public/styles/style.css
@ -136,8 +136,10 @@ body {
    width: 100%;
    grid-area: header;
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-column-span: 2;
    -ms-grid-row: 1;
+    grid-row: 1;
 }

 .fulldesk #masthead {
@ -178,7 +180,9 @@ body {

 #page_leftbar {
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-row: 2;
+    grid-row: 2;
    -ms-grid-row-span: 3;
    height: 100%;
    /* height: calc(100vh - 66px); */
@ -213,7 +217,9 @@ body {
    position: relative;
    grid-area: nav;
    -ms-grid-column: 2;
+    grid-column: 2;
    -ms-grid-row: 2;
+    grid-row: 2;
 }

 .fulldesk #topbar {
@ -222,8 +228,14 @@ body {

 .menu_stack #topbar, .login #topbar, .arg_hide #topbar {
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-column-span: 2;
    -ms-grid-row: 2;
+    grid-row: 2;
+}
+
+.logoncontrolspan, .logoncontrolspan2 {
+    color: white;
 }

 .topbar_td {
@ -330,14 +342,18 @@ body {

 .menu_stack.fullscreen.fulldesk #column_l {
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-row: 1;
+    grid-row: 1;
    -ms-grid-column-span: 2;
    -ms-grid-row-span: 4;
 }

 .fullscreen #column_l {
    -ms-grid-column: 2;
+    grid-column: 1;
    -ms-grid-row: 3;
+    grid-row: 3;
    grid-area: content;
    width: unset;
    /* height: calc(100vh - 111px);
@ -347,8 +363,10 @@ body {

 .menu_stack.fullscreen #column_l, .login #column_l, .arg_hide #column_l {
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-column-span: 2;
    -ms-grid-row: 3;
+    grid-row: 3;
 }

 .fulldesk #column_l {
@ -360,7 +378,9 @@ body {
    padding: 0;
    max-height: none;
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-row: 1;
+    grid-row: 1;
    background-color: rgb(0, 51, 102);
 }

@ -430,7 +450,9 @@ body {

 #footer {
    -ms-grid-column: 2;
+    grid-column: 2;
    -ms-grid-row: 4;
+    grid-row: 4;
    grid-area: footer;
    clear: both;
    overflow: auto;
@ -447,8 +469,10 @@ body {

 .menu_stack.fullscreen #footer, .login #footer, .arg_hide #footer {
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-column-span: 2;
    -ms-grid-row: 4;
+    grid-row: 4;
 }

 /* Support for footer made with table */
@ -1112,6 +1136,7 @@ NoMeshesPanel img {
    height: calc(100vh - 295px);
    overflow: auto;
    -webkit-user-select: none;
+    user-select: none;
    position: relative;
 }

@ -1120,6 +1145,7 @@ NoMeshesPanel img {
    width: 100%;
    overflow: auto;
    -webkit-user-select: none;
+    user-select: none;
    background-color: lightsteelblue;
 }

@ -1900,6 +1926,7 @@ a {
    -khtml-user-select: none;
    -webkit-user-select: none;
    -o-user-select: none;
+    user-select: none;
    cursor: default;
    -khtml-user-drag: element;
    clear: both;
@ -2446,7 +2473,9 @@ a {
 #deskarea1 {
    grid-area: deskarea1;
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-row: 1;
+    grid-row: 1;
    min-height: 20px;
 }

@ -2455,7 +2484,9 @@ a {
    grid-area: deskarea2;
    background-color: gray;
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-row: 2;
+    grid-row: 2;
 }

 #progressbar {
@ -2484,7 +2515,9 @@ a {
    max-height: 100%;
    height: 100%;
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-row: 3;
+    grid-row: 3;
 }

 #DeskFocus {
@ -2509,6 +2542,7 @@ a {
    overflow: hidden;
    width: 100%;
    -ms-touch-action: none;
+    touch-action: none;
    position: absolute;
    top: 0px;
    bottom: 0px;
@ -2624,7 +2658,9 @@ a {
 #deskarea4 {
    grid-area: deskarea4;
    -ms-grid-column: 1;
+    grid-column: 1;
    -ms-grid-row: 4;
+    grid-row: 4;
 }

 #DeskChatButton, #DeskNotifyButton, #DeskOpenWebButton, #DeskBackgroundButton, #DeskSaveImageButton, #DeskRecordButton, #DeskClipboardInButton, #DeskClipboardOutButton, #DeskRefreshButton, #DeskLockButton, #DeskInputLockedButton, #DeskInputUnLockedButton, #DeskGuestShareButton {
@ -2726,6 +2762,7 @@ a {
    height: calc(100vh - 323px);
    overflow: auto;
    -webkit-user-select: none;
+    user-select: none;
 }

 .room4submenu #p13filetable {
--- a/translate/translate.json
+++ b/translate/translate.json
@ -24433,7 +24433,7 @@
    },
    {
      "cs": "Uniknout",
-      "de": "Flucht",
+      "de": "Escape",
      "en": "Escape",
      "es": "Escape",
      "fi": "Paeta",
@ -28662,7 +28662,7 @@
    },
    {
      "cs": "Domov",
-      "de": "Zuhause",
+      "de": "Pos1",
      "en": "Home",
      "es": "Casa",
      "fi": "Koti",
--- a/views/default.handlebars
+++ b/views/default.handlebars
@ -132,7 +132,7 @@
            <div style="float:right">
                <div id=notificationCount onclick="clickNotificationIcon()" class="unselectable" style="display: none;" title="Click to view current notifications">0</div>
            </div>
-            <p id="logoutControl"><span id=logoutControlSpan style="color:white"></span><span id=idleTimeoutNotify style="color:yellow"></span></p>
+            <p id="logoutControl"><span id=logoutControlSpan class="logoncontrolspan" style="color:white"></span><span id=idleTimeoutNotify style="color:yellow"></span></p>
        </div>
        <div id="page_leftbar">
            <div style="height:16px"></div>
@ -284,7 +284,7 @@
                            <img style="cursor:pointer;margin-top:4px;display:none" title="Expand All" id="ExpandAllButton" src="images/icon-expand.png" loading=lazy width=9 height=11 onclick="cmexpandaction(1)" />
                            <input type="button" id="SelectAllButton" onclick="selectallButtonFunction();" value="Select All" />&nbsp;
                            <input type=button id=GroupActionButton disabled="disabled" value="Group Action" onclick=groupActionFunction() />&nbsp;
-                            <input id=SearchInput type=search autocomplete=off placeholder=Filter onchange=onDeviceSearchChanged(event) onclick=onDeviceSearchChanged(event) onkeyup=onDeviceSearchChanged(event) onfocus=onSearchFocus(1) onblur=onSearchFocus(0) />&nbsp;
+                            <input id=SearchInput type=search autocomplete=off placeholder=Filter onchange=onDeviceSearchChanged(event) onclick=onDeviceSearchChanged(event) onkeyup=onDeviceSearchChanged(event) onfocus=onSearchFocus(1) onblur=onSearchFocus(0) title="Filter: user:xxx or u:xxx ip:xxx group:xxx or g:xxx tag:xxx or t: xxx atag:xxx or a:xxx os:xxx amt:xxx desc:xxx wsc:ok wsc:noav wsc:noupdate wsc:nofirewall wsc:any"/>&nbsp;
                            <span id=SearchInputClearButton style="display:none;position:relative"><img src="images/x16.png" type="button" onclick="clearDeviceSearch()" style="position:absolute;cursor:pointer;left:-18px;top:-8px" srcset="images/x32.png 2x"/></span>
                            <select id=DevFilterSelect onchange=onOnlineCheckBox(event) title="Device Filter">
                                <option value=0>All</option>