diff --git a/meshuser.js b/meshuser.js index f0702142..95530a3d 100644 --- a/meshuser.js +++ b/meshuser.js @@ -1846,7 +1846,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use if (command.nodeid) { cookieContent.nodeid = command.nodeid; } if (command.tcpaddr) { cookieContent.tcpaddr = command.tcpaddr; } // Indicates the browser want to agent to TCP connect to a remote address if (command.tcpport) { cookieContent.tcpport = command.tcpport; } // Indicates the browser want to agent to TCP connect to a remote port - command.cookie = parent.parent.encodeCookie(cookieContent); + command.cookie = parent.parent.encodeCookie(cookieContent, parent.parent.loginCookieEncryptionKey); try { ws.send(JSON.stringify(command)); } catch (ex) { } } } diff --git a/public/styles/style-old.css b/public/styles/style-old.css deleted file mode 100644 index 2ff27514..00000000 --- a/public/styles/style-old.css +++ /dev/null @@ -1,1596 +0,0 @@ -body { - margin: 0; - padding: 0; - border: 0; - color: black; - font-size: 13px; - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - background-color: #d3d9d6; - overflow-y: hidden; -} - -#container { - background-color: #fff; - width: 960px; - min-width: 960px; - max-height: 100vh; - margin: 0 auto; - border-top: 0; - border-right: 1px solid #b7b7b7; - border-bottom: 0; - border-left: 1px solid #b7b7b7; - padding: 0; -} - - .fullscreen #container { - width: 100%; - min-width: 700px; - min-height: 0px; - border-right: 0px none #b7b7b7; - border-left: 0px none #b7b7b7; - } - - .fulldesk #container { - width: 100%; - min-width: 700px; - min-height: 0px; - border-right: 0px none #b7b7b7; - border-left: 0px none #b7b7b7; - position: unset; - } - -#masthead { - width: auto; - margin: 0; - padding: 0; - overflow: hidden; - text-align: right; - background-color: #036; - background-image: url(../logo.png); - background-position-x: 0px; - background-position-y: 0px; - background-attachment: initial; - background-repeat: no-repeat; - width: 960px; - height: 66px; -} - - .fullscreen #masthead { - width: 100%; - } - - .fulldesk #masthead { - display: none; - } - .fulldesk #mastheadx { - display: none; - } - .fulldesk #p11deviceNameHeader { - display: none; - } - -#masthead .title { - float: left; - height: 66px; - color: #c8c8c8; - padding-left: 20px; - padding-top: 8px; - font-size: 46px; - font-family: Arial,Helvetica,sans-serif; - font-weight: bold; -} - -#masthead .title2 { - float: left; - height: 66px; - color: #c8c8c8; - padding-left: 5px; - padding-top: 14px; - font-size: 14px; - font-family: Arial,Helvetica,sans-serif; - font-weight: bold; -} - -#page_content { - /*max-height: calc(100vh - 108px);*/ -} - .fullscreen #page_content { - position: absolute; - top: 66px; - left: 90px; - right: 0px; - bottom: 0px; - } - .arg_hide #page_content { - left: 0px; - } - .fulldesk #page_content { - position: static; - top: 0; - left: 0; - right: 0; - bottom: 0; - } - -#page_leftbar { - height: calc(100vh - 66px); - width: 90px; - position: absolute; - z-index: 1000; - background: #113962; - background: linear-gradient(to bottom, #104893 0%,#113962 100%); - color: white; -} - .fullscreen #page_leftbar { - display: block; - } - .arg_hide #page_leftbar { - display: none; - } - .fulldesk #page_leftbar { - display: none; - } - -#topbar { - /* height: 24px; */ - position: relative; -} - - .fulldesk #topbar { - display: none; - } - -.topbar_td { - width: 100px; - height: 24px; - cursor: pointer; -} -.topbar_td_end { - text-align: right; - height: 24px; -} - -#toggle { - cursor: pointer; - color: white; - position: absolute; - top: 3px; - right: 6px -} - -#MainMenuSpan, #MainSubMenu, #MeshSubMenu, #UserSubMenu, #ServerSubMenu, #UserDummyMenu { - width: 100%; - height: 22px -} - -#MainMenuSpan { - display: table; -} - .fullscreen #MainMenuSpan { - display: none; - } - .fulldesk #MainMenuSpan { - display: none; - } - -#column_l { - position: relative; - float: left; - width: 930px; - margin: 0; - padding: 0 15px; - background-color: #fff; - /*max-height: calc(100vh - 111px);*/ - min-width: unset; -} -.room4submenu { - max-height: calc(100vh - 159px) !important; -} - - .fullscreen #column_l { - height: calc(100vh - 135px); - width: calc(100% - 30px); - overflow-y: auto; - } - - .fulldesk #column_l { - width: 100%; - height: unset; - margin-left: unset; - overflow-y: unset; - padding: 0; - max-height: unset; - } - .fulldesk #column_l_bottomgap { - display: none; - } - -#centralTable { - width: 100%; -} - -#welcomeimage { - text-align: right; -} - -@media (max-width: 800px) { - .fullscreen #welcomeimage { - display: none; - } -} - -#welcomeimage img { - height: 310px; - width: 359px; -} - -#logincell { - text-align: center; -} - -#loginpanel, #createpanel, #resetpanel, #tokenpanel, #resettokenpanel, #resetpasswordpanel, #resetpasswordpanel { - display: inline-block; - margin: 0; - background-color: #979797; - border-radius: 16px; - width: 300px; - padding: 16px; - text-align: center; -} - -#passwordPolicyCallout, #rpasswordPolicyCallout { - left: -10px; - width: 100px; - position: absolute; - background-color: #FFC; - border-radius: 5px; - padding: 5px; - box-shadow: 0px 0px 15px #666; - font-size: 10px; -} - -#passWarning { - padding-top:6px; -} - -#footer { - clear: both; - overflow: auto; - width: 100%; - text-align: center; - background-color: #113962; - padding-top: 5px; - padding-bottom: 5px; -} - .fulldesk #footer { - display: none; - } - -/* Support for footer made with table */ -#footer table { - width:100%; - border-spacing: 10px; - border-collapse: separate; -} -#footer td:first-child { - text-align: left; - color:white; -} -#footer td { - padding: 0px; - text-align: right; - color: white; -} - -/* Support for new footer made with div (like masterhead) */ -.footer1 { - text-align: left; - float: left; - padding: 10px; - color: white; -} -.footer2 { - padding: 10px; - text-align: right; - color: white; -} - -#masthead img { - float: left; -} - -#masthead p { - font-size: 11px; - color: #fff; - margin: 10px 10px 0; -} - -#footer a { - color: #fff; - text-decoration: underline; -} - - #footer a:hover { - color: #fff; - text-decoration: none; - } - -#dialog { - z-index: 1000; - background-color: #EEE; - box-shadow: 0px 0px 15px #666; - font-family: Arial,Helvetica,sans-serif; - border-radius: 5px; - position: fixed; - top: 180px; - left: calc((100% / 2) - 200px); - width: 400px; -} - -#dialogHeader { - width: 100%; - background-color: #003366; - color: #FFF; - border-radius: 5px 5px 0 0; -} - -#dialogBody { - margin-right: 16px; - margin-left: 8px; -} - -.dialogText { - width: 100%; - max-height: 260px; - overflow-x: hidden; - overflow-y: auto; - line-height: 160% -} -.dialogTextLog { - font-size:10px -} - -#dialog1 { - margin: auto; - text-align: center; - margin: 3px; -} - -#id_dialogMessage { - padding:10px; -} - -#dialog2, #dialog3 { - margin: auto; - margin: 3px; -} - -#idx_dlgButtonBar { - padding: 10px; - margin-bottom: 20px; -} - -#idx_dlgCancelButton { - float: right; - width: 80px; - margin-left: 5px; -} - -#idx_dlgOkButton { - float: right; - width: 80px; -} - -#idx_dlgDeleteButton { - width: 80px; -} - -#ua_fileaccessquota { - width: 80px; - text-align: right -} - -#broadcastMessage { - width: 370px; - height: 100px; - resize: none; -} - -#idx_deskFullBtn2 { - float: left; - font-size: large; - cursor: pointer; - display: none; -} - .fulldesk #idx_deskFullBtn2 { - display: block; - } - .fulldesk #deskFullBtn { - display: none; - } - -#p0message { - margin: 50px; - text-align: center; -} - -#devListToolbarViewIcons { - float:right; -} - -#devListToolbarSpan { - width: 100%; - height: 24px; - background-color: #d3d9d6; - vertical-align: middle; - border-spacing: 0 -} - -#SearchInput { - width:120px; -} - -#devListToolbarView, #devListToolbarSort, #devListToolbarSize { - float: right; -} - -#refreshmap { - margin-left:5px; -} - -/* Example if is relplaced with

