@cryptotaxi247 / MeshCentral / commits / e773d69f

Revert "Styles moved to CSS, added grid for fullscreen, toggle for screen scaling and menu position"

Ylian Saint-Hilaire committed Apr 16, 2019 at 14:34 UTC e773d69f54c63a6803f6c2375b7ff8d26e1b2dfc
3 files changed +337 -722
public/styles/style.css
+27 -461
@@ -1,9 +1,4 @@
1 -
2 -html, body {
3 - width: 100%;
4 - height: 100%;
5 -}
6 -body {
1 +body {
2 margin: 0;
3 padding: 0;
4 border: 0;
@@ -11,7 +6,7 @@ body {
6 font-size: 13px;
7 font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
8 background-color: #d3d9d6;
14 - /* overflow-y: hidden; */
9 + overflow-y: hidden;
10 }
11
12 #container {
@@ -26,49 +21,22 @@ body {
21 border-left: 1px solid #b7b7b7;
22 padding: 0;
23 }
29 - .fullscreen.menu_stack #container {
30 - grid-template-rows: 66px 48px auto 45px;
31 - grid-template-columns: 90px repeat(auto-fit, minmax(900px, 1fr));
32 - grid-template-areas:
33 - "header header"
34 - "nav nav"
35 - "content content"
36 - "footer footer";
37 - }
24 +
25 .fullscreen #container {
26 width: 100%;
40 - min-width: 100%;
27 + min-width: 700px;
28 min-height: 0px;
29 border-right: 0px none #b7b7b7;
30 border-left: 0px none #b7b7b7;
44 -
45 - height: 100%;
46 - position: relative;
47 - display: grid;
48 - grid-gap: 0px;
49 - grid-template-areas:
50 - "header header"
51 - "sidebar nav"
52 - "sidebar content"
53 - "sidebar footer";
54 - grid-template-columns: 90px auto;
55 - grid-template-rows: 66px 24px auto 45px;
31 }
57 -
32 +
33 .fulldesk #container {
34 width: 100%;
60 - height: 100%;
35 min-width: 700px;
36 min-height: 0px;
37 border-right: 0px none #b7b7b7;
38 border-left: 0px none #b7b7b7;
39 position: unset;
66 - position: relative;
67 - display: grid !important;
68 - grid-gap: 0px;
69 - grid-template-areas: "content"!important;
70 - grid-template-columns: repeat(auto-fit, minmax(100px, 1fr)) !important;
71 - grid-template-rows: repeat(auto-fit, minmax(100px, 1fr))!important;
40 }
41
42 #masthead {
@@ -89,7 +57,6 @@ body {
57
58 .fullscreen #masthead {
59 width: 100%;
92 - grid-area: header;
60 }
61
62 .fulldesk #masthead {
@@ -148,20 +115,15 @@ body {
115 #page_leftbar {
116 height: calc(100vh - 66px);
117 width: 90px;
118 + position: absolute;
119 z-index: 1000;
120 background: #113962;
121 background: linear-gradient(to bottom, #104893 0%,#113962 100%);
122 color: white;
155 - overflow-y: hidden;
156 - display: none;
123 }
124 .fullscreen #page_leftbar {
159 - grid-area: sidebar;
125 display: block;
126 }
162 - .menu_stack #page_leftbar {
163 - display: none;
164 - }
127 .arg_hide #page_leftbar {
128 display: none;
129 }
@@ -169,10 +131,6 @@ body {
131 display: none;
132 }
133
172 -#topbarmaster {
173 - grid-area: nav;
174 -}
175 -
134 #topbar {
135 /* height: 24px; */
136 position: relative;
@@ -199,41 +157,21 @@ body {
157 top: 3px;
158 right: 6px
159 }
202 -#toggle2 {
203 - cursor: pointer;
204 - color: white;
205 - position: absolute;
206 - top: 3px;
207 - right: 26px;
208 - display: none;
209 -}
210 - .fullscreen #toggle2 {
211 - display: block;
212 - }
160
161 #MainMenuSpan, #MainSubMenu, #MeshSubMenu, #UserSubMenu, #ServerSubMenu, #UserDummyMenu {
162 width: 100%;
216 - height: 24px;
217 - color: white;
218 - background-color: #808080;
163 + height: 22px
164 }
220 - .menu_stack #UserDummyMenu {
221 - display: none;
222 - }
165
166 #MainMenuSpan {
167 display: table;
168 }
227 -
169 .fullscreen #MainMenuSpan {
170 display: none;
171 }
172 .fulldesk #MainMenuSpan {
173 display: none;
174 }
234 - .menu_stack #MainMenuSpan {
235 - display: block;
236 - }
175
176 #column_l {
177 position: relative;
@@ -242,20 +180,20 @@ body {
180 margin: 0;
181 padding: 0 15px;
182 background-color: #fff;
245 - /* max-height: calc(100vh - 151px); */
183 + /*max-height: calc(100vh - 111px);*/
184 min-width: unset;
185 }
186 +.room4submenu {
187 + max-height: calc(100vh - 159px) !important;
188 +}
189
190 .fullscreen #column_l {
250 - grid-area: content;
251 - width: unset;
252 - /* height: calc(100vh - 111px);
253 - width: calc(100% - 30px); */
191 + height: calc(100vh - 135px);
192 + width: calc(100% - 30px);
193 overflow-y: auto;
194 }
195
196 .fulldesk #column_l {
258 - height: 100%;
197 width: 100%;
198 height: unset;
199 margin-left: unset;
@@ -267,10 +205,6 @@ body {
205 display: none;
206 }
207
270 -.room4submenu {
271 - min-height: calc(100vh - 159px);
272 -}
273 -
208 #centralTable {
209 width: 100%;
210 }
@@ -320,7 +254,6 @@ body {
254 }
255
256 #footer {
323 - grid-area: footer;
257 clear: both;
258 overflow: auto;
259 width: 100%;
@@ -382,12 +315,6 @@ body {
315 text-decoration: none;
316 }
317
385 -#verifyEmailId2 {
386 - color:yellow;
387 - margin-left:3px;
388 - cursor:pointer;
389 -}
390 -
318 #dialog {
319 z-index: 1000;
320 background-color: #EEE;
@@ -405,18 +332,6 @@ body {
332 background-color: #003366;
333 color: #FFF;
334 border-radius: 5px 5px 0 0;
408 - margin-bottom: 6px;
409 -}
410 -
411 -#id_dialogclose {
412 - float: right;
413 - padding: 3px;
414 - margin-right: 3px;
415 - cursor: pointer;
416 -}
417 -
418 -#id_dialogtitle {
419 - padding: 5px;
335 }
336
337 #dialogBody {
@@ -445,62 +360,14 @@ body {
360 padding:10px;
361 }
362
448 -#dialog2, #dialog3, #dialog7 {
363 +#dialog2, #dialog3 {
364 + margin: auto;
365 margin: 3px;
366 }
367
452 -#d3uploadMode, #d3localFile {
453 - float:right;
454 - width:260px;
455 -}
456 -
457 -#d3serveraction {
458 - width: 100%;
459 - background-color: #d3d9d6;
460 - text-align: left;
461 - padding: 3px;
462 -}
463 -
464 -#d3serverfiles {
465 - width: 100%;
466 - height: 150px;
467 - background-color: white;
468 - padding: 2px;
469 - border: 1px solid gray;
470 - overflow-y: scroll;
471 -}
472 -
473 -
474 -#d7bitmapquality, #d7bitmapquality, #d7bitmapscaling, #d7framelimiter, #d7desktopmode {
475 - float: right;
476 - width: 200px;
477 - height: 20px;
478 -}
479 -
480 -#dialog7 h4 {
481 - width:100%;
482 - border-bottom: 1px solid gray;
483 -}
484 -
485 -#d7meshkvm div, #d7amtkvm div, #d3upload, #d3localmode {
486 - margin:3px 0 3px 0;
487 - display: flex;
488 - justify-content: space-between;
489 -}
490 -
491 -#d7otherset {
492 - display: block;
493 - border: 1px solid #666;
494 - width: 200px;
495 - height: 60px;
496 - overflow-y: scroll;
497 - background-color: white;
498 -}
499 -
368 #idx_dlgButtonBar {
369 padding: 10px;
502 - margin-bottom: 5px;
503 - overflow: auto;
370 + margin-bottom: 20px;
371 }
372
373 #idx_dlgCancelButton {
@@ -531,7 +398,7 @@ body {
398
399 #idx_deskFullBtn2 {
400 float: left;
534 - font-size: 16px;
401 + font-size: large;
402 cursor: pointer;
403 display: none;
404 }
@@ -676,14 +543,6 @@ body {
543 font-size: 10px;
544 }
545
679 -#p2AccountActions .mL {
680 - margin-left: 40px;
681 -}
682 -
683 -#p2ServerActions .mL {
684 - margin-left: 40px;
685 -}
686 -
546 .newMeshBtn {
547 background: url(../images/icon-addnew.png) no-repeat 0px 0px;
548 height: 12px;
@@ -693,14 +552,10 @@ body {
552 padding-left: 15px;
553 }
554
696 -#p2noMeshFound, #serverStats {
555 +#p2noMeshFound, #p2ServerActionsBackup, #p2ServerActionsRestore, #p2ServerActionsVersion, #p2ServerActionsErrors, #serverStats {
556 margin-left:40px;
557 }
558
700 -#p2ServerActionsBackup, #p2ServerActionsRestore, #p2ServerActionsVersion, #p2ServerActionsErrors {
701 - margin-left:0px;
702 -}
703 -
559 .pTable {
560 width: 100%;
561 height: 24px;
@@ -725,7 +580,7 @@ body {
580 }
581
582 #p3events {
728 - height: calc(100vh - 270px);
583 + height: calc(100vh - 243px);
584 overflow-y: scroll
585 }
586
@@ -744,10 +599,6 @@ body {
599 width: 230px;
600 }
601
747 -#p5toolbar {
748 - width: 100%;
749 -}
750 -
602 #p5filehead {
603 width: 100%;
604 background-color: #d3d9d6;
@@ -767,7 +618,7 @@ body {
618
619 #p5filetable {
620 width: 100%;
770 - height: calc(100vh - 219px);
621 + height: calc(100vh - 294px);
622 overflow: auto;
623 -webkit-user-select: none;
624 position: relative;
@@ -780,9 +631,6 @@ body {
631 -webkit-user-select: none;
632 background-color: lightsteelblue;
633 }
783 - #p5PublicShare div {
784 - padding: 4px;
785 - }
634
635 #bigok {
636 width: 256px;
@@ -875,14 +723,6 @@ body {
723 font-size: x-small;
724 }
725
878 -#dp10devicevalue {
879 - width: 230px;
880 -}
881 -
882 -.fulldesk #p11 {
883 - height: 100%;
884 -}
885 -
726 #MainComputerImage {
727 border-width: 0px;
728 height: 200px;
@@ -923,6 +763,7 @@ body {
763 top: 0;
764 right: 0;
765 border-left: 2px solid lightgray;
766 + display: none;
767 }
768 #DeskToolsRefreshButton {
769 float: right;
@@ -933,7 +774,6 @@ body {
774 a {
775 color: #036;
776 text-decoration: underline;
936 - cursor: pointer;
777 }
778
779 .i1 {
@@ -1206,7 +1046,7 @@ a {
1046 }
1047
1048 .style7 {
1209 - font-size: 22px;
1049 + font-size: large;
1050 background-color: #FFFFFF;
1051 width: 180px;
1052 }
@@ -1231,20 +1071,11 @@ a {
1071 background-color: #D3D9D6;
1072 }
1073
1234 -.pTable .style14 {
1235 - float: left;
1236 -}
1237 -
1074 .auto-style1 {
1075 text-align: right;
1076 background-color: #D3D9D6;
1077 }
1078
1243 -#pTable .auto-style1 {
1244 - height: 100%;
1245 - float: right;
1246 -}
1247 -
1079 .icon2 {
1080 float: left;
1081 margin: 7px;
@@ -1384,7 +1215,7 @@ a {
1215 .h1 {
1216 background-position: 0% 0%;
1217 width: 14px;
1387 - height: 24px;
1218 + height: 100%;
1219 /* fallback (Opera) */
1220 /* Mozilla: */
1221 /* Chrome, Safari:*/
@@ -1398,13 +1229,13 @@ a {
1229 height: 100%;
1230 width: 20px;
1231 float: right;
1401 - background-color: #ffffff;
1232 + background-color: #ffffff
1233 }
1234
1235 .h2 {
1236 background-position: 0% 0%;
1237 width: 14px;
1407 - height: 24px;
1238 + height: 100%;
1239 /* fallback (Opera) */
1240 /* Mozilla: */
1241 /* Chrome, Safari:*/
@@ -1602,107 +1433,13 @@ a {
1433 padding: 4px
1434 }
1435
1605 -
1606 -.deskareaicon {
1607 - cursor: pointer;
1608 - border: none;
1609 - float: right;
1610 - font-size: 130%;
1611 - margin-right: 4px;
1612 -}
1613 -
1614 -.areaHead {
1615 - padding-top: 2px;
1616 - padding-bottom: 2px;
1617 - background: #C0C0C0;
1618 -}
1619 -
1620 -.areaProgress {
1621 - background-color: gray;
1622 -}
1623 -
1624 -.areaProgress div {
1625 - height: 2px;
1626 - width: 0%;
1627 - background-color:red;
1628 -}
1629 -
1630 -.areaFoot {
1631 - padding-top: 2px;
1632 - padding-bottom: 2px;
1633 - background: #C0C0C0;
1634 -}
1635 -
1636 -.toright2 {
1637 - float: right;
1638 - text-align: right;
1639 - padding-right: 4px;
1640 -}
1641 -
1642 -#deskarea0 {
1643 - width: 100%;
1644 - padding: 0px;
1645 - padding: 0px;
1646 - margin-top: 0px;
1647 -}
1648 -
1649 - .fulldesk #deskarea0 {
1650 - min-width: 100%;
1651 - min-height: 0px;
1652 - height: 100%;
1653 - position: relative;
1654 - display: grid;
1655 - grid-gap: 0px;
1656 - grid-template-areas:
1657 - "deskarea1"
1658 - "deskarea2"
1659 - "deskarea3"
1660 - "deskarea4";
1661 - /* grid-template-columns: 90px auto; */
1662 - grid-template-rows: 24px max-content auto max-content;
1663 - }
1664 -
1665 - #deskarea0 .mR {
1666 - margin-right: 3px;
1667 - }
1668 -
1669 -#deskarea1 {
1670 - grid-area: deskarea1;
1671 -}
1672 -
1673 -
1674 -#deskarea2 {
1675 - grid-area: deskarea2;
1676 - background-color: gray;
1677 -}
1678 -
1679 -#progressbar {
1680 - height:2px;
1681 - width:0%;
1682 - background-color:red;
1683 -}
1684 -
1436 #deskarea3x {
1437 background: black;
1438 text-align: center;
1439 position: relative;
1440 overflow: hidden;
1690 - width: 100%;
1691 - max-height: calc(100vh - 292px); /* + 24px hight of submenu */
1692 - height: calc(100vh - 292px);
1441 }
1442
1695 - .room4submenu #deskarea3x {
1696 - max-height: calc(100vh - 292px);
1697 - height: calc(100vh - 292px);
1698 - }
1699 -
1700 - .fulldesk #deskarea3x {
1701 - grid-area: deskarea3;
1702 - max-height: none;
1703 - height: unset;
1704 - }
1705 -
1443 #DeskFocus {
1444 overflow: hidden;
1445 color: transparent;
@@ -1712,13 +1449,7 @@ a {
1449 }
1450
1451 #DeskParent {
1715 - margin: 0;
1716 - overflow:hidden;
1717 - height: 100%;
1718 - width: 100%;
1719 - position: absolute;
1720 - right: 0;
1721 - top: 0;
1452 + overflow:hidden
1453 }
1454
1455 #Desk {
@@ -1728,6 +1459,7 @@ a {
1459 margin-left: 0px;
1460 }
1461
1462 +
1463 #deskToolsBar {
1464 position: absolute;
1465 padding: 3px;
@@ -1739,27 +1471,6 @@ a {
1471 cursor: pointer;
1472 }
1473
1742 -#deskToolsArea {
1743 - position: absolute;
1744 - top: 26px;
1745 - left: 4px;
1746 - right: 4px;
1747 - bottom: 4px;
1748 - background-color: lightgray;
1749 - text-align: left;
1750 -}
1751 -
1752 -#deskToolsHeader {
1753 - border-bottom: 1px solid darkgray;
1754 - padding: 3px;
1755 -}
1756 -
1757 -#deskToolsHeader .colmn1 {
1758 - width: 50px;
1759 - padding-right: 5px;
1760 - float: left;
1761 -}
1762 -
1474 #DeskToolsProcesses {
1475 overflow-y: scroll;
1476 position: absolute;
@@ -1775,20 +1486,6 @@ a {
1486 background-color: #EFE8B6;
1487 }
1488
1778 -#deskarea4 {
1779 - grid-area: deskarea4;
1780 -}
1781 -
1782 -#DeskChatButton, #DeskNotifyButton, #DeskOpenWebButton {
1783 - float: right;
1784 - margin-top: 1px;
1785 - margin-right: 4px;
1786 - cursor: pointer;
1787 -}
1788 -
1789 -#DeskClip, #DeskControlSpan, #specialkeylist {
1790 - margin-left:6px;
1791 -}
1489
1490 .userTableHeader {
1491 border-bottom: 1pt solid lightgray;
@@ -1796,137 +1493,6 @@ a {
1493 padding-bottom: 4px;
1494 }
1495
1799 -#deskkeys {
1800 - margin-left: 6px;
1801 -}
1802 -
1803 -#p12BackButton {
1804 - float: left;
1805 -}
1806 -
1807 -#termTable {
1808 - width: 100%;
1809 - padding: 0px;
1810 - padding: 0px;
1811 - margin-top: 0px;
1812 -}
1813 -
1814 -#termarea3x {
1815 - background: black;
1816 - text-align: center;
1817 - height: 500px;
1818 - position: relative;
1819 -}
1820 -
1821 -#Term {
1822 - background: black;
1823 - margin: 0;
1824 - padding: 0;
1825 -}
1826 -
1827 -#p13toolbar {
1828 - width: 100%
1829 -}
1830 -#p13toolbar .areaHead {
1831 - border-bottom: 2px solid black;
1832 -}
1833 -
1834 -#p13toolbar .areaHead2 {
1835 - width: 100%;
1836 - background-color: #d3d9d6;
1837 - text-align: left;
1838 - padding: 4px;
1839 -}
1840 -
1841 -#p13toolbar .areaHead3 {
1842 - background-color:#E4E9E7;
1843 - height:28px;
1844 -}
1845 -
1846 -#p13filetable {
1847 - width: 100%;
1848 - height: calc(100vh - 346px);
1849 - overflow: auto;
1850 - -webkit-user-select: none;
1851 -}
1852 -
1853 -#p13bigok {
1854 - width: 256px;
1855 - overflow: hidden;
1856 - position: absolute;
1857 - left: 337px;
1858 - top: 200px;
1859 - text-align: center;
1860 - font-size: 1600%;
1861 - color: #AAAAAA;
1862 -}
1863 -
1864 -#p13bigfail {
1865 - width: 256px;
1866 - overflow: hidden;
1867 - position: absolute;
1868 - left: 337px;
1869 - top: 200px;
1870 - text-align: center;
1871 - font-size: 1600%;
1872 - color: #AAAAAA;
1873 -}
1874 -
1875 -#p14iframe {
1876 - width: 100%;
1877 - height: calc(100vh - 242px);
1878 - border: 0;
1879 - overflow: hidden;
1880 -}
1881 -
1882 -#p13toolbarBottom, #p13toolbar {
1883 - width: 100%;
1884 -}
1885 -
1886 -#consoleTable {
1887 - width: 100%;
1888 - padding: 0px;
1889 - padding: 0px;
1890 - margin-top: 0px;
1891 -}
1892 -
1893 -#p15agentConsole {
1894 - background: black;
1895 - margin: 0;
1896 - padding: 0;
1897 - color: lightgray;
1898 - width: 100%;
1899 - height: calc(100vh - 296px);
1900 - max-height: 500px;
1901 - position: relative;
1902 -}
1903 -
1904 -#p15coreName {
1905 - padding: 4px;
1906 - display: inline-block;
1907 -}
1908 -
1909 -#p15agentConsoleText {
1910 - position: absolute;
1911 - margin: 0;
1912 - padding: 0;
1913 - top: 0;
1914 - bottom: 0;
1915 - left: 0;
1916 - right: 0;
1917 - overflow-y: scroll;
1918 - overflow-x: auto;
1919 -}
1920 -
1921 -#p16events, #p31events {
1922 - max-height: calc(100vh - 269px);
1923 - overflow-y: auto;
1924 -}
1925 -
1926 -#p40 {
1927 - height:calc(100vh - 191px)
1928 -}
1929 -
1496 .viewSelector {
1497 width:32px;
1498 height:32px;
views/default.handlebars
+307 -259
@@ -53,6 +53,7 @@
53 <!-- main page -->
54 <div id=container>
55 <div id="notifiyBox" class="notifiyBox" style="display:none"></div>
56 + <div id=mastheadx></div>
57 <div id=masthead class=noselect>
58 <div class="title">{{{title}}}</div>
59 <div class="title2">{{{title2}}}</div>
@@ -82,13 +83,12 @@
83 <div class="lb6"></div>
84 </div>
85 </div>
85 - {{!-- <div id="page_content"> --}}
86 + <div id="page_content">
87 <div id=topbarmaster>
88 <div id=topbar class=noselect>
89 <div>
90 <div style="position:relative">
91 <div id=toggle title="Toggle full width" onclick="toggleFullScreen(1)">&harr;</div>
91 - <div id=toggle2 title="Toggle Main Menu position" onclick="toggleStackMenu(1)">&varr;</div>
92 <table id=MainMenuSpan cellpadding=0 cellspacing=0 class=style1>
93 <tr>
94 <td id=MainMenuMyDevices class="topbar_td style3x" onclick=go(1)>My Devices</td>
@@ -253,7 +253,7 @@
253 </div>
254 <div id="p2AccountActions">
255 <p><strong>Account actions</strong></p>
256 - <p class="mL">
256 + <p style="margin-left:40px">
257 <span id="verifyEmailId" style="display:none"><a onclick="account_showVerifyEmail()">Verify email</a><br /></span>
258 <a onclick="account_showChangeEmail()">Change email address</a><br />
259 <a onclick="account_showChangePassword()">Change password</a><span id="p2nextPasswordUpdateTime"></span><br />
@@ -272,9 +272,9 @@
272 <h1>My Events</h1>
273 <table class="pTable">
274 <tr>
275 - <td class="h1"></td>
276 - <td>&nbsp;<input id="p2deleteall" type=button onclick=showDeleteAllEventsDialog() style="display:none" value="Delete All..." /></td>
277 - <td class="auto-style1">
275 + <td class=h1></td>
276 + <td>&nbsp;<input id=p2deleteall type=button onclick=showDeleteAllEventsDialog() style="display:none" value="Delete All..." /></td>
277 + <td class=auto-style1>
278 Show
279 <select id=p3limitdropdown onchange=refreshEvents()>
280 <option value=60>Last 60</option>
@@ -284,7 +284,7 @@
284 <option value=1000>Last 1000</option>
285 </select>
286 </td>
287 - <td class="h2"></td>
287 + <td class=h2></td>
288 </tr>
289 </table>
290 <div id=p3events style=""></div>
@@ -293,8 +293,8 @@
293 <h1>My Users</h1>
294 <table class="pTable">
295 <tr>
296 - <td class="h1"></td>
297 - <td class="style14">
296 + <td class=h1></td>
297 + <td class=style14>
298 <div style="float:right">
299 <input type=button onclick=showUserBroadcastDialog() style=margin-right:6px value="Broadcast" />
300 </div>
@@ -303,14 +303,14 @@
303 <input id=UserSearchInput type=text style=width:120px;margin-left:6px placeholder=Filter onchange=onUserSearchInputChanged() onkeyup=onUserSearchInputChanged() autocomplete=off onfocus=onUserSearchFocus(1) onblur=onUserSearchFocus(0) />
304 </div>
305 </td>
306 - <td class="h2"></td>
306 + <td class=h2></td>
307 </tr>
308 </table>
309 <div id="p3users"></div>
310 </div>
311 <div id=p5 style="display:none">
312 <h1>My Files</h1>
313 - <table id="p5toolbar" cellpadding="0" cellspacing="0">
313 + <table id="p5toolbar" style="width:100%" cellpadding="0" cellspacing="0">
314 <tr>
315 <td id="p5filehead" valign=bottom>
316 <div id="p5rightOfButtons"></div>
@@ -351,7 +351,7 @@
351 <input type=submit id=p5fileCatchAllSubmit style="display:none" />
352 </form>
353 -->
354 - <div id="p5PublicShare" style=""><div>These files are shared publicly, click "link" to get public url.</div></div>
354 + <div id="p5PublicShare" style=""><div style="padding:4px">These files are shared publicly, click "link" to get public url.</div></div>
355 <div id="bigok" style="display:none"><b>&checkmark;</b></div>
356 <div id="bigfail" style="display:none"><b>&#10007;</b></div>
357 <span id="p5files"></span>
@@ -363,15 +363,13 @@
363 <div id=p6 style="display:none">
364 <img id=MainMeshImage src="serverpic.ashx">
365 <h1>My Server</h1>
366 - <div id="p2ServerActions">
367 - <p><strong>Server actions</strong></p>
368 - <div class="mL">
369 - <div id="p2ServerActionsBackup"><a href="/backup.zip" rel="noreferrer noopener" target="_blank">Download server backup</a></div>
370 - <div id="p2ServerActionsRestore"><a onclick="server_showRestoreDlg()">Restore server with backup</a></div>
371 - <div id="p2ServerActionsVersion"><a onclick="server_showVersionDlg()">Check server version</a></div>
372 - <div id="p2ServerActionsErrors"><a onclick="server_showErrorsDlg()">Show server error log</a></div>
373 - </div>
374 - </div>
366 + <p id="p2ServerActions"><strong>Server actions</strong></p>
367 + <p style="margin-left:40px">
368 + <div id="p2ServerActionsBackup"><a href="/backup.zip" rel="noreferrer noopener" target="_blank">Download server backup</a></div>
369 + <div id="p2ServerActionsRestore"><a onclick="server_showRestoreDlg()">Restore server with backup</a></div>
370 + <div id="p2ServerActionsVersion"><a onclick="server_showVersionDlg()">Check server version</a></div>
371 + <div id="p2ServerActionsErrors"><a onclick="server_showErrorsDlg()">Show server error log</a></div>
372 + </p>
373 <br /><strong>Server Statistics</strong><br /><br />
374 <div id="serverStats">
375 <div id="serverCpuChartView" style="display:none">
@@ -421,77 +419,81 @@
419 <div class="icon2"></div>
420 <div class="warningbox">Remote computer is not powered on, click here to issue a power command.</div>
421 </div>
424 -
425 - <div id=deskarea0 cellpadding=0 cellspacing=0>
426 - <div id=deskarea1 class="areaHead">
427 - <div class="toright2">
428 - <span id="p14power"></span>&nbsp;
429 - <div class='deskareaicon' title="Toggle Aspect Ratio" onclick="toggleAspectRatio(1)">&#8690;</div>
430 - <div class='deskareaicon' title="Rotate Left" onclick="drotate(-1)">&olarr;</div>
431 - <div class='deskareaicon' title="Rotate Right" onclick="drotate(1)">&orarr;</div>
432 - <input id="deskFocusBtn" type="button" title="Toggle focus mode, when active only the region around the mouse is updated" onkeypress="return false" onkeydown="return false" value="Focus All" onclick="deskToggleFocus()" style="margin-right:3px;display:none">
433 - <input id="deskSaveBtn" type="button" title="Save a screenshot of the remote desktop" onkeypress="return false" onkeydown="return false" value="Save..." onclick=deskSaveImage() class="mR">
434 - <input id="deskActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() class="mR" />
435 - <input id="deskActionsSettings" type="button" value="Settings..." title="Edit remote desktop settings" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" class="mR">
436 - <input type="button" title="Change the power state of the remote machine" onkeypress="return false" onkeydown="return false" value="Power Actions..." onclick="showPowerActionDlg()" style="display:none">
437 - </div>
438 - <div>
439 - <div id="idx_deskFullBtn2" onclick=deskToggleFull(event)>&nbsp;&#x2716;</div>
440 - <input type="button" id="autoconnectbutton1" value="AutoConnect" onclick=autoConnectDesktop(event) onkeypress="return false" onkeydown="return false" style="display:none">
441 - <span id=connectbutton1span>&nbsp;<input type=button id=connectbutton1 value="Connect" onclick=connectDesktop(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
442 - <span id=connectbutton1hspan>&nbsp;<input type=button id=connectbutton1h value="HW Connect" onclick=connectDesktop(event,2) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
443 - <span id=disconnectbutton1span>&nbsp;<input type=button id=disconnectbutton1 value="Disconnect" onclick=connectDesktop(event,0) onkeypress="return false" onkeydown="return false"></span>
444 - &nbsp;<span id="deskstatus">Disconnected</span>
445 - </div>
446 - </div>
447 - <div id=deskarea2 style="">
448 - <div class="areaProgress"><div id="progressbar" style=""></div></div>
449 - </div>
450 - <div id=deskarea3x>
451 - <div id=DeskFocus oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></div>
452 - <div id=DeskParent>
453 - <canvas id=Desk width=640 height=480 oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event) onmousewheel=dmousewheel(event)></canvas>
454 - </div>
455 - <div id=DeskTools>
456 - <a id=DeskToolsRefreshButton style="" onclick="refreshDeskTools()">Refresh</a>
457 - <div id=DeskToolsBar>Processes</div>
458 - <div id=deskToolsArea>
459 - <div id=deskToolsHeader>
460 - <a class="colmn1" title="Sort by process id" onclick=sortProcess(0)>PID</a>
461 - <a class="colmn2" title="Sort by name" onclick=sortProcess(1)>Name</a></div>
462 - <div id="DeskToolsProcesses" style=""></div>
422 + <table id=deskarea0 cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
423 + <tr id=deskarea1>
424 + <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
425 + <div style="float:right;text-align:right">
426 + <span id="p14power"></span>&nbsp;
427 + <div style='cursor:pointer;border:none;float:right;font-size:130%;margin-right:4px' title="Rotate Left" onclick="drotate(-1)">&olarr;</div>
428 + <div style='cursor:pointer;border:none;float:right;font-size:130%;margin-right:4px' title="Rotate Right" onclick="drotate(1)">&orarr;</div>
429 + <input id="deskFocusBtn" type="button" title="Toggle focus mode, when active only the region around the mouse is updated" onkeypress="return false" onkeydown="return false" value="Focus All" onclick="deskToggleFocus()" style="margin-right:3px;display:none">
430 + <input id="deskSaveBtn" type="button" title="Save a screenshot of the remote desktop" onkeypress="return false" onkeydown="return false" value="Save..." onclick=deskSaveImage() style=margin-right:3px>
431 + <input id="deskActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() style=margin-right:3px />
432 + <input id="deskActionsSettings" type="button" value="Settings..." title="Edit remote desktop settings" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" style="margin-right:3px">
433 + <input type="button" title="Change the power state of the remote machine" onkeypress="return false" onkeydown="return false" value="Power Actions..." onclick="showPowerActionDlg()" style="margin-right:3px;display:none">
434 </div>
464 - </div>
465 - </div>
466 - <div id=deskarea4 class="areaFoot">
467 - <div class="toright2">
468 - <select id=termdisplays style="display:none" onchange=deskSetDisplay(event) onclick=deskGetDisplayNumbers(event)></select>&nbsp;
469 - <input id=DeskToolsButton type=button value=Tools title="Toggle tools view" onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()">&nbsp;
470 - <span id=DeskChatButton class="deskarea" title="Open chat window to this computer"><img src='images/icon-chat.png' onclick=deviceChat() height=16 width=16 style=padding-top:2px /></span>
471 - <span id=DeskNotifyButton title="Display a notification on the remote computer"><img src='images/icon-notify.png' onclick=deviceToastFunction() height=16 width=16 style=padding-top:2px /></span>
472 - <span id=DeskOpenWebButton title="Open a web address on remote computer"><img src='images/icon-url2.png' onclick=deviceUrlFunction() height=16 width=16 style=padding-top:2px /></span>
473 - </div>
474 - <div>
475 - <select id="deskkeys">
476 - <option value=5>Win</option>
477 - <option value=0>Win+Down</option>
478 - <option value=1>Win+Up</option>
479 - <option value=2>Win+L</option>
480 - <option value=3>Win+M</option>
481 - <option value=4>Shift+Win+M</option>
482 - <option value=6>Win+R</option>
483 - </select>
484 - <input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
485 - <input id="DeskClip" style="" type="button" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()">
486 - <input id="DeskCAD" type="button" value="Ctrl-Alt-Del" onkeypress="return false" onkeydown="return false" onclick="sendCAD()">
487 - <label><span id="DeskControlSpan" title="Toggle mouse and keyboard input"><input id="DeskControl" type="checkbox" onkeypress="return false" onkeydown="return false" onclick="toggleKvmControl()">Input</span></label>&nbsp;
488 - </div>
489 - </div>
490 - </div>
435 + <div>
436 + <div id="idx_deskFullBtn2" onclick=deskToggleFull(event)>&nbsp;&#x2716;</div>
437 + <input type="button" id="autoconnectbutton1" value="AutoConnect" onclick=autoConnectDesktop(event) onkeypress="return false" onkeydown="return false" style="display:none">
438 + <span id=connectbutton1span>&nbsp;<input type=button id=connectbutton1 value="Connect" onclick=connectDesktop(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
439 + <span id=connectbutton1hspan>&nbsp;<input type=button id=connectbutton1h value="HW Connect" onclick=connectDesktop(event,2) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
440 + <span id=disconnectbutton1span>&nbsp;<input type=button id=disconnectbutton1 value="Disconnect" onclick=connectDesktop(event,0) onkeypress="return false" onkeydown="return false"></span>
441 + &nbsp;<span id="deskstatus">Disconnected</span>
442 + </div>
443 + </td>
444 + </tr>
445 + <tr id=deskarea2>
446 + <td>
447 + <div style=background-color:gray><div id=progressbar style=height:2px;width:0%;background-color:red></div></div>
448 + </td>
449 + </tr>
450 + <tr id=deskarea3>
451 + <td id=deskarea3x style="">
452 + <div id=DeskFocus oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></div>
453 + <div id=DeskParent>
454 + <canvas id=Desk width=640 height=480 oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event) onmousewheel=dmousewheel(event)></canvas>
455 + </div>
456 + <div id=DeskTools>
457 + <a id=DeskToolsRefreshButton style="" onclick="refreshDeskTools()">Refresh</a>
458 + <div id=DeskToolsBar>Processes</div>
459 + <div style="position:absolute;top:26px;left:4px;right:4px;bottom:4px;background-color:lightgray;text-align:left">
460 + <div style="border-bottom:1px solid darkgray;padding:3px"><a style=width:50px;padding-right:5px;float:left;cursor:pointer title="Sort by process id" onclick=sortProcess(0)>PID</a><a style=cursor:pointer title="Sort by name" onclick=sortProcess(1)>Name</a></div>
461 + <div id="DeskToolsProcesses" style=""></div>
462 + </div>
463 + </div>
464 + </td>
465 + </tr>
466 + <tr id=deskarea4>
467 + <td style=padding-top:2px;padding-bottom:2px;background:#C0C0C0>
468 + <div style=float:right;text-align:right>
469 + <select id=termdisplays style="display:none" onchange=deskSetDisplay(event) onclick=deskGetDisplayNumbers(event)></select>&nbsp;
470 + <input id=DeskToolsButton type=button value=Tools title="Toggle tools view" onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()">&nbsp;
471 + <span id=DeskChatButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Open chat window to this computer"><img src='images/icon-chat.png' onclick=deviceChat() height=16 width=16 style=padding-top:2px /></span>
472 + <span id=DeskNotifyButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Display a notification on the remote computer"><img src='images/icon-notify.png' onclick=deviceToastFunction() height=16 width=16 style=padding-top:2px /></span>
473 + <span id=DeskOpenWebButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Open a web address on remote computer"><img src='images/icon-url2.png' onclick=deviceUrlFunction() height=16 width=16 style=padding-top:2px /></span>
474 + </div>
475 + <div>
476 + <select style="margin-left:6px" id="deskkeys">
477 + <option value=5>Win</option>
478 + <option value=0>Win+Down</option>
479 + <option value=1>Win+Up</option>
480 + <option value=2>Win+L</option>
481 + <option value=3>Win+M</option>
482 + <option value=4>Shift+Win+M</option>
483 + <option value=6>Win+R</option>
484 + </select>
485 + <input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
486 + <input id="DeskClip" style="margin-left:6px;display:none" type="button" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()">
487 + <input id="DeskCAD" type="button" value="Ctrl-Alt-Del" onkeypress="return false" onkeydown="return false" onclick="sendCAD()">
488 + <label><span id="DeskControlSpan" style="margin-left:6px" title="Toggle mouse and keyboard input"><input id="DeskControl" type="checkbox" onkeypress="return false" onkeydown="return false" onclick="toggleKvmControl()">Input</span></label>&nbsp;
489 + </div>
490 + </td>
491 + </tr>
492 + </table>
493 </div>
494 <div id=p12 style="display:none">
495 <div id="p12title">
494 - <div id="p12BackButton"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
496 + <div id="p12BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
497 <h1>Terminal - <span id=p12deviceName></span></h1>
498 </div>
499 <div id="p12warning" onclick=showFeaturesDlg()>
@@ -502,11 +504,11 @@
504 <div class="icon2"></div>
505 <div class="warningbox">Remote computer is not powered on, click here to issue a power command.</div>
506 </div>
505 - <table id=termTable cellpadding=0 cellspacing=0>
507 + <table cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
508 <tr>
507 - <td class="areaHead">
508 - <div class="toright2">
509 - <input id="termActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction()/>
509 + <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
510 + <div style="float:right;text-align:right">
511 + <input id="termActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() style=margin-right:3px />
512 </div>
513 <div>
514 <input type="button" id="autoconnectbutton2" value="AutoConnect" onclick=autoConnectTerminal(event) onkeypress="return false" onkeydown="return false" style="display:none">
@@ -519,23 +521,23 @@
521 </tr>
522 <tr>
523 <td>
522 - <div class="areaProgress"><div id="termprogressbar" style=""></div></div>
524 + <div style="background-color:gray"><div id="termprogressbar" style="height:2px;width:0%;background-color:red"></div></div>
525 </td>
526 </tr>
527 <tr>
526 - <td id="termarea3x">
527 - <pre id="Term"></pre>
528 + <td style="background:black;text-align:center;height:500px;position:relative">
529 + <pre id="Term" style="background:black;margin:0;padding:0"></pre>
530 </td>
531 </tr>
532 <tr>
531 - <td class="areaFoot">
532 - <div class="toright2">
533 + <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
534 + <div style="float:right;text-align:right">
535 <span id="terminalSettingsButtons" style="display:none">
536 <input id="id_tcrbutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="CR+LF" title="Toggle what the return key will send" onclick="termToggleCr()">
537 <input id="id_tfxkeysbutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Intel (F10 = ESC+[OM)" title="Toggle F1 to F10 keys emulation type" onclick="termToggleFx()">
538 <input id="id_ttypebutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Extended Ascii" title="Toggle terminal emulation type" onclick="termToggleType()">
539 </span>
538 - <select id="specialkeylist" onkeypress="return false"></select>
540 + <select id="specialkeylist" onkeypress="return false" style="margin-left:5px"></select>
541 <input id="specialkeylistinput" type="button" onkeypress="return false" class="bottombutton" value="Send" title="Send the selected special key" onclick="sendSpecialKey()" />
542 </div>
543 <div>
@@ -555,11 +557,11 @@
557 <div id="p13BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
558 <h1>Files - <span id=p13deviceName></span></h1>
559 </div>
558 - <table id="p13toolbar" cellpadding="0" cellspacing="0">
560 + <table id="p13toolbar" style="width: 100%" cellpadding="0" cellspacing="0">
561 <tr>
560 - <td class="areaHead">
561 - <div class="toright2">
562 - <input id="filesActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() />
562 + <td style="background-color:#C0C0C0;border-bottom:2px solid black;padding:2px">
563 + <div style="float:right;text-align:right">
564 + <input id="filesActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() style=margin-right:3px />
565 </div>
566 <div>
567 <input id=p13AutoConnect value="AutoConnect" onclick=autoConnectFiles(event) onkeypress="return false" onkeydown="return false" type="button" style="display:none">
@@ -569,8 +571,8 @@
571 </td>
572 </tr>
573 <tr>
572 - <td class="areaHead2" valign=bottom>
573 - <div id="p13rightOfButtons" class="toright2"></div>
574 + <td style="width:100%;background-color:#d3d9d6;text-align:left;padding:4px" valign=bottom>
575 + <div id="p13rightOfButtons" style="float:right;margin-top:3px"></div>
576 <div>
577 <input type=button id=p13FolderUp disabled="disabled" onclick="p13folderup()" value="Up" />&nbsp;
578 <input type=button id=p13SelectAllButton disabled="disabled" onclick="p13selectallfile()" value="Select All" onkeypress="return false" onkeydown="return false" />&nbsp;
@@ -586,8 +588,8 @@
588 </td>
589 </tr>
590 <tr>
589 - <td class="areaHead3">
590 - <div class="toright2">
591 + <td style="background-color:#E4E9E7;height:28px">
592 + <div style=float:right>
593 <select id=p13sortdropdown onchange=p13updateFiles()>
594 <option value=1 selected="selected">Sort by name</option>
595 <option value=2>Sort by size</option>
@@ -601,12 +603,12 @@
603 </td>
604 </tr>
605 </table>
604 - <div id="p13filetable" style="">
605 - <div id="p13bigok" style="display:none"><b>&checkmark;</b></div>
606 - <div id="p13bigfail" style="display:none"><b>&#10007;</b></div>
606 + <div id="p13filetable" style="width:100%;height:calc(100vh - 346px);overflow:auto;-webkit-user-select:none">
607 + <div id="p13bigok" style="width:256px;overflow:hidden;position:absolute;left:337px;top:200px;text-align:center;font-size:1600%;color:#AAAAAA;display:none"><b>&checkmark;</b></div>
608 + <div id="p13bigfail" style="width:256px;overflow:hidden;position:absolute;left:337px;top:200px;text-align:center;font-size:1600%;color:#AAAAAA;display:none"><b>&#10007;</b></div>
609 <span id="p13files"></span>
610 </div>
609 - <table id="p13toolbarBottom" cellpadding=0 cellspacing=0>
611 + <table id="p13toolbarBottom" style=width:100% cellpadding=0 cellspacing=0>
612 <tr><td class=style6>&nbsp;<span id="p13bottomstatus"></span></td></tr>
613 </table>
614 </div>
@@ -615,18 +617,18 @@
617 <div id="p14BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
618 <h1>Intel&reg; AMT - <span id=p14deviceName></span></h1>
619 </div>
618 - <iframe id=p14iframe src="/commander.htm"></iframe>
620 + <iframe id=p14iframe style="width:100%;height:calc(100vh - 242px);border:0;overflow:hidden" src="/commander.htm"></iframe>
621 </div>
622 <div id=p15 style="display:none">
623 <div id="p15title">
624 <div id="p15BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
625 <h1><span id=p15deviceName></span></h1>
626 </div>
625 - <table id="consoleTable" cellpadding=0 cellspacing=0>
627 + <table cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
628 <tr>
627 - <td class="areaHead">
628 - <div class="toright2">
629 - <div id=p15coreName title="Information about current core running on this agent"></div>
629 + <td style=background:#C0C0C0>
630 + <div style=float:right;padding-right:4px>
631 + <div style=padding:4px;display:inline-block id=p15coreName title="Information about current core running on this agent"></div>
632 <input type=button id=p15uploadCore value="Agent Action" onclick=p15uploadCore(event) title="Change the agent Java Script code module" />
633 </div>
634 <div id="p15statetext" style=padding:4px></div>
@@ -634,16 +636,16 @@
636 </tr>
637 <tr>
638 <td>
637 - <div class="areaProgress"><div id="consoleprogressbar" style=""></div></div>
639 + <div style="background-color:gray"><div id="consoleprogressbar" style="height:2px;width:0%;background-color:red"></div></div>
640 </td>
641 </tr>
642 <tr>
641 - <td id=p15agentConsole>
642 - <pre id=p15agentConsoleText></pre>
643 + <td id=p15agentConsole style="background:black;margin:0;padding:0;color:lightgray;width:100%;height:calc(100vh - 296px);max-height:500px;position:relative">
644 + <pre id=p15agentConsoleText style="position:absolute;margin:0;padding:0;top:0;bottom:0;left:0;right:0;overflow-y:scroll;overflow-x:auto"></pre>
645 </td>
646 </tr>
647 <tr>
646 - <td class="areaFoot">
648 + <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
649 <table style="width:100%">
650 <tr>
651 <td style="width:99%">
@@ -662,24 +664,25 @@
664 <div id="p16BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
665 <h1>Events - <span id=p16deviceName></span></h1>
666 </div>
665 - <table class="pTable">
666 - <tr>
667 - <td class="h1"></td>
668 - <td>&nbsp;<input type=button onclick=refreshDeviceEvents() value="Refresh" /></td>
669 - <td class="auto-style1">
670 - Show
671 - <select id=p16limitdropdown onchange=refreshDeviceEvents()>
672 - <option value=60>Last 60</option>
673 - <option value=120>Last 120</option>
674 - <option value=250>Last 250</option>
675 - <option value=500>Last 500</option>
676 - <option value=1000>Last 1000</option>
677 - </select>
678 - </td>
679 - <td class="h2"></td>
680 - </tr>
681 - </table>
682 - <div id=p16events></div>
667 + <div style="width:100%;height:24px;background-color:#d3d9d6;margin-bottom:4px">
668 + <div class="h1pre">&nbsp;</div>
669 + <div class="h1" style="float:left">&nbsp;</div>
670 + <!--<div class=style14 style=height:100%;float:left>&nbsp;&nbsp;<input id=p31deleteall type=button style="display:none" value="Delete All..." />&nbsp;</div>-->
671 + <div class="style14" style="float:left">&nbsp;&nbsp;<input type=button value=Refresh onclick=refreshDeviceEvents() />&nbsp;</div>
672 + <div class="auto-style1" style="height:100%;float:right">
673 + Show
674 + <select id=p16limitdropdown onchange=refreshDeviceEvents()>
675 + <option value=60>Last 60</option>
676 + <option value=120>Last 120</option>
677 + <option value=250>Last 250</option>
678 + <option value=500>Last 500</option>
679 + <option value=1000>Last 1000</option>
680 + </select>
681 + <div class="h2end"></div>
682 + <div class="h2" style="height:100%;float:right">&nbsp;</div>
683 + </div>
684 + </div>
685 + <div id=p16events style="max-height:calc(100vh - 267px);overflow-y:auto"></div>
686 </div>
687 <div id=p20 style="display:none">
688 <picture id=MainMeshImage style=border-width:0px;height:200px;width:200px;float:right>
@@ -716,29 +719,30 @@
719 <div id=p31 style="display:none">
720 <div style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
721 <h1>Events - <span id=p31userName></span></h1>
719 - <table class="pTable">
720 - <tr>
721 - <td class="h1"></td>
722 - <td>&nbsp;<input type=button onclick=refreshUsersEvents() value="Refresh" /></td>
723 - <td class="auto-style1">
724 - Show
725 - <select id=p31limitdropdown onchange=refreshUsersEvents()>
726 - <option value=60>Last 60</option>
727 - <option value=120>Last 120</option>
728 - <option value=250>Last 250</option>
729 - <option value=500>Last 500</option>
730 - <option value=1000>Last 1000</option>
731 - </select>
732 - </td>
733 - <td class="h2"></td>
734 - </tr>
735 - </table>
736 - <div id=p31events></div>
722 + <div style="width:100%;height:24px;background-color:#d3d9d6;margin-bottom:4px">
723 + <div class="h1pre">&nbsp;</div>
724 + <div class="h1" style="height:100%;float:left">&nbsp;</div>
725 + <!--<div class=style14 style=float:left>&nbsp;&nbsp;<input id=p31deleteall type=button style="display:none" value="Delete All..." />&nbsp;</div>-->
726 + <div class="style14" style="float:left">&nbsp;&nbsp;<input type=button value=Refresh onclick=refreshUsersEvents() />&nbsp;</div>
727 + <div class="auto-style1" style="height:100%;float:right">
728 + Show
729 + <select id=p31limitdropdown onchange=refreshUsersEvents()>
730 + <option value=60>Last 60</option>
731 + <option value=120>Last 120</option>
732 + <option value=250>Last 250</option>
733 + <option value=500>Last 500</option>
734 + <option value=1000>Last 1000</option>
735 + </select>
736 + <div class="h2end"></div>
737 + <div class="h2" style="height:100%;float:right;">&nbsp;</div>
738 + </div>
739 + </div>
740 + <div id=p31events style="max-height:calc(100vh - 267px);overflow-y:scroll"></div>
741 </div>
738 - <div id=p40 style="display:none;">
742 + <div id=p40 style="display:none;height:calc(100vh - 170px)">
743 <h1>My Server Stats</h1>
740 - <div class="areaHead">
741 - <div class="toright2">
744 + <div style=width:100%;height:24px;background-color:#d3d9d6;margin-bottom:4px>
745 + <div style="float:right">
746 <select id=p40type onchange=updateServerTimelineStats()>
747 <option value=0>Connections</option>
748 <option value=1>Memory</option>
@@ -761,17 +765,24 @@
765 </div>
766 <br id="column_l_bottomgap" />
767 </div>
764 - <div id="footer">
765 - <div class="footer1">{{{footer}}}</div>
766 - <div class="footer2">
767 - <a id="verifyEmailId2" style="display:none" onclick="account_showVerifyEmail()">Verify Email</a>
768 - &nbsp;<a href=terms>Terms &amp; Privacy</a>
769 - </div>
768 + <div id=footer class=noselect>
769 + <table cellpadding=0 cellspacing=10 style="width:100%">
770 + <tr>
771 + <td style="text-align:left;color:white">
772 + {{{footer}}}
773 + </td>
774 + <td style="text-align:right">
775 + <a id="verifyEmailId2" style="color:yellow;margin-left:3px;cursor:pointer;display:none" onclick="account_showVerifyEmail()">Verify Email</a>
776 + <a style="margin-left:3px" href="terms">Terms &amp; Privacy</a>
777 + </td>
778 + </tr>
779 + </table>
780 </div>
781 <div id=dialog style="display:none">
782 <div id=dialogHeader>
773 - <div id=id_dialogclose onclick=setDialogMode()>&#x2716;</div>
774 - <div id=id_dialogtitle></div>
783 + <div id=id_dialogclose style=float:right;padding:3px;margin-right:3px;cursor:pointer onclick=setDialogMode()>&#x2716;</div>
784 + <div id=id_dialogtitle style=padding:5px></div>
785 + <div style=width:100%;margin:6px></div>
786 </div>
787 <div id=dialogBody>
788 <div id=dialog1>
@@ -781,38 +792,38 @@
792 <div id=id_dialogOptions></div>
793 </div>
794 <div id=dialog3 style="">
784 - <div id=d3upload>
785 - <div>File Selection</div>
786 - <select id=d3uploadMode onchange=d3modechange()>
795 + <div style=height:26px>
796 + <select id=d3uploadMode style=float:right;width:260px onchange=d3modechange()>
797 <option value=1>Local file upload</option>
798 <option value=2>Server file selection</option>
799 </select>
800 + <div>File Selection</div>
801 </div>
791 - <div id=d3localmode style="display:none">
792 - <div>Upload File</div>
802 + <div id=d3localmode style=height:26px;display:none>
803 <form id=d3localmodeform method=post enctype=multipart/form-data action=uploadfile.ashx target=fileUploadFrame>
804 <input type=text id=d3attrib name=attrib style="display:none" />
795 - <input type=file id=d3localFile name=files onchange=d3setActions() />
805 + <input type=file id=d3localFile name=files style=float:right;width:260px onchange=d3setActions() />
806 <input type=submit id=d3submit style="display:none" />
807 </form>
808 + <div>Upload File</div>
809 </div>
810 <div id=d3servermode>
800 - <div id=d3serveraction valign=bottom>
811 + <div style="width:100%;background-color:#d3d9d6;text-align:left;padding:3px" valign=bottom>
812 <input type=button id=p3FolderUp disabled="disabled" onclick=d3folderup() value="Up" />&nbsp;
813 </div>
803 - <div id=d3serverfiles></div>
814 + <div id=d3serverfiles style="width:100%;height:150px;background-color:white;padding:2px;border:1px solid gray;overflow-y:scroll"></div>
815 </div>
816 </div>
806 - <div id=dialog7 style="">
817 + <div id=dialog7 style="margin:auto;margin:3px">
818 +
819 <div id="d7meshkvm">
808 - <h4>Agent Remote Desktop</h4>
809 - <div>
810 - <div>Quality</div>
811 - <select id="d7bitmapquality" dir="rtl"></select>
820 + <h4 style="width:100%;border-bottom:1px solid gray">Agent Remote Desktop</h4>
821 + <div style="margin:3px 0 3px 0">
822 + <select id="d7bitmapquality" style="float:right;width:200px;height:20px" dir="rtl"></select>
823 + <div style="height:20px">Quality</div>
824 </div>
813 - <div>
814 - <div>Scaling</div>
815 - <select id="d7bitmapscaling" style="" dir="rtl">
825 + <div style="margin:3px 0 3px 0">
826 + <select id="d7bitmapscaling" style="float:right;width:200px;height:20px" dir="rtl">
827 <option selected=selected value=1024>100%</option>
828 <option value=896>87.5%</option>
829 <option value=768>75%</option>
@@ -822,50 +833,51 @@
833 <option value=256>25%</option>
834 <option value=128>12.5%</option>
835 </select>
836 + <div style="height:20px">Scaling</div>
837 </div>
826 - <div>
827 - <div>Frame rate</div>
828 - <select id="d7framelimiter" dir="rtl">
838 + <div style="margin:3px 0 3px 0">
839 + <select id="d7framelimiter" style="float:right;width:200px;height:20px" dir="rtl">
840 <option selected=selected value=50>Fast</option>
841 <option value=100>Medium</option>
842 <option value=400>Slow</option>
843 <option value=1000>Very slow</option>
844 </select>
845 + <div style="height:20px">Frame rate</div>
846 </div>
847 </div>
848 <div id="d7amtkvm">
837 - <h4>Intel&reg; AMT Hardware KVM</h4>
838 - <div>
839 - <div>Image Encoding</div>
840 - <select id="d7desktopmode">
849 + <h4 style="width:100%;border-bottom:1px solid gray">Intel&reg; AMT Hardware KVM</h4>
850 + <div style='height:26px'>
851 + <select id="d7desktopmode" style="float:right;width:200px">
852 <option value="1">RLE8, Fastest</option>
853 <option value="2">RLE16, Recommended</option>
854 <option value="3">RAW8, Slow</option>
855 <option value="4">RAW16, Very Slow</option>
856 </select>
857 + <div>Image Encoding</div>
858 </div>
847 - <div>
848 - <div>Other Settings</div>
849 - <div id="d7otherset">
859 + <div style="height:60px">
860 + <div style="float:right;border:1px solid #666;width:200px;height:60px;overflow-y:scroll;background-color:white">
861 <label><input type="checkbox" id='d7showfocus'>Show Focus Tool<br></label>
862 <label><input type="checkbox" id='d7showcursor'>Show Local Mouse Cursor<br></label>
863 <label><input type="checkbox" id='d7localKeyMap'>Local Keyboard Map<br></label>
864 </div>
865 + <div>Other Settings</div>
866 </div>
867 </div>
868 </div>
869 </div>
858 - <div id="idx_dlgButtonBar">
870 + <div id="idx_dlgButtonBar" style="padding:10px;margin-bottom:4px">
871 <input id="idx_dlgCancelButton" type="button" value="Cancel" style="" onclick="dialogclose(0)">
872 <input id="idx_dlgOkButton" type="button" value="OK" style="" onclick="dialogclose(1)">
861 - <div><input id=idx_dlgDeleteButton type=button value=Delete style="display:none" onclick="dialogclose(2)"></div>
873 + <div style="height:25px"><input id=idx_dlgDeleteButton type=button value=Delete style="display:none" onclick="dialogclose(2)"></div>
874 </div>
875 </div>
876 <iframe name="fileUploadFrame" style="display:none"></iframe>
877 <form style="display:none" method=post action=uploadfile.ashx enctype=multipart/form-data target=fileUploadFrame><input id=p5fileDragName name="name"><input id=p5fileDragSize name="size"><input id=p5fileDragType name="type"><input id=p5fileDragData name="data"><input id=p5fileDragLink name="link"><input type=submit id=p5loginSubmit2 style="display:none" /></form>
878 <form style="display:none" method=post action=uploadnodefile.ashx enctype=multipart/form-data target=fileUploadFrame><input id=p13fileDragName name="name"><input id=p13fileDragSize name="size"><input id=p13fileDragType name="type"><input id=p13fileDragData name="data"><input id=p13fileDragLink name="link"><input type=submit id=p13loginSubmit2 style="display:none" /></form>
879 <audio id="chimes"><source src="sounds/chimes.mp3" type="audio/mp3"></audio>
868 - {{!-- </div> --}}
880 + </div>
881 </div>
882 <script type="text/javascript">
883 'use strict';
@@ -893,7 +905,6 @@
905 var desktop;
906 var desktopsettings = { encoding: 2, showfocus: false, showmouse: true, showcad: true, quality: 40, scaling: 1024, framerate: 50, localkeymap: false };
907 var multidesktopsettings = { quality: 20, scaling: 128, framerate: 1000 };
896 - var deskAspectRatio = getstore('deskAspectRatio', false);
908 var terminal;
909 var files;
910 var debugLevel = parseInt("{{{debuglevel}}}");
@@ -915,10 +926,6 @@
926 if (webPageFullScreen == 'true') { webPageFullScreen = true; }
927 var passRequirements = "{{{passRequirements}}}";
928 if (passRequirements != "") { passRequirements = JSON.parse(decodeURIComponent(passRequirements)); }
918 -
919 - var webPageStackMenu = getstore('webPageStackMenu', false);
920 - if (webPageStackMenu == true || webPageStackMenu == 'true') { webPageStackMenu = true } else { webPageStackMenu = false };
921 - toggleStackMenu(0)
929
930 function startup() {
931 if ((features & 32) == 0) {
@@ -1032,29 +1039,6 @@
1039 setupServerTimelineStats();
1040 }
1041
1035 - // Toggle the web page to full screen
1036 - function toggleAspectRatio(toggle) {
1037 - if (toggle === 1) { deskAspectRatio = !deskAspectRatio; putstore('deskAspectRatio', deskAspectRatio); }
1038 - deskAdjust()
1039 - }
1040 -
1041 - // If FullScreen, toggle menu to be horisontal or vertical
1042 - function toggleStackMenu(toggle) {
1043 - if (webPageFullScreen == true) {
1044 - if (toggle === 1) {
1045 - webPageStackMenu = !webPageStackMenu;
1046 - putstore('webPageStackMenu', webPageStackMenu);
1047 - }
1048 - if (webPageStackMenu == false) {
1049 - QC('body').remove("menu_stack");
1050 - } else {
1051 - QC('body').add("menu_stack");
1052 - if (xxcurrentView >= 10) QC('column_l').remove('room4submenu');
1053 - }
1054 - deskAdjust();
1055 - }
1056 - }
1057 -
1042 // Toggle the web page to full screen
1043 function toggleFullScreen(toggle) {
1044 if (toggle === 1) { webPageFullScreen = !webPageFullScreen; putstore('webPageFullScreen', webPageFullScreen); }
@@ -1063,15 +1047,46 @@
1047 if (webPageFullScreen == false) {
1048 QC('body').remove("fullscreen");
1049 QC('body').remove("arg_hide");
1066 - if (xxcurrentView >= 10) QC('column_l').add('room4submenu');
1050 + /* QS('container').width = '960px';
1051 + QS('container')['border-right'] = '1px solid #b7b7b7';
1052 + QS('container')['border-left'] = '1px solid #b7b7b7';
1053 + QS('container')['min-width'] = '960px';
1054 + QS('container')['overflow'] = '';
1055 + QS('column_l').width = '930px';
1056 + QS('column_l').height = '';
1057 + QS('column_l')['margin-left'] = '';
1058 + QS('column_l')["overflow-y"] = '';
1059 + QS('column_l')["max-height"] = (xxcurrentView >= 10) ? 'calc(100vh - 159px)' : 'calc(100vh - 135px)';
1060 + QS('container').position = '';
1061 + QS('page_content').position = '';
1062 + QV('MainMenuSpan', true); */
1063 QV('UserDummyMenuSpan', false);
1068 - //QV('page_leftbar', false);
1064 + QV('page_leftbar', false);
1065 } else {
1066 QC('body').add("fullscreen");
1071 - if (hide & 16) QC('body').add("arg_hide"); // This is replacement for QV('page_leftbar', !(hide & 16));
1072 - if (xxcurrentView >= 10) QC('column_l').remove('room4submenu');
1067 + if (hide & 16) QC('body').add("arg_hide");
1068 + /* QS('container').position = 'absolute';
1069 + QS('container').width = '100%';
1070 + QS('container').top = '0px';
1071 + QS('container').bottom = '0px';
1072 + QS('container')['border-right'] = '0';
1073 + QS('container')['border-left'] = '0';
1074 + QS('container')['min-width'] = '700px';
1075 + QS('container')['overflow'] = 'hidden';
1076 + QS('page_content').position = 'absolute';
1077 + QS('page_content').top = '66px';
1078 + QS('page_content').left = (hide & 16)?'0px':'90px';
1079 + QS('page_content').right = '0px';
1080 + QS('page_content').bottom = '0px';
1081 + QS('column_l').height = 'calc(100vh - 135px)';
1082 + QS('column_l').width = 'calc(100% - 30px)';
1083 + QS('column_l')["overflow-y"] = 'auto';
1084 + QS('column_l')["max-height"] = 'calc(100vh - 135px)';
1085 + QV('MainMenuSpan', false); */
1086 QV('UserDummyMenuSpan', (xxcurrentView < 10) && webPageFullScreen);
1087 + QV('page_leftbar', !(hide & 16));
1088 }
1089 + //center();
1090 masterUpdate(512);
1091 QV('body', true);
1092 }
@@ -2307,7 +2322,7 @@
2322 multiDesktop[id] = desktop;
2323 desktop = desktopNode = currentNode = null;
2324 // Setup a replacement desktop
2310 - QH('DeskParent', '<canvas id="Desk" oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></canvas>');
2325 + QH('DeskParent', '<canvas id="Desk" width="640" height="480" style="width:100%;-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></canvas>');
2326 } else {
2327 // This is a new device, create a canvas for it.
2328 var c = document.createElement('canvas');
@@ -4139,7 +4154,7 @@
4154 var showEditNodeValueDialog_modes3 = ['', '', '', 'Tag1, Tag2, Tag3'];
4155 function showEditNodeValueDialog(mode) {
4156 if (xxdialogMode) return;
4142 - var x = addHtmlValue(showEditNodeValueDialog_modes[mode], '<input id=dp10devicevalue maxlength=64 placeholder="' + showEditNodeValueDialog_modes3[mode] + '" onchange=p10editdevicevalueValidate(' + mode + ',event) onkeyup=p10editdevicevalueValidate(' + mode + ',event) />');
4157 + var x = addHtmlValue(showEditNodeValueDialog_modes[mode], '<input id=dp10devicevalue style=width:230px maxlength=64 placeholder="' + showEditNodeValueDialog_modes3[mode] + '" onchange=p10editdevicevalueValidate(' + mode + ',event) onkeyup=p10editdevicevalueValidate(' + mode + ',event) />');
4158 setDialogMode(2, "Edit Device", 3, showEditNodeValueDialogEx, x, mode);
4159 var v = currentNode[showEditNodeValueDialog_modes2[mode]];
4160 if (v == null) v = '';
@@ -4178,6 +4193,7 @@
4193 QH('DeskParent', '');
4194 var c = xdesk.m.CanvasId;
4195 c.setAttribute('id', 'Desk');
4196 + c.setAttribute('style', 'width:100%;-ms-touch-action:none;margin-left:0px');
4197 c.setAttribute('onmousedown', 'dmousedown(event)');
4198 c.setAttribute('onmouseup', 'dmouseup(event)');
4199 c.setAttribute('onmousemove', 'dmousemove(event)');
@@ -4191,7 +4207,7 @@
4207 delete multiDesktop[currentNode._id];
4208 } else {
4209 // Device is not already connected, just setup a blank canvas
4194 - QH('DeskParent', '<canvas id=Desk oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></canvas>');
4210 + QH('DeskParent', '<canvas id=Desk width=640 height=480 style="width:100%;-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></canvas>');
4211 desktopNode = currentNode;
4212 }
4213 // Setup the mouse wheel
@@ -4487,19 +4503,45 @@
4503 var browserfullscreen = false;
4504 function deskToggleFull(e) {
4505 fullscreen = !fullscreen;
4506 + /* QV('mastheadx', !fullscreen);
4507 + QV('masthead', !fullscreen);
4508 + QV('topbar', !fullscreen);
4509 + QV('p11deviceNameHeader', !fullscreen);
4510 + QV('footer', !fullscreen);
4511 + QV('column_l_bottomgap', !fullscreen);
4512 + QV('idx_deskFullBtn2', fullscreen);
4513 + QV('deskFullBtn', !fullscreen);
4514 + QV('page_leftbar', !fullscreen); */
4515 if (fullscreen) {
4516 QC('body').add("fulldesk");
4492 - QS('deskarea3x').height = null;
4517 // If shift is pressed, enter browser full screen.
4518 if (e.shiftKey == true) { enterBrowserFullscreen(Q('deskarea0')); browserfullscreen = true; }
4519 + /* QS('column_l').width = '930px';
4520 + QS('column_l').height = '';
4521 + QS('column_l')['margin-left'] = '';
4522 + QS('column_l')['overflow-y'] = '';
4523 + QS('container').position = '';
4524 + QS('page_content').position = '';
4525 + QV('MainMenuSpan', true);
4526 + QS('container').width = '100%';
4527 + QS('container')['border-right'] = '0';
4528 + QS('container')['border-left'] = '0';
4529 + QS('column_l').padding = '0';
4530 + QS('column_l').width = '100%';
4531 + QS('column_l')["max-height"] = ''; */
4532 } else {
4533 QC('body').remove("fulldesk");
4534 exitBrowserFullscreen();
4535 browserfullscreen = false;
4536 + /* QS('container').width = '960px';
4537 + QS('container')['border-right'] = '1px solid #b7b7b7';
4538 + QS('container')['border-left'] = '1px solid #b7b7b7';
4539 + QS('column_l').padding = '0 15px';
4540 + QS('column_l').width = '930px'; */
4541 toggleFullScreen();
4542 }
4543 deskAdjust();
4502 - //deskAdjust();
4544 + deskAdjust();
4545 updateDesktopButtons();
4546 }
4547
@@ -4509,33 +4551,33 @@
4551 }
4552
4553 function deskAdjust() {
4512 - if (deskAspectRatio) {
4513 - QS('Desk').width = '100%';
4514 - QS('Desk').height = '100%';
4554 + var x = (Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - (Q('deskarea1').clientHeight + Q('deskarea2').clientHeight + Q('Desk').clientHeight + Q('deskarea4').clientHeight + 2)) / 2;
4555 + if (fullscreen) {
4556 + document.documentElement.style.overflow = 'hidden';
4557 QS('deskarea3x').height = null;
4516 - } else {
4517 - var parentH = Q('DeskParent').clientHeight;
4518 - var parentW = Q('DeskParent').clientWidth;
4519 - var deskH = Q('Desk').height;
4520 - var deskW = Q('Desk').width;
4521 - if (parentH / parentW > deskH / deskW) {
4522 - var hNew = (deskH * parentW / deskW) + 'px';
4523 - if (webPageFullScreen || fullscreen) {
4524 - QS('deskarea3x').height = null;
4525 - } else {
4526 - QS('deskarea3x').height = hNew;
4527 - }
4528 - QS('Desk').height = hNew;
4529 - QS('Desk').width = '100%';
4558 + if (x < 0) {
4559 + var mh = (Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - (Q('deskarea1').clientHeight + Q('deskarea2').clientHeight + Q('deskarea4').clientHeight));
4560 + var mw = 9999;
4561 + if (desktop) { mw = (desktop.m.width / desktop.m.height) * mh; }
4562 + if (webRtcDesktop && webRtcDesktop.softdesktop) { mw = (webRtcDesktop.softdesktop.m.width / webRtcDesktop.softdesktop.m.height) * mh; }
4563 + QS('Desk')['max-height'] = mh + 'px';
4564 + QS('Desk')['max-width'] = mw + 'px';
4565 + x = 0;
4566 } else {
4531 - var wNew = (deskW * parentH / deskH) + 'px';
4532 - if (webPageFullScreen || fullscreen) {
4533 - QS('Desk').height = null;
4534 - } else {
4535 - QS('Desk').height = '100%';
4536 - }
4537 - QS('Desk').width = wNew;
4567 + QS('Desk')['max-height'] = null;
4568 + QS('Desk')['max-width'] = null;
4569 }
4570 + QS('Desk')['margin-top'] = x + 'px';
4571 + QS('Desk')['margin-bottom'] = x + 'px';
4572 + } else {
4573 + var mw = 9999, mh = (Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - (webPageFullScreen?276:290));
4574 + if (desktop) { mw = (desktop.m.width / desktop.m.height) * mh; }
4575 + if (webRtcDesktop && webRtcDesktop.softdesktop) { mw = (webRtcDesktop.softdesktop.m.width / webRtcDesktop.softdesktop.m.height) * mh; }
4576 + document.documentElement.style.overflow = 'auto';
4577 + QS('Desk')['max-height'] = mh + 'px';
4578 + QS('Desk')['max-width'] = mw + 'px';
4579 + QS('Desk')['margin-top'] = '0';
4580 + QS('Desk')['margin-bottom'] = '0';
4581 }
4582 }
4583
@@ -7507,7 +7549,7 @@
7549 }
7550
7551 function center() {
7510 - if (xxcurrentView == 11) { deskAdjust(); }
7552 + if (xxcurrentView == 11) { deskAdjust(); } //deskAdjust(); }
7553 else if (xxcurrentView == 10) { masterUpdate(256); }
7554 else if (xxcurrentView == 1) { masterUpdate(4); }
7555 }
@@ -7580,7 +7622,14 @@
7622 QV('topbar', x != 0);
7623 if ((x == 0) && (webPageFullScreen)) {
7624 QC('body').add("arg_hide");
7583 - // QS('column_l').height = 'calc(100vh - 111px)';
7625 + QS('column_l').height = 'calc(100vh - 111px)';
7626 +
7627 + // Please check. I think this part is not needed anymore. Removing class will revert to default style
7628 + //QS('page_content').position = '';
7629 + //QV('page_leftbar', false);
7630 + //QS('column_l')["max-height"] = '';
7631 + //QV('column_l').left = 0;
7632 + //QV('page_content').left = 0;
7633 }
7634
7635 QV('MainSubMenuSpan', x >= 10 && x < 20);
@@ -7588,7 +7637,6 @@
7637 QV('MeshSubMenuSpan', x >= 20 && x < 30);
7638 QV('UserSubMenuSpan', x >= 30 && x < 40);
7639 QV('ServerSubMenuSpan', x == 6 || x == 115 || x == 40);
7591 -
7640 var panels = { 10: 'MainDev', 11: 'MainDevDesktop', 12: 'MainDevTerminal', 13: 'MainDevFiles', 14: 'MainDevAmt', 15: 'MainDevConsole', 16: 'MainDevEvents', 20: 'MeshGeneral', 30: 'UserGeneral', 31: 'UserEvents', 6: 'ServerGeneral', 40: 'ServerStats', 115: 'ServerConsole' };
7641 for (var i in panels) {
7642 QC(panels[i]).remove('style3x');
views/login.handlebars
+3 -2
@@ -220,8 +220,9 @@
220 </div>
221 <div id=dialog style="display:none">
222 <div id=dialogHeader>
223 - <div id=id_dialogclose onclick=setDialogMode()><b>X</b></div>
224 - <div id=id_dialogtitle></div>
223 + <div id=id_dialogclose style=float:right;padding:5px;cursor:pointer onclick=setDialogMode()><b>X</b></div>
224 + <div id=id_dialogtitle style=padding:5px></div>
225 + <div style=width:100%;margin:6px></div>
226 </div>
227 <div id=dialogBody>
228 <div id=dialog1>