From 4f036292748263661f40184706363fbf4c82df02 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 1 Sep 2020 11:51:06 -0700 Subject: [PATCH] First version of alternate style login page. --- meshcentral-config-schema.json | 1 + public/images/login/2fa-mail-48.png | Bin 1695 -> 2107 bytes public/images/login/file48.png | Bin 0 -> 1062 bytes public/scripts/amt-wsman-0.2.0-min.js | 2 +- sample-config-advanced.json | 1 + translate/translate.js | 2 + translate/translate.json | 272 +++++++++++++++++++------- views/agentinvite.handlebars | 6 +- views/download.handlebars | 32 ++- views/download2.handlebars | 88 +++++++++ views/error404.handlebars | 6 +- views/error4042.handlebars | 46 +++++ views/invite.handlebars | 6 +- views/login2.handlebars | 31 +-- views/message.handlebars | 6 +- views/terms.handlebars | 6 +- webserver.js | 13 +- 17 files changed, 400 insertions(+), 118 deletions(-) create mode 100644 public/images/login/file48.png create mode 100644 views/download2.handlebars create mode 100644 views/error4042.handlebars diff --git a/meshcentral-config-schema.json b/meshcentral-config-schema.json index 8809567f..ff81f54a 100644 --- a/meshcentral-config-schema.json +++ b/meshcentral-config-schema.json @@ -141,6 +141,7 @@ "items": { "type": "object", "properties": { + "siteStyle": { "type": "integer", "default": 1, "description": "Valid numbers are 1 and 2, changes the style of the login page and some secondary pages." } "title": { "type": "string" }, "title2": { "type": "string" }, "titlePicture": { "type": "string" }, diff --git a/public/images/login/2fa-mail-48.png b/public/images/login/2fa-mail-48.png index 145fe236f1b9abed2379e3940afa9e640f3d5336..2b4be4360b5874a52ca610b93238dad4c15e5ecf 100644 GIT binary patch delta 2044 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 b&V%TGABys}6VWL$00000NkvXXu0mjfRtX!Z diff --git a/public/images/login/file48.png b/public/images/login/file48.png new file mode 100644 index 0000000000000000000000000000000000000000..1e6da0df90c4e0f9da5543d4033cdd1fab231896 GIT binary patch literal 1062 zcmV+>1ljwEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1G`B?K~!i%-I+^I z6Hye$&z&iq76_mvYCvLq#JEr}s2fpvEY!r9;1|Fz;8KknTo~z(z;tTb9nA zCE6$`Ti>_B?-lB!OBHK+(-D%sHKns>u^Bf5s0eB~AFB3?@WbHB8QgaaYvAY%p^2wXGr<~&tu9sQyKX@y zC=)rGU=666D%MS2UbGHJCM*|mfk>IidQFsy0V1b0!5hGQ(}HtDCXk6|*_dDrn2+O( z=o;H|R;Spal+b)cgNZp+Zy92HVY9ae9oIr_6}5Zb=*_$$Fu&XVVW?765GGN?Rc(2E zYPRXgjU%J_p$u39?JgQ1G&K&;S#lr@kJ1?jJ;14;H~1fLRzr2&J9%e#bJ21?a7jHV157;w5I8NXpp(KC=j z@+hEG2G9)7db-F2L&+E*Fe1Ol+WWej z-s;T^9A&_RzgF!Y4}&t$mum*Bm<|IBO$t_@Cjn)?PklIn z&%l*Xo8RCpWHy^d`|JQVh|XdLZkuO-?f)bi;7X{r5}?N6o1=vYz-;2xt1(nULAMNa zwOFqKD`*Ye?>7&_RRhO%YjCh$Z{!HAg@GR~88~5Kpb(IO_ih>3htD7l0qYVPoe?lG zuQ#&9nSsl^fs3>T4qF?z7ZmU^#13Uj!a#S923jl(?B4;f%SHxkO>#vCy($bC;0OgcL&@n>zz)Y-P=GN(!h%3=FJ+ zu~#?0s_}on4EimIXl#lBcTHj68b$w%#FXm#Z{>l#jgrT^6|Z}_-4A4qh7-RyGBf!2 z@_6vh5FUspk7r^hph_Xhb!enU2&S}m$K~v*X*km4e>=_^^aLQJJGLWbs gnsxRcX#fEK0qfZ4FDyOjJ^%m!07*qoM6N<$f(!`Sh5!Hn literal 0 HcmV?d00001 diff --git a/public/scripts/amt-wsman-0.2.0-min.js b/public/scripts/amt-wsman-0.2.0-min.js index 389c6296..293387e7 100644 --- a/public/scripts/amt-wsman-0.2.0-min.js +++ b/public/scripts/amt-wsman-0.2.0-min.js @@ -1 +1 @@ -var WsmanStackCreateService=function(e,s,r,a,o,t){var p={};function l(e){if(!e)return"";var s=" ";for(var r in e)e.hasOwnProperty(r)&&0===r.indexOf("@")&&(s+=r.substring(1)+'="'+e[r]+'" ');return s}function w(e){if(!e)return"";if("string"==typeof e)return e;if(e.InstanceID)return''+e.InstanceID+"";var s="";for(var r in e)if(e.hasOwnProperty(r)){if(s+='',e[r].ReferenceParameters){s+="",s+=""+e[r].Address+""+e[r].ReferenceParameters.ResourceURI+"";var a=e[r].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(a))for(var o=0;o"+a[o].Value+"";else s+=""+a.Value+"";s+=""}else s+=e[r];s+=""}return s+=""}return p.NextMessageId=1,p.Address="/wsman",p.comm=CreateWsmanComm(e,s,r,a,o,t),p.PerformAjax=function(e,o,s,r,a){null==a&&(a=""),p.comm.PerformAjax('
"+e,function(e,s,r){if(200==s){var a=p.ParseWsman(e);a&&null!=a?o(p,a.Header.ResourceURI,a,200,r):o(p,null,{Header:{HttpError:s}},601,r)}else o(p,null,{Header:{HttpError:s}},s,r)},s,r)},p.CancelAllQueries=function(e){p.comm.CancelAllQueries(e)},p.GetNameFromUrl=function(e){var s=e.lastIndexOf("/");return-1==s?e:e.substring(s+1)},p.ExecSubscribe=function(e,s,r,a,o,t,n,l,c,d){var m="",i="";null!=c&&null!=d&&(m="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#UsernameToken"+c+''+d+"",i=''),l=null!=l&&null!=l?""+l+"":"";var u="http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"+w(n)+m+'
'+r+""+i+"PT0.000000S";p.PerformAjax(u+"",a,o,t,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing" xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:se="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:m="http://x.com"')},p.ExecUnSubscribe=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"+w(o)+"";p.PerformAjax(t+"",s,r,a,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing"')},p.ExecPut=function(e,s,r,a,o,t){var n="http://schemas.xmlsoap.org/ws/2004/09/transfer/Put"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60.000S"+w(t)+""+function(e,s){if(!e||null==s)return"";var r=p.GetNameFromUrl(e),a="';for(var o in s)if(s.hasOwnProperty(o)&&0!==o.indexOf("__")&&0!==o.indexOf("@")&&void 0!==s[o]&&null!==s[o]&&"function"!=typeof s[o])if("object"==typeof s[o]&&s[o].ReferenceParameters){a+=""+s[o].Address+""+s[o].ReferenceParameters.ResourceURI+"";var t=s[o].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(t))for(var n=0;n"+t[n].Value+"";else a+=""+t.Value+"";a+=""}else if(Array.isArray(s[o]))for(n=0;n"+s[o][n].toString()+"";else a+=""+s[o].toString()+"";return a+=""}(e,s);p.PerformAjax(n+"",r,a,o)},p.ExecCreate=function(e,s,r,a,o,t){var n=p.GetNameFromUrl(e),l="http://schemas.xmlsoap.org/ws/2004/09/transfer/Create"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(t)+"';for(var c in s)l+=""+s[c]+"";p.PerformAjax(l+"",r,a,o)},p.ExecCreateXml=function(e,s,r,a,o){var t=p.GetNameFromUrl(e);p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Create"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60.000S'+s+"",r,a,o)},p.ExecDelete=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/09/transfer/Delete"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(s)+"";p.PerformAjax(t,r,a,o)},p.ExecGet=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Get"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S",s,r,a)},p.ExecMethod=function(e,s,r,a,o,t,n){var l="";for(var c in r)if(null!=r[c])if(Array.isArray(r[c]))for(var d in r[c])l+=""+r[c][d]+"";else l+=""+r[c]+"";p.ExecMethodXml(e,s,l,a,o,t,n)},p.ExecMethodXml=function(e,s,r,a,o,t,n){p.PerformAjax(e+"/"+s+""+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(n)+"'+r+"",a,o,t)},p.ExecEnum=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Enumerate"+p.Address+""+e+""+p.NextMessageId+++'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S',s,r,a)},p.ExecPull=function(e,s,r,a,o){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Pull"+p.Address+""+e+""+p.NextMessageId+++'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S'+s+"99999999",r,a,o)},p.ParseWsman=function(s){try{s.childNodes||(s=function(e){{if(window.DOMParser)return(new DOMParser).parseFromString(e,"text/xml");var s=new ActiveXObject("Microsoft.XMLDOM");return s.async=!1,s.loadXML(e),s}}(s));var e,r={Header:{}},a=s.getElementsByTagName("Header")[0];if(!(a=a||s.getElementsByTagName("a:Header")[0]))return null;for(var o=0;o'+e.InstanceID+"";var s="";for(var r in e)if(e.hasOwnProperty(r)){if(s+='',e[r].ReferenceParameters){s+="",s+=""+e[r].Address+""+e[r].ReferenceParameters.ResourceURI+"";var a=e[r].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(a))for(var o=0;o"+a[o].Value+"";else s+=""+a.Value+"";s+=""}else s+=e[r];s+=""}return s+=""}return p.NextMessageId=1,p.Address="/wsman",p.comm=CreateWsmanComm(e,s,r,a,o,t),p.PerformAjax=function(e,o,s,r,a){null==a&&(a=""),p.comm.PerformAjax('
"+e,function(e,s,r){if(200==s){var a=p.ParseWsman(e);a&&null!=a?o(p,a.Header.ResourceURI,a,200,r):o(p,null,{Header:{HttpError:s}},601,r)}else o(p,null,{Header:{HttpError:s}},s,r)},s,r)},p.CancelAllQueries=function(e){p.comm.CancelAllQueries(e)},p.GetNameFromUrl=function(e){var s=e.lastIndexOf("/");return-1==s?e:e.substring(s+1)},p.ExecSubscribe=function(e,s,r,a,o,t,n,l,d,c){var m="",i="";null!=d&&null!=c&&(m="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#UsernameToken"+d+''+c+"",i=''),l=null!=l&&null!=l?""+l+"":"";var u="http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"+w(n)+m+'
'+r+""+i+"PT0.000000S";p.PerformAjax(u+"",a,o,t,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing" xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:se="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:m="http://x.com"')},p.ExecUnSubscribe=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"+w(o)+"";p.PerformAjax(t+"",s,r,a,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing"')},p.ExecPut=function(e,s,r,a,o,t){var n="http://schemas.xmlsoap.org/ws/2004/09/transfer/Put"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60.000S"+w(t)+""+function(e,s){if(!e||null==s)return"";var r=p.GetNameFromUrl(e),a="';for(var o in s)if(s.hasOwnProperty(o)&&0!==o.indexOf("__")&&0!==o.indexOf("@")&&void 0!==s[o]&&null!==s[o]&&"function"!=typeof s[o])if("object"==typeof s[o]&&s[o].ReferenceParameters){a+=""+s[o].Address+""+s[o].ReferenceParameters.ResourceURI+"";var t=s[o].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(t))for(var n=0;n"+t[n].Value+"";else a+=""+t.Value+"";a+=""}else if(Array.isArray(s[o]))for(n=0;n"+s[o][n].toString()+"";else a+=""+s[o].toString()+"";return a+=""}(e,s);p.PerformAjax(n+"",r,a,o)},p.ExecCreate=function(e,s,r,a,o,t){var n=p.GetNameFromUrl(e),l="http://schemas.xmlsoap.org/ws/2004/09/transfer/Create"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(t)+"';for(var d in s)l+=""+s[d]+"";p.PerformAjax(l+"",r,a,o)},p.ExecCreateXml=function(e,s,r,a,o){var t=p.GetNameFromUrl(e);p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Create"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60.000S'+s+"",r,a,o)},p.ExecDelete=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/09/transfer/Delete"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(s)+"";p.PerformAjax(t,r,a,o)},p.ExecGet=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Get"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S",s,r,a)},p.ExecMethod=function(e,s,r,a,o,t,n){var l="";for(var d in r)if(null!=r[d])if(Array.isArray(r[d]))for(var c in r[d])l+=""+r[d][c]+"";else l+=""+r[d]+"";p.ExecMethodXml(e,s,l,a,o,t,n)},p.ExecMethodXml=function(e,s,r,a,o,t,n){p.PerformAjax(e+"/"+s+""+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(n)+"'+r+"",a,o,t)},p.ExecEnum=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Enumerate"+p.Address+""+e+""+p.NextMessageId+++'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S',s,r,a)},p.ExecPull=function(e,s,r,a,o){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Pull"+p.Address+""+e+""+p.NextMessageId+++'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S'+s+"99999999",r,a,o)},p.ParseWsman=function(s){try{s.childNodes||(s=function(e){{if(window.DOMParser)return(new DOMParser).parseFromString(e,"text/xml");var s=new ActiveXObject("Microsoft.XMLDOM");return s.async=!1,s.loadXML(e),s}}(s));var e,r={Header:{}},a=s.getElementsByTagName("Header")[0];if(!(a=a||s.getElementsByTagName("a:Header")[0]))return null;for(var o=0;ocontainer->page_content->column_l->1->1->0->1->loginpanel->1->resetAccountDiv", "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->newAccountDiv", "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->resetAccountDiv", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->newAccountDiv", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->resetAccountDiv", "terms-mobile.handlebars->container->page_content->column_l->75->1", "terms.handlebars->container->column_l->75->1" ] @@ -830,7 +832,9 @@ "xloc": [ "default-mobile.handlebars->9->118", "default-mobile.handlebars->9->453", - "default.handlebars->27->1531" + "default.handlebars->27->1531", + "download.handlebars->3->1", + "download2.handlebars->5->1" ] }, { @@ -2319,7 +2323,8 @@ "zh-cht": "拒絕訪問。", "xloc": [ "login-mobile.handlebars->5->16", - "login.handlebars->5->16" + "login.handlebars->5->16", + "login2.handlebars->7->16" ] }, { @@ -2380,7 +2385,8 @@ "zh-cht": "賬戶創建", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->5->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->5->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->5->1", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->5->1" ] }, { @@ -2401,7 +2407,8 @@ "zh-cht": "賬戶重置", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resetpanel->1->5->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->5->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->5->1", + "login2.handlebars->centralTable->1->0->logincell->resetpanel->1->5->1" ] }, { @@ -2506,7 +2513,8 @@ "zh-cht": "達到帳戶限制。", "xloc": [ "login-mobile.handlebars->5->6", - "login.handlebars->5->6" + "login.handlebars->5->6", + "login2.handlebars->7->6" ] }, { @@ -2527,7 +2535,8 @@ "zh-cht": "帳戶被鎖定。", "xloc": [ "login-mobile.handlebars->5->15", - "login.handlebars->5->15" + "login.handlebars->5->15", + "login2.handlebars->7->15" ] }, { @@ -2548,7 +2557,8 @@ "zh-cht": "找不到帳戶。", "xloc": [ "login-mobile.handlebars->5->12", - "login.handlebars->5->12" + "login.handlebars->5->12", + "login2.handlebars->7->12" ] }, { @@ -5263,7 +5273,13 @@ "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->10", "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpasswordpanel->1->10", "login.handlebars->container->column_l->centralTable->1->0->logincell->resettokenpanel->1->8", - "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->10" + "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->10", + "login2.handlebars->centralTable->1->0->logincell->checkemailpanel->1->8", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->12", + "login2.handlebars->centralTable->1->0->logincell->resetpanel->1->10", + "login2.handlebars->centralTable->1->0->logincell->resetpasswordpanel->1->10", + "login2.handlebars->centralTable->1->0->logincell->resettokenpanel->1->8", + "login2.handlebars->centralTable->1->0->logincell->tokenpanel->1->10" ] }, { @@ -5948,6 +5964,7 @@ "desktop.handlebars->p11->dialog->idx_dlgButtonBar", "login-mobile.handlebars->dialog->idx_dlgButtonBar", "login.handlebars->dialog->idx_dlgButtonBar", + "login2.handlebars->dialog->idx_dlgButtonBar", "player.handlebars->p11->dialog->idx_dlgButtonBar", "xterm.handlebars->p11->dialog->idx_dlgButtonBar" ] @@ -6066,7 +6083,8 @@ "zh-cht": "更改電子郵件地址", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->checkemailpanel->1->checkCheckOperations->1->2->1->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->checkemailpanel->1->checkCheckOperations->1->2->1->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->checkemailpanel->1->checkCheckOperations->1->2->1->1", + "login2.handlebars->centralTable->1->0->logincell->checkemailpanel->1->checkCheckOperations->1->2->1->1" ] }, { @@ -8532,7 +8550,8 @@ "xloc": [ "default.handlebars->27->1658", "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->12->1->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->12->1->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->12->1->1", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->9->1->12->1->1" ] }, { @@ -8665,7 +8684,8 @@ "zh-cht": "創建一個", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->newAccountDiv->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->newAccountDiv->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->newAccountDiv->1", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->newAccountDiv->1" ] }, { @@ -8728,7 +8748,8 @@ "zh-cht": "創建令牌：", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->newAccountPass->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->newAccountPass->nuToken" + "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->newAccountPass->nuToken", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->9->1->newAccountPass->nuToken" ] }, { @@ -10857,7 +10878,8 @@ "zh-cht": "還沒有帳號？", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->newAccountDiv", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->newAccountDiv" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->newAccountDiv", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->newAccountDiv" ] }, { @@ -12101,7 +12123,11 @@ "login-mobile.handlebars->5->42", "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->4->1->3", "login.handlebars->5->43", - "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3" + "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3", + "login2.handlebars->7->43", + "login2.handlebars->centralTable->1->0->logincell->resetpanel->1->7->1->0->1", + "login2.handlebars->centralTable->1->0->logincell->resetpanel->1->7->1->0->1", + "login2.handlebars->centralTable->1->0->logincell->tokenpanel->1->7->1->2farow->1->3" ] }, { @@ -12160,7 +12186,8 @@ "zh-cht": "郵件確認", "xloc": [ "login-mobile.handlebars->5->43", - "login.handlebars->5->44" + "login.handlebars->5->44", + "login2.handlebars->7->44" ] }, { @@ -12315,7 +12342,8 @@ "zh-cht": "郵件已發送。", "xloc": [ "login-mobile.handlebars->5->2", - "login.handlebars->5->2" + "login.handlebars->5->2", + "login2.handlebars->7->2" ] }, { @@ -12332,7 +12360,8 @@ "zh-cht": "需要通過電子郵件驗證，請檢查您的郵箱，然後單擊確認鏈接。", "xloc": [ "login-mobile.handlebars->5->3", - "login.handlebars->5->3" + "login.handlebars->5->3", + "login2.handlebars->7->3" ] }, { @@ -12385,7 +12414,9 @@ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resetpanel->1->7->1->0->1", "login.handlebars->5->21", "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->2->nuEmail", - "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->7->1->0->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->7->1->0->1", + "login2.handlebars->7->21", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->9->1->2->nuEmail" ] }, { @@ -12874,7 +12905,8 @@ "zh-cht": "輸入帳戶創建令牌", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->9->1" ] }, { @@ -13094,7 +13126,8 @@ "zh-cht": "使用此電子郵件地址的現有帳戶。", "xloc": [ "login-mobile.handlebars->5->7", - "login.handlebars->5->7" + "login.handlebars->5->7", + "login2.handlebars->7->7" ] }, { @@ -13374,6 +13407,12 @@ "default.handlebars->27->1081" ] }, + { + "en": "File", + "xloc": [ + "download2.handlebars->centralTable->1->0->1->filetable->1->0->1->fileimagelink" + ] + }, { "cs": "Editor souborů", "de": "Datei-Editor", @@ -13740,7 +13779,8 @@ "zh-cht": "忘記密碼？", "xloc": [ "login-mobile.handlebars->5->22", - "login.handlebars->5->22" + "login.handlebars->5->22", + "login2.handlebars->7->22" ] }, { @@ -13780,7 +13820,8 @@ "zh-chs": "忘記用戶名/密碼了嗎？", "zh-cht": "忘記用戶名/密碼了嗎？", "xloc": [ - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->resetAccountDiv->resetAccountSpan" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->resetAccountDiv->resetAccountSpan", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->resetAccountDiv->resetAccountSpan" ] }, { @@ -14621,7 +14662,9 @@ "login-mobile.handlebars->5->29", "login-mobile.handlebars->5->33", "login.handlebars->5->29", - "login.handlebars->5->33" + "login.handlebars->5->33", + "login2.handlebars->7->29", + "login2.handlebars->7->33" ] }, { @@ -15394,7 +15437,8 @@ "zh-cht": "IP位址已封鎖，請稍後再試。", "xloc": [ "login-mobile.handlebars->5->19", - "login.handlebars->5->19" + "login.handlebars->5->19", + "login2.handlebars->7->19" ] }, { @@ -15660,7 +15704,8 @@ "zh-cht": "如果有效，請重置已發送的郵件。", "xloc": [ "login-mobile.handlebars->5->1", - "login.handlebars->5->1" + "login.handlebars->5->1", + "login2.handlebars->7->1" ] }, { @@ -17013,7 +17058,8 @@ "zh-cht": "無效的帳戶創建令牌。", "xloc": [ "login-mobile.handlebars->5->8", - "login.handlebars->5->8" + "login.handlebars->5->8", + "login2.handlebars->7->8" ] }, { @@ -17034,7 +17080,15 @@ "zh-cht": "不合規電郵。", "xloc": [ "login-mobile.handlebars->5->11", - "login.handlebars->5->11" + "login.handlebars->5->11", + "login2.handlebars->7->11" + ] + }, + { + "en": "Invalid file link", + "xloc": [ + "download.handlebars->3->3", + "download2.handlebars->5->3" ] }, { @@ -17075,7 +17129,8 @@ "zh-cht": "令牌無效，請重試。", "xloc": [ "login-mobile.handlebars->5->13", - "login.handlebars->5->13" + "login.handlebars->5->13", + "login2.handlebars->7->13" ] }, { @@ -19130,7 +19185,9 @@ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->5->1", "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->7->1->4->3", "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->5->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->7->1->4->3" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->7->1->4->3", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->5->1->6->1", + "login2.handlebars->centralTable->1->0->logincell->tokenpanel->1->7->1->2->1->1" ] }, { @@ -19144,7 +19201,8 @@ "zh-cht": "使用現有帳戶登錄", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->3", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->3" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->3", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->3" ] }, { @@ -19186,7 +19244,8 @@ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resettokenpanel->1->5->1->2->1->1", "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->4->1->1", "login.handlebars->container->column_l->centralTable->1->0->logincell->resettokenpanel->1->5->1->2->1->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->1", + "login2.handlebars->centralTable->1->0->logincell->resettokenpanel->1->5->1->2->1->1" ] }, { @@ -19243,7 +19302,8 @@ "zh-cht": "登錄失敗，請檢查用戶名和密碼。", "xloc": [ "login-mobile.handlebars->5->17", - "login.handlebars->5->17" + "login.handlebars->5->17", + "login2.handlebars->7->17" ] }, { @@ -19265,7 +19325,8 @@ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resettokenpanel->1->5->1->0->1", "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->0->1", "login.handlebars->container->column_l->centralTable->1->0->logincell->resettokenpanel->1->5->1->0->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->0->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->0->1", + "login2.handlebars->centralTable->1->0->logincell->resettokenpanel->1->5->1->0->1" ] }, { @@ -20204,7 +20265,8 @@ "zh-cht": "最大長度為{0}", "xloc": [ "login-mobile.handlebars->5->37", - "login.handlebars->5->37" + "login.handlebars->5->37", + "login2.handlebars->7->37" ] }, { @@ -20976,7 +21038,8 @@ "zh-cht": "最小長度為{0}", "xloc": [ "login-mobile.handlebars->5->36", - "login.handlebars->5->36" + "login.handlebars->5->36", + "login2.handlebars->7->36" ] }, { @@ -23215,6 +23278,7 @@ "desktop.handlebars->p11->dialog->idx_dlgButtonBar", "login-mobile.handlebars->dialog->idx_dlgButtonBar", "login.handlebars->dialog->idx_dlgButtonBar", + "login2.handlebars->dialog->idx_dlgButtonBar", "player.handlebars->p11->dialog->idx_dlgButtonBar", "xterm.handlebars->p11->dialog->idx_dlgButtonBar" ] @@ -23913,6 +23977,8 @@ "default.handlebars->27->289", "default.handlebars->27->320", "default.handlebars->27->741", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->5->1->2->1", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->5->1->2->1", "mstsc.handlebars->main->1->3->1->6->1->0", "mstsc.handlebars->main->1->3->1->6->3" ] @@ -23935,7 +24001,9 @@ "zh-cht": "密碼提示", "xloc": [ "login-mobile.handlebars->5->27", - "login.handlebars->5->27" + "login.handlebars->5->27", + "login2.handlebars->7->27", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->5->1->4->1" ] }, { @@ -23957,7 +24025,9 @@ "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resetpasswordpanel->1->7->1->resetpasswordpanelHint->rnuHint", "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->createPanelHint->nuHint", - "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->resetpasswordpanelHint->rnuHint" + "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->resetpasswordpanelHint->rnuHint", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->9->1->createPanelHint->nuHint", + "login2.handlebars->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->resetpasswordpanelHint->rnuHint" ] }, { @@ -23981,7 +24051,10 @@ "login-mobile.handlebars->5->35", "login.handlebars->5->31", "login.handlebars->5->35", - "login.handlebars->5->42" + "login.handlebars->5->42", + "login2.handlebars->7->31", + "login2.handlebars->7->35", + "login2.handlebars->7->42" ] }, { @@ -24002,7 +24075,8 @@ "zh-cht": "要求更改密碼。", "xloc": [ "login-mobile.handlebars->5->18", - "login.handlebars->5->18" + "login.handlebars->5->18", + "login2.handlebars->7->18" ] }, { @@ -24100,7 +24174,8 @@ "zh-cht": "密碼被拒絕，請使用其他密碼。", "xloc": [ "login-mobile.handlebars->5->10", - "login.handlebars->5->10" + "login.handlebars->5->10", + "login2.handlebars->7->10" ] }, { @@ -24155,7 +24230,11 @@ "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->6->nuPass2", "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->7->1->2->1", "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->0->rnuPass1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->2->rnuPass2" + "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->2->rnuPass2", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->9->1->4->nuPass1", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->9->1->6->nuPass2", + "login2.handlebars->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->0->rnuPass1", + "login2.handlebars->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->2->rnuPass2" ] }, { @@ -25898,7 +25977,8 @@ "zh-cht": "記住此設備{0}天。", "xloc": [ "login-mobile.handlebars->5->20", - "login.handlebars->5->20" + "login.handlebars->5->20", + "login2.handlebars->7->20" ] }, { @@ -26729,7 +26809,8 @@ "zh-cht": "重發確認郵件", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->checkemailpanel->1->checkCheckOperations->1->2->1->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->checkemailpanel->1->checkCheckOperations->1->2->1->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->checkemailpanel->1->checkCheckOperations->1->2->1->1", + "login2.handlebars->centralTable->1->0->logincell->checkemailpanel->1->checkCheckOperations->1->2->1->1" ] }, { @@ -26772,7 +26853,8 @@ "zh-cht": "重設帳戶", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resetpanel->1->7->1->2->1->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->7->1->2->1->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->7->1->2->1->1", + "login2.handlebars->centralTable->1->0->logincell->resetpanel->1->7->1->2->1" ] }, { @@ -26793,7 +26875,8 @@ "zh-cht": "重設密碼", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resetpasswordpanel->1->7->1->6->1->1", - "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->6->1->1" + "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->6->1->1", + "login2.handlebars->centralTable->1->0->logincell->resetpasswordpanel->1->7->1->6->1->1" ] }, { @@ -26814,7 +26897,8 @@ "zh-cht": "重設帳戶", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->resetAccountDiv->3", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->resetAccountDiv->3" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->resetAccountDiv->3", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->resetAccountDiv->3" ] }, { @@ -27280,7 +27364,8 @@ "default.handlebars->27->1798", "default.handlebars->27->1803", "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->4->1->3", - "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3" + "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3", + "login2.handlebars->centralTable->1->0->logincell->tokenpanel->1->7->1->2farow->1->3" ] }, { @@ -27312,7 +27397,8 @@ "zh-cht": "短信已發送。", "xloc": [ "login-mobile.handlebars->5->4", - "login.handlebars->5->4" + "login.handlebars->5->4", + "login2.handlebars->7->4" ] }, { @@ -27754,7 +27840,9 @@ "login-mobile.handlebars->5->23", "login-mobile.handlebars->5->25", "login.handlebars->5->23", - "login.handlebars->5->25" + "login.handlebars->5->25", + "login2.handlebars->7->23", + "login2.handlebars->7->25" ] }, { @@ -28310,7 +28398,8 @@ "zh-cht": "將令牌發送到註冊的電子郵件地址？", "xloc": [ "login-mobile.handlebars->5->24", - "login.handlebars->5->24" + "login.handlebars->5->24", + "login2.handlebars->7->24" ] }, { @@ -28326,7 +28415,8 @@ "zh-cht": "將令牌發送到註冊電話號碼？", "xloc": [ "login-mobile.handlebars->5->26", - "login.handlebars->5->26" + "login.handlebars->5->26", + "login2.handlebars->7->26" ] }, { @@ -29203,7 +29293,8 @@ "zh-cht": "顯示提示", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->7->1->4->1->showPassHintLink->0", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->7->1->4->1->showPassHintLink->0" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->7->1->4->1->showPassHintLink->0", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->5->1->4->1->showPassHintLink->0" ] }, { @@ -29408,7 +29499,8 @@ "zh-cht": "使用Azure登錄", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->auth-azure", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-azure" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-azure", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-azure" ] }, { @@ -29422,7 +29514,8 @@ "zh-cht": "使用GitHub登錄", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->auth-github", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-github" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-github", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-github" ] }, { @@ -29436,7 +29529,8 @@ "zh-cht": "使用Google登錄", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->auth-google", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-google" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-google", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-google" ] }, { @@ -29450,7 +29544,8 @@ "zh-cht": "使用英特爾登錄", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->auth-intel", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-intel" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-intel", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-intel" ] }, { @@ -29464,7 +29559,8 @@ "zh-cht": "使用JumpCloud登錄", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->auth-jumpcloud", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-jumpcloud" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-jumpcloud", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-jumpcloud" ] }, { @@ -29478,7 +29574,8 @@ "zh-cht": "使用Reddit登錄", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->auth-reddit", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-reddit" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-reddit", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-reddit" ] }, { @@ -29492,7 +29589,8 @@ "zh-cht": "使用Twitter登錄", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->auth-twitter", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-twitter" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-twitter", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-twitter" ] }, { @@ -29587,7 +29685,8 @@ "zh-cht": "單一登入", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->authStrategies->auth-saml", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-saml" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-saml", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->authStrategies->auth-saml" ] }, { @@ -30790,7 +30889,9 @@ "login-mobile.handlebars->5->28", "login-mobile.handlebars->5->32", "login.handlebars->5->28", - "login.handlebars->5->32" + "login.handlebars->5->32", + "login2.handlebars->7->28", + "login2.handlebars->7->32" ] }, { @@ -31380,8 +31481,10 @@ "xloc": [ "default.handlebars->container->footer->3->termsLinkFooter", "download.handlebars->container->page_content->footer->1->1->0->3->1", + "download2.handlebars->centralTable->1->2->1->1->flink->1", "login-mobile.handlebars->container->footer->1->1->0->3->1", "login.handlebars->container->footer->3->termsLinkFooter", + "login2.handlebars->centralTable->1->2->1->1->flink->1", "message.handlebars->container->page_content->footer->1->1->0->3->1" ] }, @@ -32368,6 +32471,13 @@ "default.handlebars->container->column_l->p12->termTable->1->1->6->1->1->terminalSettingsButtons" ] }, + { + "en": "Token", + "xloc": [ + "login2.handlebars->centralTable->1->0->logincell->tokenpanel->1->7->1->0->1", + "login2.handlebars->centralTable->1->0->logincell->tokenpanel->1->7->1->0->1" + ] + }, { "cs": "Nástroje", "de": "Werkzeuge", @@ -32844,7 +32954,8 @@ "zh-cht": "無法創建帳戶。", "xloc": [ "login-mobile.handlebars->5->5", - "login.handlebars->5->5" + "login.handlebars->5->5", + "login2.handlebars->7->5" ] }, { @@ -32903,7 +33014,8 @@ "zh-cht": "無法發送電子郵件。", "xloc": [ "login-mobile.handlebars->5->14", - "login.handlebars->5->14" + "login.handlebars->5->14", + "login2.handlebars->7->14" ] }, { @@ -33515,7 +33627,8 @@ "zh-cht": "使用安全密鑰", "xloc": [ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->4->1->3", - "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3" + "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3", + "login2.handlebars->centralTable->1->0->logincell->tokenpanel->1->7->1->2farow->1->3" ] }, { @@ -34075,6 +34188,8 @@ "default.handlebars->27->287", "default.handlebars->27->319", "default.handlebars->27->740", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->5->1->0->1", + "login2.handlebars->centralTable->1->0->logincell->loginpanel->1->5->1->0->1", "mstsc.handlebars->main->1->3->1->4->1->0", "mstsc.handlebars->main->1->3->1->4->3", "player.handlebars->3->4" @@ -34098,7 +34213,8 @@ "zh-cht": "此用戶名已存在。", "xloc": [ "login-mobile.handlebars->5->9", - "login.handlebars->5->9" + "login.handlebars->5->9", + "login2.handlebars->7->9" ] }, { @@ -34122,7 +34238,8 @@ "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->nuUserRow->1", "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->loginpanel->1->7->1->0->loginusername", "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->nuUserRow->nuUser", - "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->7->1->0->loginusername" + "login.handlebars->container->column_l->centralTable->1->0->logincell->loginpanel->1->7->1->0->loginusername", + "login2.handlebars->centralTable->1->0->logincell->createpanel->1->9->1->nuUserRow->nuUser" ] }, { @@ -34770,7 +34887,9 @@ "login-mobile.handlebars->5->30", "login-mobile.handlebars->5->34", "login.handlebars->5->30", - "login.handlebars->5->34" + "login.handlebars->5->34", + "login2.handlebars->7->30", + "login2.handlebars->7->34" ] }, { @@ -35605,7 +35724,8 @@ "default-mobile.handlebars->dialog->1->id_dialogclose->0", "default.handlebars->container->column_l->p1->xdevicesmap->xmapSearchResultsDlg->xmapSearchResultsBck->xmapSearchClose->0", "login-mobile.handlebars->dialog->1->id_dialogclose->0", - "login.handlebars->dialog->dialogHeader->id_dialogclose->0" + "login.handlebars->dialog->dialogHeader->id_dialogclose->0", + "login2.handlebars->dialog->dialogHeader->id_dialogclose->0" ] }, { @@ -37471,7 +37591,9 @@ "xloc": [ "default-mobile.handlebars->9->119", "default.handlebars->27->1532", - "default.handlebars->27->1891" + "default.handlebars->27->1891", + "download.handlebars->3->2", + "download2.handlebars->5->2" ] }, { @@ -37623,7 +37745,8 @@ "zh-cht": "{0}小寫", "xloc": [ "login-mobile.handlebars->5->39", - "login.handlebars->5->39" + "login.handlebars->5->39", + "login2.handlebars->7->39" ] }, { @@ -37723,7 +37846,8 @@ "zh-cht": "{0}非字母數字", "xloc": [ "login-mobile.handlebars->5->41", - "login.handlebars->5->41" + "login.handlebars->5->41", + "login2.handlebars->7->41" ] }, { @@ -37744,7 +37868,8 @@ "zh-cht": "{0}數字", "xloc": [ "login-mobile.handlebars->5->40", - "login.handlebars->5->40" + "login.handlebars->5->40", + "login2.handlebars->7->40" ] }, { @@ -37909,7 +38034,8 @@ "zh-cht": "{0}大寫", "xloc": [ "login-mobile.handlebars->5->38", - "login.handlebars->5->38" + "login.handlebars->5->38", + "login2.handlebars->7->38" ] }, { diff --git a/views/agentinvite.handlebars b/views/agentinvite.handlebars index 9967d056..2f09a4df 100644 --- a/views/agentinvite.handlebars +++ b/views/agentinvite.handlebars @@ -48,12 +48,12 @@
-
{{{titlehtml}}}
+
{{{titlehtml}}}
- {{{title1}}} + {{{title1}}}
- {{{title2}}} + {{{title2}}}

{{{logoutControl}}}

diff --git a/views/download.handlebars b/views/download.handlebars index 57831e5e..e965fa05 100644 --- a/views/download.handlebars +++ b/views/download.handlebars @@ -14,18 +14,18 @@
-
{{{titlehtml}}}
+
{{{titlehtml}}}
- {{{title1}}} + {{{title1}}}
- {{{title2}}} + {{{title2}}}

Download

-

{{{message}}}

+


+ \ No newline at end of file diff --git a/views/download2.handlebars b/views/download2.handlebars new file mode 100644 index 00000000..88955918 --- /dev/null +++ b/views/download2.handlebars @@ -0,0 +1,88 @@ + + + + + + + + + + + {{{title1}}} - Download + + + + + + + + + + + +
+ + + + + + +
+ + + + + +
+
+
+
+ + +
+
+ + + \ No newline at end of file diff --git a/views/error404.handlebars b/views/error404.handlebars index c5121e7e..d73d18b0 100644 --- a/views/error404.handlebars +++ b/views/error404.handlebars @@ -14,12 +14,12 @@
-
{{{titlehtml}}}
+
{{{titlehtml}}}
- {{{title1}}} + {{{title1}}}
- {{{title2}}} + {{{title2}}}
diff --git a/views/error4042.handlebars b/views/error4042.handlebars new file mode 100644 index 00000000..4510edec --- /dev/null +++ b/views/error4042.handlebars @@ -0,0 +1,46 @@ + + + + + + + + + + + {{{title1}}} - Download + + + + + + + + + + + +
+
404
+
This page does not exist
+ +
+
+ + +
+
+ + \ No newline at end of file diff --git a/views/invite.handlebars b/views/invite.handlebars index c9d1719d..21201b30 100644 --- a/views/invite.handlebars +++ b/views/invite.handlebars @@ -48,12 +48,12 @@
-
{{{titlehtml}}}
+
{{{titlehtml}}}
- {{{title1}}} + {{{title1}}}
- {{{title2}}} + {{{title2}}}

{{{logoutControl}}}

diff --git a/views/login2.handlebars b/views/login2.handlebars index 130a652c..31e03723 100644 --- a/views/login2.handlebars +++ b/views/login2.handlebars @@ -18,21 +18,10 @@ background: linear-gradient(to bottom right, #369, #036); } - #flink a:link { - color: #c8c8c8; - } - - #flink a:visited { - color: #c8c8c8; - } - - #flink a:hover { - color: #c8c8c8; - } - - #flink a:active { - color: #c8c8c8; - } + #flink a:link { color: #c8c8c8; } + #flink a:visited { color: #c8c8c8; } + #flink a:hover { color: #c8c8c8; } + #flink a:active { color: #c8c8c8; } @@ -140,15 +129,15 @@
Account Reset
- +
- - + -
Email: + +
-
-
+ 		+
diff --git a/views/message.handlebars b/views/message.handlebars index 979080cb..3c430c4a 100644 --- a/views/message.handlebars +++ b/views/message.handlebars @@ -15,12 +15,12 @@
-
{{{titlehtml}}}
+
{{{titlehtml}}}
- {{{title1}}} + {{{title1}}}
- {{{title2}}} + {{{title2}}}
diff --git a/views/terms.handlebars b/views/terms.handlebars index 4b3dad22..a0206783 100644 --- a/views/terms.handlebars +++ b/views/terms.handlebars @@ -15,12 +15,12 @@
-
{{{titlehtml}}}
+
{{{titlehtml}}}
- {{{title1}}} + {{{title1}}}
- {{{title2}}} + {{{title2}}}

diff --git a/webserver.js b/webserver.js index 09ab4fe3..b9a3f23e 100644 --- a/webserver.js +++ b/webserver.js @@ -2459,7 +2459,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { if (domain.customui != null) { customui = encodeURIComponent(JSON.stringify(domain.customui)); } // Render the login page - render(req, res, getRenderPage('login', req, domain), getRenderArgs({ loginmode: loginmode, rootCertLink: getRootCertLink(), newAccount: newAccountsAllowed, newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), serverDnsName: obj.getWebServerName(domain), serverPublicPort: httpsPort, emailcheck: emailcheck, features: features, sessiontime: args.sessiontime, passRequirements: passRequirements, customui: customui, footer: (domain.footer == null) ? '' : domain.footer, hkey: encodeURIComponent(hardwareKeyChallenge).replace(/'/g, '%27'), messageid: msgid, passhint: passhint, welcometext: domain.welcometext ? encodeURIComponent(domain.welcometext).split('\'').join('\\\'') : null, hwstate: hwstate, otpemail: otpemail, otpsms: otpsms, twoFactorCookieDays: twoFactorCookieDays, authStrategies: authStrategies.join(',') }, req, domain)); + render(req, res, getRenderPage((domain.sitestyle == 2)?'login2':'login', req, domain), getRenderArgs({ loginmode: loginmode, rootCertLink: getRootCertLink(), newAccount: newAccountsAllowed, newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), serverDnsName: obj.getWebServerName(domain), serverPublicPort: httpsPort, emailcheck: emailcheck, features: features, sessiontime: args.sessiontime, passRequirements: passRequirements, customui: customui, footer: (domain.footer == null) ? '' : domain.footer, hkey: encodeURIComponent(hardwareKeyChallenge).replace(/'/g, '%27'), messageid: msgid, passhint: passhint, welcometext: domain.welcometext ? encodeURIComponent(domain.welcometext).split('\'').join('\\\'') : null, hwstate: hwstate, otpemail: otpemail, otpsms: otpsms, twoFactorCookieDays: twoFactorCookieDays, authStrategies: authStrategies.join(',') }, req, domain)); } // Handle a post request on the root @@ -2780,10 +2780,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { } try { res.sendFile(obj.path.resolve(__dirname, path)); } catch (e) { res.sendStatus(404); } } else { - render(req, res, getRenderPage('download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), message: "" + filename + ", " + stat.size + " byte" + ((stat.size < 2) ? '' : 's') + "." }, req, domain)); + render(req, res, getRenderPage((domain.sitestyle == 2) ? 'download2' : 'download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), messageid: 1, fileurl: req.path + '?download=1', filename: filename, filesize: stat.size }, req, domain)); + //render(req, res, getRenderPage((domain.sitestyle == 2) ? 'download2' : 'download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), message: "" + filename + ", " + stat.size + " byte" + ((stat.size < 2) ? '' : 's') + "." }, req, domain)); } } else { - render(req, res, getRenderPage('download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), message: "Invalid file link, please check the URL again." }, req, domain)); + render(req, res, getRenderPage((domain.sitestyle == 2) ? 'download2' : 'download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), messageid: 2 }, req, domain)); + //render(req, res, getRenderPage((domain.sitestyle == 2) ? 'download2' : 'download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), message: "Invalid file link, please check the URL again." }, req, domain)); } } @@ -5116,6 +5118,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { }); }); + // Allows agents to transfer files + obj.agentapp.ws(url + 'devicefile.ashx', function (ws, req) { obj.meshDeviceFileHandler.CreateMeshDeviceFile(obj, ws, null, req, domain); }); + // Setup agent to/from server file transfer handler obj.agentapp.ws(url + 'agenttransfer.ashx', handleAgentFileTransfer); // Setup agent to/from server file transfer handler } @@ -5143,7 +5148,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { var domain = getDomain(req); if ((domain == null) || (domain.auth == 'sspi')) { res.sendStatus(404); return; } if ((domain.loginkey != null) && (domain.loginkey.indexOf(req.query.key) == -1)) { res.sendStatus(404); return; } // Check 3FA URL key - res.status(404).render(getRenderPage('error404', req, domain), getRenderArgs({}, req, domain)); + res.status(404).render(getRenderPage((domain.sitestyle == 2) ? 'error4042' : 'error404', req, domain), getRenderArgs({}, req, domain)); }); }