then image can be defined in css -#NoMeshesPanel { - background: url(../images/info.png) no-repeat 23px 20px; - height: 48px; - width: 47px; - width: 100%; - border: none; - margin: auto; - padding: 20px; -} - #NoMeshesPanel p { - display: inline-block; - vertical-align: middle; - margin-left: 60px; - } */ - - #NoMeshesPanel a { - cursor: pointer; - } - #NoMeshesPanel table { - width: 100%; - padding: 20px - } - NoMeshesPanel img { - height: 48px; - width: 47px; - } - -#xdevices { - max-height: calc(100vh - 239px); - overflow-y: auto; - overflow-x: hidden; - -webkit-overflow-scrolling: touch; -} - -#xdevicesmap { - height: calc(100vh - 239px); - width: 100%; - overflow: hidden; - position: relative; -} -#xmapSearchResultsDlg { - position: absolute; - max-height: 280px; - left: 5px; - top: 5px; - max-width: 250px; - z-index: 1000; - background-color: #EEE; - box-shadow: 0px 0px 15px #666; -} -#xmapSearchResultsBck { - width: 100%; - background-color: #003366; - color: #FFF; - border-radius: 5px 5px 0 0; -} - -#xmapSearchClose { - float: right; - padding: 5px; - cursor: pointer; -} - -.xmapItem { - overflow-y: auto; - width: 100%; - max-height: 240px -} -.xmapItemSel1 { - cursor: pointer; - padding: 5px; - background-color: #F5F5F5; -} -.xmapItemSel1 { - cursor: pointer; - padding: 5px; - background-color: #EBEBEB; -} - -#xmap-info-window { - text-shadow: 0px 0px 15px #FFF -} - -#p2 a, #p6 a, #p10 a { - cursor: pointer; -} - -#p2AccountImage { - width: 150px; - height: 103px; - margin-bottom: 10px; - margin-right: 20px; - float:right; -} - -.p2AccountActions { - width: 15px; - display: inline-block; -} -.p2AccountActions span { - color: green; - font-size: 10px; -} - -.newMeshBtn { - background: url(../images/icon-addnew.png) no-repeat 0px 0px; - height: 12px; - width: 12px; - cursor: pointer; - border: none; - padding-left: 15px; -} - -#p2noMeshFound, #p2ServerActionsBackup, #p2ServerActionsRestore, #p2ServerActionsVersion, #p2ServerActionsErrors, #serverStats { - margin-left:40px; -} - -.pTable { - width: 100%; - height: 24px; - background-color: #d3d9d6; - margin-bottom: 4px; - vertical-align: middle; - border-spacing: 0; - -} - -#p3users { - max-height: calc(100vh - 243px); - overflow-y: auto; -} -.p3usersTable { - width: 100%; - border-spacing: 0; - padding: 0; -} -.p3usersTable th { - color: gray; -} - -#p3events { - height: calc(100vh - 243px); - overflow-y: scroll -} - -.p3eventsTable { - width: 100%; - border-spacing: 0; - padding: 0; -} -.p3eventsTable { - width: 100%; - border-spacing: 0; - padding: 0; -} - -#p4name, #p4email, #p4pass1, #p4pass2 { - width: 230px; -} - -#p5filehead { - width: 100%; - background-color: #d3d9d6; - text-align: left; - padding: 4px; -} - -#p5filesubhead { - background-color: #E4E9E7; - height: 28px; -} - -#p5rightOfButtons { - float: right; - margin-top: 3px; -} - -#p5filetable { - width: 100%; - height: calc(100vh - 294px); - overflow: auto; - -webkit-user-select: none; - position: relative; -} - -#p5PublicShare { - display: none; - width: 100%; - overflow: auto; - -webkit-user-select: none; - background-color: lightsteelblue; -} - -#bigok { - width: 256px; - overflow: hidden; - position: absolute; - left: 337px; - top: 20px; - text-align: center; - font-size: 1600%; - color: #AAAAAA; -} - -#bigfail { - width: 256px; - overflow: hidden; - position: absolute; - left: 337px; - top: 20px; - text-align: center; - font-size: 1600%; - color: #AAAAAA; -} - -.chartViewCanvas { - width: 80px; - display: inline-block; -} - -.chartViewText { - width: 160px; - display: inline-block; -} - -#serverCpuChart, #serverMemoryChart { - width: 60px; - height: 60px; -} - -#p10BackButton, #p11BackButton { - float:left -} - -#p10html2 table { - color: black; - background-color: #EEE; - border-color: #AAA; - border-width: 1px; - border-style: solid; - border-collapse: collapse; - width: 100%; -} - #p10html2 thead { - background-color:#AAAAAA; - font-weight:bold; - } - #p10html2 thead tr { - background-color:#AAAAAA; - font-weight:bold; - } - #p10html2 thead img { - float: right; - cursor: pointer; - padding: 3px; - } - #p10html2 .altBack { - background-color: #DDD; - } - -.pwState { - display: table-cell; - height: 16px; -} -.pwsYellow { background-color: yellow; } -.pwsTransparent { background-color: #00000000; } -.pwsBlack { background-color: black; } -.pwsBlue { background-color: blue; } -.pwsBlue2 { background-color: blue; } -.pwsLightblue { background-color: lightblue; } -.pwsBlueviolet { background-color: blueviolet; } -.pwsDarkgreen { background-color: darkgreen; } -.pwsLightseagreen { background-color: lightseagreen; } -.pwsLightseagreen2 { background-color: lightseagreen; } - -.p10html3right { - float: right; - font-size: x-small; -} - -.p10html3left { - font-size: x-small; -} - -#MainComputerImage { - border-width: 0px; - height: 200px; - width: 200px; -} - -#MainComputerState { - font-size: 12px; - font-weight: bold; - width: 100%; - text-align: center; -} - -#d2groupop { - float: right; - width: 250px; -} - -#p12warning, #p12warning2, #p14warning, #p14warning2 { - max-width: 100%; - display:none; - cursor: pointer; - margin-bottom: 5px; -} - -#MainMeshImage { - border-width: 0px; - height: 200px; - width: 200px; - float: right; -} - -#DeskTools { - position: absolute; - width: 400px; - height: 100%; - background-color: gray; - top: 0; - right: 0; - border-left: 2px solid lightgray; - display: none; -} -#DeskToolsRefreshButton { - float: right; - padding: 3px; - cursor: pointer; -} - -a { - color: #036; - text-decoration: underline; -} - -.i1 { - background: url(../images/icons50.png) 0px 0px; - height: 50px; - width: 50px; - cursor: pointer; - border: none; -} - -.i2 { - background: url(../images/icons50.png) -50px 0px; - height: 50px; - width: 50px; - cursor: pointer; - border: none; -} - -.i3 { - background: url(../images/icons50.png) -100px 0px; - height: 50px; - width: 50px; - cursor: pointer; - border: none; -} - -.i4 { - background: url(../images/icons50.png) -150px 0px; - height: 50px; - width: 50px; - cursor: pointer; - border: none; -} - -.i5 { - background: url(../images/icons50.png) -200px 0px; - height: 50px; - width: 50px; - cursor: pointer; - border: none; -} - -.i6 { - background: url(../images/icons50.png) -250px 0px; - height: 50px; - width: 50px; - cursor: pointer; - border: none; -} - -.j1 { - background: url(../images/icons16.png) 0px 0px; - height: 16px; - width: 16px; - cursor: pointer; - border: none; -} - -.j2 { - background: url(../images/icons16.png) -16px 0px; - height: 16px; - width: 16px; - cursor: pointer; - border: none; -} - -.j3 { - background: url(../images/icons16.png) -32px 0px; - height: 16px; - width: 16px; - cursor: pointer; - border: none; -} - -.j4 { - background: url(../images/icons16.png) -48px 0px; - height: 16px; - width: 16px; - cursor: pointer; - border: none; -} - -.j5 { - background: url(../images/icons16.png) -64px 0px; - height: 16px; - width: 16px; - cursor: pointer; - border: none; -} - -.j6 { - background: url(../images/icons16.png) -80px 0px; - height: 16px; - width: 16px; - cursor: pointer; - border: none; -} - -.lbbutton { - width:74px; - height:74px; - border-radius:5px; - background-color:white; - margin-left:8px; - margin-top:8px; - position:relative; - cursor:pointer; - opacity:0.5; -} - -.lbbutton:hover { - opacity:1; -} - -.lbbuttonsel { - opacity:0.9; -} - -.lbbuttonsel2 { - width:82px; - border-radius:5px 0px 0px 5px; - opacity:1; -} - -.lb1 { - background: url(../images/leftbar-62.jpg) -0px 0px; - height: 62px; - width: 62px; - cursor: pointer; - border: none; - position:absolute; - top: 6px; - left: 6px -} - -.lb2 { - background: url(../images/leftbar-62.jpg) -75px 0px; - height: 62px; - width: 62px; - cursor: pointer; - border: none; - position:absolute; - top: 6px; - left: 6px -} - -.lb3 { - background: url(../images/leftbar-62.jpg) -150px 0px; - height: 62px; - width: 62px; - cursor: pointer; - border: none; - position:absolute; - top: 6px; - left: 6px -} - -.lb4 { - background: url(../images/leftbar-62.jpg) -225px 0px; - height: 62px; - width: 62px; - cursor: pointer; - border: none; - position:absolute; - top: 6px; - left: 6px -} - -.lb5 { - background: url(../images/leftbar-62.jpg) -294px 0px; - height: 62px; - width: 62px; - cursor: pointer; - border: none; - position:absolute; - top: 6px; - left: 6px -} - -.lb6 { - background: url(../images/leftbar-62.jpg) -360px 0px; - height: 62px; - width: 62px; - cursor: pointer; - border: none; - position:absolute; - top: 6px; - left: 6px -} - -.m0 { background : url(../images/images16.png) -32px 0px; height : 16px; width : 16px; border:none; float:left } -.m1 { background : url(../images/images16.png) -16px 0px; height : 16px; width : 16px; border:none; float:left } -.m2 { background : url(../images/images16.png) -96px 0px; height : 16px; width : 16px; border:none; float:left } -.m3 { background : url(../images/images16.png) -112px 0px; height : 16px; width : 16px; border:none; float:left } -.si0 { background : url(../images/icons16.png) 0px 0px; height : 16px; width : 16px; border:none; float:left } -.si1 { background : url(../images/icons16.png) -16px 0px; height : 16px; width : 16px; border:none; float:left } -.si2 { background : url(../images/icons16.png) -32px 0px; height : 16px; width : 16px; border:none; float:left } -.si3 { background : url(../images/icons16.png) -48px 0px; height : 16px; width : 16px; border:none; float:left } -.si4 { background : url(../images/icons16.png) -64px 0px; height : 16px; width : 16px; border:none; float:left } - -.mi { background : url(../images/meshicon50.png) 0px 0px; height: 50px; width: 50px; cursor:pointer; border:none } - -#floatframe { - position: fixed; - top: 200px; - height: 300px; - z-index: 200; - display: none; -} - -.style1 { - text-align: center; -} - -.style2 { - text-align: center; - background-color: #808080; - font-weight: bold; -} - -.style3 { - text-align: center; - color: white; - background-color: #808080; - font-weight: bold; -} - -.style3x { - text-align: center; - color: white; - background-color: #808080; - font-weight: bold; -} - - .style3x:hover { - background-color: #606060; - } - - .style3x.fullselect { - background-color: #003366; - } - - .style3x.semiselect { - background-color: #606060; - } - -.style3sel { - text-align: center; - color: white; - background-color: #003366; - font-weight: bold; -} - - -.style4 { - color: white; - text-decoration: none; -} - -.style5 { - text-align: center; - background-color: #808080; - font-weight: normal; -} - -.style6 { - text-align: left; - background-color: #D3D9D6; - padding:3px; -} - -.style7 { - font-size: large; - background-color: #FFFFFF; - width: 180px; -} - -.style9 { - max-width: 400px; - overflow: hidden; -} - -.style10 { - background-color: #C9C9C9; -} - -.style11 { - font-size: large; - background-color: #C9C9C9; -} - -.style14 { - height: 100%; - text-align: left; - background-color: #D3D9D6; -} - -.auto-style1 { - text-align: right; - background-color: #D3D9D6; -} - -.icon2 { - float: left; - margin: 7px; -} - -.warningbox { - width: auto; - border-radius: 8px; - padding: 8px; - background-color: lightsalmon; -} - -.fileIcon1 { - background: url(data:image/gif;base64,R0lGODlhEAAQAJEDAPb49Y2Sj9LT2f///yH5BAEAAAMALAAAAAAQABAAAAImnI+py+1vhJwyUYAzHTL4D3qdlJWaIFJqmKod607sDKIiDUP63hQAOw==); - height: 16px; - width: 16px; - cursor: pointer; - border: none; - float: left; - margin-top: 1px; -} - -.fileIcon2 { - background: url(data:image/gif;base64,R0lGODlhEAAQAJEDAM2xV/Xur+XPgP///yH5BAEAAAMALAAAAAAQABAAAAJD3ISZIGHWUGihznesYDYATFVM+D2hJ4lgN1olxALAtAlmPCJvuMmJd6PJckDYwicrHhTD5o7plJmg0Uc0asNMkphHAQA7); - height: 16px; - width: 16px; - cursor: pointer; - border: none; - float: left; - margin-top: 1px; -} - -.fileIcon3 { - background: url(data:image/gif;base64,R0lGODlhEAAQAJEDAPb19IGBgbq6uv///yH5BAEAAAMALAAAAAAQABAAAAIy3ISpxgcPH2ouQgFEw1YmxnUXKEaaEZZnVWZk66JwzKpvuwZzwOgwb/C1gIOA8Yg8DgoAOw==); - height: 16px; - width: 16px; - cursor: pointer; - border: none; - float: left; - margin-top: 1px; -} - -.fileIcon4 { - background: url(../images/meshicon16.png); - height: 16px; - width: 16px; - cursor: pointer; - border: none; - float: left; - margin-top: 1px; -} - -.filelist { - -moz-user-select: none; - -khtml-user-select: none; - -webkit-user-select: none; - -o-user-select: none; - cursor: default; - -khtml-user-drag: element; - background-color: white; - clear: both; -} - -.noselect { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -.fsize { - float: right; - text-align: right; - width: 180px; -} - -.g1 { - background-position: 0% 0%; - width: 14px; - height: 100%; - float: left; - /* fallback (Opera) */ - /* Mozilla: */ - /* Chrome, Safari:*/ - background-image: linear-gradient(to right, #ffffff 0%, #c9c9c9 100%); - background-color: #c9c9c9; - background-repeat: repeat; - background-attachment: scroll; -} - #p3events .g1 { - float: none; - } - #p3users .g1 { - height:24px; - float: left; - } - -.g1s { - background-image: linear-gradient(to right, #ffffff 0%, #b9b9b9 100%); -} - -.g2 { - background-position: 0% 0%; - width: 14px; - height: 100%; - float: right; - /* fallback (Opera) */ - /* Mozilla: */ - /* Chrome, Safari:*/ - background-image: linear-gradient(to right, #c9c9c9 0%, #ffffff 100%); - background-color: #c9c9c9; - background-repeat: repeat; - background-attachment: scroll; -} - #p3events .g2 { - float: none; - } - #p3users .g2 { - height:24px; - float: right; - } - -.g2s { - background-image: linear-gradient(to right, #b9b9b9 0%, #ffffff 100%); -} - -.h1pre { - width: 16px; - height: 100%; - float: left; - font-size: large; - background-color: #FFFFFF; -} - -.h1 { - background-position: 0% 0%; - width: 14px; - height: 100%; - /* fallback (Opera) */ - /* Mozilla: */ - /* Chrome, Safari:*/ - background-image: linear-gradient(to right, #ffffff 0%, #d3d9d6 100%); - background-color: #d3d9d6; - background-repeat: repeat; - background-attachment: scroll; -} - -.h2end { - height: 100%; - width: 20px; - float: right; - background-color: #ffffff -} - -.h2 { - background-position: 0% 0%; - width: 14px; - height: 100%; - /* fallback (Opera) */ - /* Mozilla: */ - /* Chrome, Safari:*/ - background-image: linear-gradient(to right, #d3d9d6 0%, #ffffff 100%); - background-color: #d3d9d6; - background-repeat: repeat; - background-attachment: scroll; -} - -.e1 { - font-size: large; - margin-top: 4px; - margin-bottom: 3px; - overflow: hidden; - word-wrap: hyphenate; - white-space: nowrap; - text-overflow: ellipsis; -} - -.e2 { - float: left; - height: 100%; - background-color: #c9c9c9; -} - -.e2s { - background-color: #b9b9b9; -} - -.bar { - font-size: large; - background-color: #C9C9C9; - height: 24px; - float: left; - margin-bottom: 2px; -} - #p3users .bar { - width: 100%; - font-size: medium; - } - -.baricon { - float: left; - height: 24px; - width: 24px; - background-color: white; -} - .baricon div { - width: 16px; - margin-top: 4px; - margin-left: 2px; - height: 16px - } - -.bar2 { - font-size: large; - height: 24px; - float: left; - margin-bottom: 2px; -} - -.bar18 { - font-size: large; - background-color: #C9C9C9; - height: 18px; - float: left; - margin-bottom: 2px; -} - -.bar182 { - font-size: large; - height: 18px; - float: left; - margin-bottom: 2px; -} - -.devHeaderx { - color: lightgray; -} - -.DevSt { - border-bottom-style: solid; - border-bottom-width: 1px; - border-bottom-color: #DDDDDD; -} - -.contextMenu { - background: #F9F9F9; - box-shadow: 0 0 12px rgba( 0, 0, 0, .3 ); - border: 1px solid #ccc; - /*border-radius: 4px;*/ - display: none; - position: absolute; - top: 0; - left: 0; - list-style: none; - margin: 0; - padding: 5px; - min-width: 100px; - max-width: 150px; - z-index: 500; -} - -.cmtext { - color: #444; - display: inline-block; - padding-left: 8px; - padding-right: 8px; - padding-top: 5px; - padding-bottom: 5px; - text-decoration: none; - width: 85%; - cursor: default; - overflow: hidden; - position: relative; -} - - .cmtext:hover { - color: #f9f9f9; - background: #444; - } - -.gray { - /*filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");*/ /* Firefox 10+, Firefox on Android */ - filter: gray; /* IE6-9 */ - -webkit-filter: grayscale(100%) opacity(60%); /* Chrome 19+, Safari 6+, Safari 6+ iOS */ -} - -.unselectable { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -.notifiyBox { - position: absolute; - z-index:1000; - top: 50px; - right: 26px; - width: 300px; - text-align: left; - background-color: #F0ECCD; - border: 4px solid #666; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; - -webkit-box-shadow: 2px 2px 4px #888; - -moz-box-shadow: 2px 2px 4px #888; - box-shadow: 2px 2px 4px #888; - max-height:200px; -} - -.notifiyBox:before { - content: ' '; - position: absolute; - width: 0; - height: 0; - right: 5px; - top: -30px; - border: 15px solid; - border-color: transparent #666 #666 transparent; -} - -.notifiyBox:after { - content: ' '; - position: absolute; - width: 0; - height: 0; - right: 7px; - top: -24px; - border: 12px solid; - border-color: transparent #F0ECCD #F0ECCD transparent; -} - -.notification { - width:100%; - min-height:30px; -} - -.notification:hover { - background-color: #EFE8B6; -} - -#notificationCount { - min-width: 28px; - font-size: 20px; - border-radius: 5px; - background-color: lightblue; - text-align: center; - margin: 8px; - cursor: pointer; - padding: 4px -} - -#deskarea3x { - background: black; - text-align: center; - position: relative; - overflow: hidden; -} - -#DeskFocus { - overflow: hidden; - color: transparent; - border:3px dotted rgba(255,0,0,.2); - position: absolute; - border-radius: 5px; -} - -#DeskParent { - overflow:hidden -} - -#Desk { - overflow: hidden; - width: 100%; - -ms-touch-action: none; - margin-left: 0px; -} - - -#deskToolsBar { - position: absolute; - padding: 3px; - border-radius: 3px 3px 0px 0px; - top: 5px; - left: 4px; - bottom: 26px; - background-color:lightgray; - cursor: pointer; -} - -#DeskToolsProcesses { - overflow-y: scroll; - position: absolute; - top: 24px; - bottom: 0px; - width: 100% -} - -.deskToolsBar { - padding: 3px; -} -.deskToolsBar:hover { - background-color: #EFE8B6; -} - - -.userTableHeader { - border-bottom: 1pt solid lightgray; - padding-top: 4px; - padding-bottom: 4px; -} - -.viewSelector { - width:32px; - height:32px; - background-color:#DDD; - border-radius:3px; - float:left; - margin-left:5px; - cursor: pointer; - opacity: 0.3; -} - -.viewSelectorSel { - background-color:#BBB; - opacity: 0.8; -} - - .viewSelector:hover { - opacity: 0.5; - background-color:#AAA; - } - - -.viewSelector1 { - margin-left:2px; - margin-top:2px; - background: url(../images/views.png) -0px 0px; - height: 28px; - width: 28px; -} - -.viewSelector2 { - margin-left:2px; - margin-top:2px; - background: url(../images/views.png) -28px 0px; - height: 28px; - width: 28px; -} - -.viewSelector3 { - margin-left:2px; - margin-top:2px; - background: url(../images/views.png) -56px 0px; - height: 28px; - width: 28px; -} - -.viewSelector4 { - margin-left:2px; - margin-top:2px; - background: url(../images/views.png) -84px 0px; - height: 28px; - width: 28px; -} - -.viewSelector5 { - margin-left:2px; - margin-top:2px; - background: url(../images/views.png) -112px 0px; - height: 28px; - width: 28px; -} - -.backButtonEx { - margin-left:2px; - margin-top:2px; - background: url(../images/views.png) -140px 0px; - height: 28px; - width: 28px; -} - -.backButton { - width:32px; - height:32px; - background-color:#DDD; - border-radius:3px; - float:left; - margin-right:5px; - cursor: pointer; - opacity: 0.3; -} - .backButton:hover { - opacity: 0.5; - background-color:#AAA; - } - -.hoverButton { - opacity: 0.5; - width: 10px; - height: 10px; -} - - .hoverButton:hover { - opacity: 1; - } - -.tagSpan { - background-color: lightgray; - padding: 3px; - margin-right: 4px; - border-radius: 5px; -} \ No newline at end of file diff --git a/views/default-min.handlebars b/views/default-min.handlebars index 1940958c..6b9a3757 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 27cd5126..c8277115 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -1449,7 +1449,7 @@ case 'getcookie': { if (message.tag == 'clickonce') { var basicPort = "{{{serverRedirPort}}}" == "" ? "{{{serverPublicPort}}}" : "{{{serverRedirPort}}}"; - var rdpurl = "http://" + window.location.hostname + ":" + basicPort + "/clickonce/minirouter/MeshMiniRouter.application?WS=wss%3A%2F%2F" + window.location.hostname + "%2Fmeshrelay.ashx%3Fauth=" + message.cookie + "&CH={{{webcerthash}}}&AP=" + message.protocol + ((debugmode == 1) ? "" : "&HOL=1"); + var rdpurl = "http://" + window.location.hostname + ":" + basicPort + "/clickonce/minirouter/MeshMiniRouter.application?WS=wss%3A%2F%2F" + window.location.hostname + "%2Fmeshrelay.ashx%3Fauth=" + message.cookie + "&CH={{{webcerthash}}}&AP=" + message.protocol + ((debugmode == 1) ? "" : "&XHOL=1"); var newWindow = window.open(rdpurl, '_blank'); newWindow.opener = null; } diff --git a/views/login-min.handlebars b/views/login-min.handlebars index f19afd6a..5f2c720b 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 867b086c..2d81b7d0 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