From 88a5af126d19eaaeb89956c1f67e921c66e5e9f8 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 24 Nov 2020 02:39:32 -0800 Subject: [PATCH] Mobile site improvements, added desktop zoom. --- letsencrypt.js | 4 + public/images/mobile-desk-scale-in.png | Bin 0 -> 1136 bytes public/images/mobile-desk-scale-out.png | Bin 0 -> 1081 bytes translate/translate.json | 324 ++++++++++++------------ views/default-mobile.handlebars | 121 ++++----- 5 files changed, 209 insertions(+), 240 deletions(-) create mode 100644 public/images/mobile-desk-scale-in.png create mode 100644 public/images/mobile-desk-scale-out.png diff --git a/letsencrypt.js b/letsencrypt.js index 2de45bc1..d0126eb9 100644 --- a/letsencrypt.js +++ b/letsencrypt.js @@ -162,6 +162,10 @@ module.exports.CreateLetsEncrypt = function (parent) { // Create a private key obj.log("Generating private key..."); acme.forge.createPrivateKey().then(function (accountKey) { + + // TODO: ZeroSSL + // https://acme.zerossl.com/v2/DV90 + // Create the ACME client obj.log("Setting up ACME client..."); obj.client = new acme.Client({ diff --git a/public/images/mobile-desk-scale-in.png b/public/images/mobile-desk-scale-in.png new file mode 100644 index 0000000000000000000000000000000000000000..fc83fd7afb077b5e3a28bea3c04315f7b617cb27 GIT binary patch literal 1136 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 literal 0 HcmV?d00001 diff --git a/translate/translate.json b/translate/translate.json index 52955468..18a7f0b4 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -495,7 +495,7 @@ "zh-chs": "，", "zh-cht": "，", "xloc": [ - "default-mobile.handlebars->9->467", + "default-mobile.handlebars->9->465", "default.handlebars->29->1504" ] }, @@ -579,7 +579,7 @@ "zh-cht": "，WebRTC", "xloc": [ "default-mobile.handlebars->9->296", - "default-mobile.handlebars->9->305", + "default-mobile.handlebars->9->303", "default.handlebars->29->841", "default.handlebars->29->874", "default.handlebars->29->886", @@ -767,7 +767,7 @@ "zh-cht": "...", "xloc": [ "default-mobile.handlebars->9->108", - "default-mobile.handlebars->9->307", + "default-mobile.handlebars->9->305", "default.handlebars->29->1545", "default.handlebars->29->2054", "default.handlebars->29->892" @@ -847,7 +847,7 @@ "zh-cht": "1個位元組", "xloc": [ "default-mobile.handlebars->9->118", - "default-mobile.handlebars->9->471", + "default-mobile.handlebars->9->469", "default.handlebars->29->1569", "download.handlebars->3->1", "download2.handlebars->5->1" @@ -1562,7 +1562,7 @@ "pt": "3", "ru": "3", "xloc": [ - "default-mobile.handlebars->9->333" + "default-mobile.handlebars->9->331" ] }, { @@ -3042,7 +3042,7 @@ "xloc": [ "default-mobile.handlebars->9->231", "default-mobile.handlebars->9->233", - "default-mobile.handlebars->9->370", + "default-mobile.handlebars->9->368", "default.handlebars->29->561", "default.handlebars->29->563", "default.handlebars->29->978" @@ -3395,7 +3395,7 @@ "zh-chs": "添加用户", "zh-cht": "新增用戶", "xloc": [ - "default-mobile.handlebars->9->412", + "default-mobile.handlebars->9->410", "default.handlebars->29->662" ] }, @@ -3479,7 +3479,7 @@ "zh-chs": "将用户添加到设备组", "zh-cht": "將用戶新增到裝置群", "xloc": [ - "default-mobile.handlebars->9->443" + "default-mobile.handlebars->9->441" ] }, { @@ -3873,7 +3873,7 @@ "zh-chs": "管理员控制模式（ACM）", "zh-cht": "管理員控制模式（ACM）", "xloc": [ - "default-mobile.handlebars->9->372", + "default-mobile.handlebars->9->370", "default.handlebars->29->980" ] }, @@ -3894,7 +3894,7 @@ "zh-chs": "管理员凭证", "zh-cht": "管理員憑證", "xloc": [ - "default-mobile.handlebars->9->378", + "default-mobile.handlebars->9->376", "default.handlebars->29->986" ] }, @@ -4105,7 +4105,7 @@ "zh-chs": "代理控制台", "zh-cht": "代理控制台", "xloc": [ - "default-mobile.handlebars->9->449", + "default-mobile.handlebars->9->447", "default.handlebars->29->1485" ] }, @@ -4443,8 +4443,8 @@ "zh-cht": "所有", "xloc": [ "default-mobile.handlebars->9->117", + "default-mobile.handlebars->9->306", "default-mobile.handlebars->9->308", - "default-mobile.handlebars->9->310", "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->DevFilterSelect->1" ] }, @@ -5279,7 +5279,7 @@ "zh-chs": "架构", "zh-cht": "結構", "xloc": [ - "default-mobile.handlebars->9->342", + "default-mobile.handlebars->9->340", "default.handlebars->29->940" ] }, @@ -5320,7 +5320,7 @@ "zh-chs": "你确定要删除组{0}吗？删除设备组还将删除该组中有关设备的所有信息。", "zh-cht": "你確定要刪除群{0}嗎？刪除裝置群還將刪除該群中有關裝置的所有訊息。", "xloc": [ - "default-mobile.handlebars->9->418", + "default-mobile.handlebars->9->416", "default.handlebars->29->1408" ] }, @@ -5752,7 +5752,7 @@ "zh-chs": "的BIOS", "zh-cht": "的BIOS", "xloc": [ - "default-mobile.handlebars->9->384", + "default-mobile.handlebars->9->382", "default.handlebars->29->992" ] }, @@ -6346,7 +6346,7 @@ "zh-chs": "CPU", "zh-cht": "CPU", "xloc": [ - "default-mobile.handlebars->9->390", + "default-mobile.handlebars->9->388", "default.handlebars->29->998" ] }, @@ -6566,9 +6566,9 @@ "zh-chs": "容量", "zh-cht": "容量", "xloc": [ - "default-mobile.handlebars->9->395", + "default-mobile.handlebars->9->393", + "default-mobile.handlebars->9->398", "default-mobile.handlebars->9->400", - "default-mobile.handlebars->9->402", "default.handlebars->29->1003", "default.handlebars->29->1008", "default.handlebars->29->1010" @@ -6591,7 +6591,7 @@ "zh-chs": "容量/速度", "zh-cht": "容量/速度", "xloc": [ - "default-mobile.handlebars->9->393", + "default-mobile.handlebars->9->391", "default.handlebars->29->1001" ] }, @@ -7063,8 +7063,8 @@ "zh-chs": "聊天并通知", "zh-cht": "聊天並通知", "xloc": [ - "default-mobile.handlebars->9->439", - "default-mobile.handlebars->9->459", + "default-mobile.handlebars->9->437", + "default-mobile.handlebars->9->457", "default.handlebars->29->1460", "default.handlebars->29->1496" ] @@ -7426,10 +7426,10 @@ "zh-cht": "清除", "xloc": [ "default-mobile.handlebars->9->132", + "default-mobile.handlebars->9->324", "default-mobile.handlebars->9->326", "default-mobile.handlebars->9->328", "default-mobile.handlebars->9->330", - "default-mobile.handlebars->9->332", "default-mobile.handlebars->9->59", "default.handlebars->29->1584", "default.handlebars->29->917", @@ -7749,7 +7749,7 @@ "zh-chs": "客户端控制模式（CCM）", "zh-cht": "客戶端控制模式（CCM）", "xloc": [ - "default-mobile.handlebars->9->371", + "default-mobile.handlebars->9->369", "default.handlebars->29->979" ] }, @@ -7961,7 +7961,7 @@ "fr": "Commandes", "nl": "Opdrachten", "xloc": [ - "default-mobile.handlebars->9->461", + "default-mobile.handlebars->9->459", "default.handlebars->29->1498", "default.handlebars->29->688", "default.handlebars->29->709" @@ -8047,7 +8047,7 @@ "zh-cht": "確認", "xloc": [ "default-mobile.handlebars->9->288", - "default-mobile.handlebars->9->419", + "default-mobile.handlebars->9->417", "default.handlebars->29->1409", "default.handlebars->29->1752", "default.handlebars->29->1831", @@ -8075,7 +8075,7 @@ "zh-chs": "确认将1个副本复制到此位置？", "zh-cht": "確認將1個副本複製到此位置？", "xloc": [ - "default-mobile.handlebars->9->321", + "default-mobile.handlebars->9->319", "default.handlebars->29->912" ] }, @@ -8116,7 +8116,7 @@ "zh-chs": "确认{0}个条目的副本到此位置？", "zh-cht": "確認{0}個條目的副本到此位置？", "xloc": [ - "default-mobile.handlebars->9->320" + "default-mobile.handlebars->9->318" ] }, { @@ -8256,7 +8256,7 @@ "zh-chs": "确认将1个条目移动到此位置？", "zh-cht": "確認將1個條目移動到此位置？", "xloc": [ - "default-mobile.handlebars->9->323", + "default-mobile.handlebars->9->321", "default.handlebars->29->914" ] }, @@ -8297,7 +8297,7 @@ "zh-chs": "确认将{0}个条目移到该位置？", "zh-cht": "確認將{0}個條目移到該位置？", "xloc": [ - "default-mobile.handlebars->9->322" + "default-mobile.handlebars->9->320" ] }, { @@ -8577,7 +8577,7 @@ "zh-chs": "确认删除用户{0}？", "zh-cht": "確認刪除用戶{0}？", "xloc": [ - "default-mobile.handlebars->9->470" + "default-mobile.handlebars->9->468" ] }, { @@ -8618,7 +8618,7 @@ "zh-chs": "连接", "zh-cht": "連接", "xloc": [ - "default-mobile.handlebars->9->303", + "default-mobile.handlebars->9->301", "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea1->1->3", "default-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->0->1->3", "default.handlebars->29->1352", @@ -8830,7 +8830,7 @@ "zh-chs": "现在已连接", "zh-cht": "現在已連接", "xloc": [ - "default-mobile.handlebars->9->346", + "default-mobile.handlebars->9->344", "default.handlebars->29->944" ] }, @@ -8872,7 +8872,7 @@ "zh-cht": "正在連線...", "xloc": [ "default-mobile.handlebars->9->2", - "default-mobile.handlebars->9->339", + "default-mobile.handlebars->9->337", "default-mobile.handlebars->9->37", "default.handlebars->29->244", "default.handlebars->29->247", @@ -10257,7 +10257,7 @@ "zh-cht": "刪除", "xloc": [ "default-mobile.handlebars->9->122", - "default-mobile.handlebars->9->313", + "default-mobile.handlebars->9->311", "default-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->2->1->1", "default-mobile.handlebars->container->page_content->column_l->p5->p5myfiles->p5toolbar->1->0->1->1", "default.handlebars->29->1573", @@ -10351,8 +10351,8 @@ "zh-chs": "删除群组", "zh-cht": "刪除群組", "xloc": [ - "default-mobile.handlebars->9->417", - "default-mobile.handlebars->9->420", + "default-mobile.handlebars->9->415", + "default-mobile.handlebars->9->418", "default.handlebars->29->1381", "default.handlebars->29->1410" ] @@ -10599,7 +10599,7 @@ "zh-cht": "刪除所選項目？", "xloc": [ "default-mobile.handlebars->9->124", - "default-mobile.handlebars->9->315", + "default-mobile.handlebars->9->313", "default.handlebars->29->1575", "default.handlebars->29->905" ] @@ -10642,7 +10642,7 @@ "zh-cht": "刪除{0}個所選項目？", "xloc": [ "default-mobile.handlebars->9->123", - "default-mobile.handlebars->9->314", + "default-mobile.handlebars->9->312", "default.handlebars->29->1574", "default.handlebars->29->904" ] @@ -10818,9 +10818,9 @@ "default-mobile.handlebars->9->225", "default-mobile.handlebars->9->226", "default-mobile.handlebars->9->292", - "default-mobile.handlebars->9->352", - "default-mobile.handlebars->9->409", - "default-mobile.handlebars->9->422", + "default-mobile.handlebars->9->350", + "default-mobile.handlebars->9->407", + "default-mobile.handlebars->9->420", "default.handlebars->29->1292", "default.handlebars->29->1329", "default.handlebars->29->1412", @@ -11202,7 +11202,7 @@ "zh-chs": "设备组用户", "zh-cht": "裝置群用戶", "xloc": [ - "default-mobile.handlebars->9->468", + "default-mobile.handlebars->9->466", "default.handlebars->29->1505" ] }, @@ -12015,7 +12015,7 @@ "zh-chs": "断线", "zh-cht": "斷線", "xloc": [ - "default-mobile.handlebars->9->304", + "default-mobile.handlebars->9->302", "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea1->1->3", "default.handlebars->29->1353", "default.handlebars->29->885", @@ -12437,7 +12437,7 @@ "zh-chs": "下载档案", "zh-cht": "下載檔案", "xloc": [ - "default-mobile.handlebars->9->334", + "default-mobile.handlebars->9->332", "default.handlebars->29->924" ] }, @@ -13325,9 +13325,9 @@ "zh-chs": "编辑设备组", "zh-cht": "編輯裝置群", "xloc": [ + "default-mobile.handlebars->9->421", "default-mobile.handlebars->9->423", - "default-mobile.handlebars->9->425", - "default-mobile.handlebars->9->445", + "default-mobile.handlebars->9->443", "default.handlebars->29->1413", "default.handlebars->29->1445", "default.handlebars->29->1469", @@ -13412,7 +13412,7 @@ "zh-chs": "编辑设备笔记", "zh-cht": "編輯裝置筆記", "xloc": [ - "default-mobile.handlebars->9->437", + "default-mobile.handlebars->9->435", "default.handlebars->29->1458" ] }, @@ -13541,7 +13541,7 @@ "zh-chs": "编辑笔记", "zh-cht": "編輯筆記", "xloc": [ - "default-mobile.handlebars->9->452", + "default-mobile.handlebars->9->450", "default.handlebars->29->1488" ] }, @@ -15264,7 +15264,7 @@ "zh-chs": "档案编辑器", "zh-cht": "檔案編輯器", "xloc": [ - "default-mobile.handlebars->9->318", + "default-mobile.handlebars->9->316", "default.handlebars->29->513", "default.handlebars->29->908" ] @@ -16006,9 +16006,9 @@ "zh-cht": "完整管理員", "xloc": [ "default-mobile.handlebars->9->105", - "default-mobile.handlebars->9->415", - "default-mobile.handlebars->9->424", - "default-mobile.handlebars->9->444", + "default-mobile.handlebars->9->413", + "default-mobile.handlebars->9->422", + "default-mobile.handlebars->9->442", "default.handlebars->29->1301", "default.handlebars->29->1444", "default.handlebars->29->1806" @@ -16166,7 +16166,7 @@ "zh-chs": "GPU", "zh-cht": "GPU", "xloc": [ - "default-mobile.handlebars->9->391", + "default-mobile.handlebars->9->389", "default.handlebars->29->999" ] }, @@ -17317,7 +17317,7 @@ "zh-chs": "保存1个条目进行复制", "zh-cht": "保存1個項目進行複製", "xloc": [ - "default-mobile.handlebars->9->327", + "default-mobile.handlebars->9->325", "default.handlebars->29->918" ] }, @@ -17338,7 +17338,7 @@ "zh-chs": "保存1个项目进行移动", "zh-cht": "保存1個項目進行移動", "xloc": [ - "default-mobile.handlebars->9->331", + "default-mobile.handlebars->9->329", "default.handlebars->29->922" ] }, @@ -17359,7 +17359,7 @@ "zh-chs": "保存{0}个条目进行复制", "zh-cht": "保留{0}個項目進行複製", "xloc": [ - "default-mobile.handlebars->9->325", + "default-mobile.handlebars->9->323", "default.handlebars->29->916" ] }, @@ -17380,7 +17380,7 @@ "zh-chs": "保存{0}个条目以进行移动", "zh-cht": "保存{0}個項目以進行移動", "xloc": [ - "default-mobile.handlebars->9->329", + "default-mobile.handlebars->9->327", "default.handlebars->29->920" ] }, @@ -17531,8 +17531,8 @@ "zh-chs": "IP：{0}", "zh-cht": "IP：{0}", "xloc": [ - "default-mobile.handlebars->9->360", - "default-mobile.handlebars->9->364", + "default-mobile.handlebars->9->358", + "default-mobile.handlebars->9->362", "default.handlebars->29->958", "default.handlebars->29->968", "default.handlebars->29->972" @@ -17555,8 +17555,8 @@ "zh-chs": "IP：{0}，掩码：{1}，网关：{2}", "zh-cht": "IP：{0}，遮罩：{1}，閘道：{2}", "xloc": [ - "default-mobile.handlebars->9->358", - "default-mobile.handlebars->9->362", + "default-mobile.handlebars->9->356", + "default-mobile.handlebars->9->360", "default.handlebars->29->956", "default.handlebars->29->966", "default.handlebars->29->970" @@ -17579,8 +17579,8 @@ "zh-chs": "IPv4层", "zh-cht": "IPv4層", "xloc": [ + "default-mobile.handlebars->9->355", "default-mobile.handlebars->9->357", - "default-mobile.handlebars->9->359", "default.handlebars->29->955", "default.handlebars->29->957", "default.handlebars->29->965", @@ -17667,8 +17667,8 @@ "zh-chs": "IPv6层", "zh-cht": "IPv6層", "xloc": [ + "default-mobile.handlebars->9->359", "default-mobile.handlebars->9->361", - "default-mobile.handlebars->9->363", "default.handlebars->29->969", "default.handlebars->29->971" ] @@ -17791,7 +17791,7 @@ "zh-chs": "识别码", "zh-cht": "識別符", "xloc": [ - "default-mobile.handlebars->9->389", + "default-mobile.handlebars->9->387", "default.handlebars->29->997" ] }, @@ -18685,7 +18685,7 @@ "zh-chs": "仅限英特尔®AMT，无代理", "zh-cht": "僅限Intel® AMT，無代理", "xloc": [ - "default-mobile.handlebars->9->406", + "default-mobile.handlebars->9->404", "default.handlebars->29->1291", "default.handlebars->29->1326" ] @@ -18752,7 +18752,7 @@ "zh-chs": "英特尔®主动管理技术（英特尔®AMT）", "zh-cht": "Intel ® Active Management Technology（Intel® AMT）", "xloc": [ - "default-mobile.handlebars->9->381", + "default-mobile.handlebars->9->379", "default.handlebars->29->989" ] }, @@ -19858,7 +19858,7 @@ "zh-chs": "已知的", "zh-cht": "已知的", "xloc": [ - "default-mobile.handlebars->9->380", + "default-mobile.handlebars->9->378", "default.handlebars->29->988" ] }, @@ -20253,9 +20253,9 @@ "zh-chs": "上次代理地址", "zh-cht": "上次代理地址", "xloc": [ + "default-mobile.handlebars->9->346", + "default-mobile.handlebars->9->347", "default-mobile.handlebars->9->348", - "default-mobile.handlebars->9->349", - "default-mobile.handlebars->9->350", "default.handlebars->29->69", "default.handlebars->29->71", "default.handlebars->29->73", @@ -20281,8 +20281,8 @@ "zh-chs": "上次代理连接", "zh-cht": "上次代理連接", "xloc": [ + "default-mobile.handlebars->9->343", "default-mobile.handlebars->9->345", - "default-mobile.handlebars->9->347", "default.handlebars->29->68", "default.handlebars->29->943", "default.handlebars->29->945" @@ -20693,7 +20693,7 @@ "zh-chs": "有限输入", "zh-cht": "有限輸入", "xloc": [ - "default-mobile.handlebars->9->457", + "default-mobile.handlebars->9->455", "default.handlebars->29->1494", "default.handlebars->29->678", "default.handlebars->29->699" @@ -20716,7 +20716,7 @@ "zh-chs": "仅有限输入", "zh-cht": "僅有限輸入", "xloc": [ - "default-mobile.handlebars->9->430", + "default-mobile.handlebars->9->428", "default.handlebars->29->1450" ] }, @@ -21750,8 +21750,8 @@ "zh-chs": "MAC层", "zh-cht": "MAC層", "xloc": [ + "default-mobile.handlebars->9->351", "default-mobile.handlebars->9->353", - "default-mobile.handlebars->9->355", "default.handlebars->29->951", "default.handlebars->29->953", "default.handlebars->29->961", @@ -21796,7 +21796,7 @@ "zh-chs": "MAC：{0}", "zh-cht": "MAC：{0}", "xloc": [ - "default-mobile.handlebars->9->356", + "default-mobile.handlebars->9->354", "default.handlebars->29->954", "default.handlebars->29->964" ] @@ -21818,7 +21818,7 @@ "zh-chs": "MAC：{0}，网关：{1}", "zh-cht": "MAC：{0}，網關：{1}", "xloc": [ - "default-mobile.handlebars->9->354", + "default-mobile.handlebars->9->352", "default.handlebars->29->952", "default.handlebars->29->962" ] @@ -22211,8 +22211,8 @@ "zh-chs": "管理设备组计算机", "zh-cht": "管理裝置群電腦", "xloc": [ - "default-mobile.handlebars->9->427", - "default-mobile.handlebars->9->447", + "default-mobile.handlebars->9->425", + "default-mobile.handlebars->9->445", "default.handlebars->29->1447", "default.handlebars->29->1483" ] @@ -22234,8 +22234,8 @@ "zh-chs": "管理设备组用户", "zh-cht": "管理裝置群用戶", "xloc": [ - "default-mobile.handlebars->9->426", - "default-mobile.handlebars->9->446", + "default-mobile.handlebars->9->424", + "default-mobile.handlebars->9->444", "default.handlebars->29->1446", "default.handlebars->29->1482" ] @@ -22484,7 +22484,7 @@ "zh-chs": "使用软件代理进行管理", "zh-cht": "使用軟體代理進行管理", "xloc": [ - "default-mobile.handlebars->9->407", + "default-mobile.handlebars->9->405", "default.handlebars->29->1327" ] }, @@ -22705,7 +22705,7 @@ "zh-chs": "记忆体", "zh-cht": "記憶體", "xloc": [ - "default-mobile.handlebars->9->398", + "default-mobile.handlebars->9->396", "default.handlebars->29->1006", "default.handlebars->29->2092", "default.handlebars->container->column_l->p40->3->1->p40type->3" @@ -22729,8 +22729,8 @@ "zh-cht": "Mesh Agent", "xloc": [ "default-mobile.handlebars->9->261", - "default-mobile.handlebars->9->344", - "default-mobile.handlebars->9->351", + "default-mobile.handlebars->9->342", + "default-mobile.handlebars->9->349", "default.handlebars->29->368", "default.handlebars->29->372", "default.handlebars->29->381", @@ -22760,7 +22760,7 @@ "zh-chs": "网格代理控制台", "zh-cht": "網格代理控制台", "xloc": [ - "default-mobile.handlebars->9->434", + "default-mobile.handlebars->9->432", "default.handlebars->29->1455" ] }, @@ -23451,7 +23451,7 @@ "zh-chs": "模型", "zh-cht": "模型", "xloc": [ - "default-mobile.handlebars->9->399", + "default-mobile.handlebars->9->397", "default.handlebars->29->1007" ] }, @@ -23532,7 +23532,7 @@ "zh-chs": "母板", "zh-cht": "母板", "xloc": [ - "default-mobile.handlebars->9->392", + "default-mobile.handlebars->9->390", "default.handlebars->29->1000" ] }, @@ -23999,12 +23999,11 @@ "zh-cht": "名稱", "xloc": [ "default-mobile.handlebars->9->219", - "default-mobile.handlebars->9->340", - "default-mobile.handlebars->9->386", - "default-mobile.handlebars->9->408", - "default-mobile.handlebars->9->421", + "default-mobile.handlebars->9->338", + "default-mobile.handlebars->9->384", + "default-mobile.handlebars->9->406", + "default-mobile.handlebars->9->419", "default-mobile.handlebars->9->97", - "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea3->deskarea3x->DeskTools->5->1->1", "default.handlebars->29->1288", "default.handlebars->29->1328", "default.handlebars->29->1411", @@ -24179,7 +24178,7 @@ "zh-chs": "网络", "zh-cht": "網路", "xloc": [ - "default-mobile.handlebars->9->365", + "default-mobile.handlebars->9->363", "default.handlebars->29->959", "default.handlebars->29->973" ] @@ -24286,7 +24285,7 @@ "zh-cht": "新建檔案夾", "xloc": [ "default-mobile.handlebars->9->120", - "default-mobile.handlebars->9->311", + "default-mobile.handlebars->9->309", "default.handlebars->29->1571", "default.handlebars->29->901", "default.handlebars->container->column_l->p13->p13toolbar->1->2->1->3", @@ -24537,7 +24536,7 @@ "zh-chs": "不能存取档案", "zh-cht": "不能存取檔案", "xloc": [ - "default-mobile.handlebars->9->432", + "default-mobile.handlebars->9->430", "default.handlebars->29->1453" ] }, @@ -24558,7 +24557,7 @@ "zh-chs": "没有档案", "zh-cht": "沒有檔案", "xloc": [ - "default-mobile.handlebars->9->455", + "default-mobile.handlebars->9->453", "default.handlebars->29->1492", "default.handlebars->29->676", "default.handlebars->29->697" @@ -24602,8 +24601,8 @@ "zh-chs": "没有英特尔®AMT", "zh-cht": "沒有Intel® AMT", "xloc": [ - "default-mobile.handlebars->9->433", - "default-mobile.handlebars->9->456", + "default-mobile.handlebars->9->431", + "default-mobile.handlebars->9->454", "default.handlebars->29->1454", "default.handlebars->29->1493" ] @@ -24747,8 +24746,8 @@ "zh-cht": "沒有權利", "xloc": [ "default-mobile.handlebars->9->106", - "default-mobile.handlebars->9->416", - "default-mobile.handlebars->9->463", + "default-mobile.handlebars->9->414", + "default-mobile.handlebars->9->461", "default.handlebars->29->1302", "default.handlebars->29->1500", "default.handlebars->29->690", @@ -24794,7 +24793,7 @@ "zh-chs": "没有终端", "zh-cht": "沒有終端", "xloc": [ - "default-mobile.handlebars->9->454", + "default-mobile.handlebars->9->452", "default.handlebars->29->1491", "default.handlebars->29->675", "default.handlebars->29->696" @@ -24817,7 +24816,7 @@ "zh-chs": "不能访问终端", "zh-cht": "不能訪問終端", "xloc": [ - "default-mobile.handlebars->9->431", + "default-mobile.handlebars->9->429", "default.handlebars->29->1452" ] }, @@ -25120,7 +25119,7 @@ "zh-chs": "没有此设备的讯息。", "zh-cht": "沒有此裝置的訊息。", "xloc": [ - "default-mobile.handlebars->9->404", + "default-mobile.handlebars->9->402", "default.handlebars->29->1012" ] }, @@ -25369,8 +25368,8 @@ "default-mobile.handlebars->9->222", "default-mobile.handlebars->9->224", "default-mobile.handlebars->9->256", - "default-mobile.handlebars->9->309", - "default-mobile.handlebars->9->410", + "default-mobile.handlebars->9->307", + "default-mobile.handlebars->9->408", "default.handlebars->29->1323", "default.handlebars->29->1330", "default.handlebars->29->1338", @@ -25507,7 +25506,7 @@ "zh-cht": "未啟動（輸入）", "xloc": [ "default-mobile.handlebars->9->230", - "default-mobile.handlebars->9->369", + "default-mobile.handlebars->9->367", "default.handlebars->29->560" ] }, @@ -25529,7 +25528,7 @@ "zh-cht": "未啟動（預）", "xloc": [ "default-mobile.handlebars->9->229", - "default-mobile.handlebars->9->368", + "default-mobile.handlebars->9->366", "default.handlebars->29->559" ] }, @@ -25571,7 +25570,7 @@ "zh-chs": "未知", "zh-cht": "未知", "xloc": [ - "default-mobile.handlebars->9->379", + "default-mobile.handlebars->9->377", "default.handlebars->29->987" ] }, @@ -26095,7 +26094,7 @@ "zh-chs": "只能编辑小于200k的档案。", "zh-cht": "只能編輯小於200k的檔案。", "xloc": [ - "default-mobile.handlebars->9->319", + "default-mobile.handlebars->9->317", "default.handlebars->29->514", "default.handlebars->29->909" ] @@ -26279,7 +26278,7 @@ "zh-chs": "操作系统", "zh-cht": "操作系統", "xloc": [ - "default-mobile.handlebars->9->343", + "default-mobile.handlebars->9->341", "default.handlebars->29->322", "default.handlebars->29->355", "default.handlebars->29->586", @@ -26473,7 +26472,6 @@ "zh-chs": "PID", "zh-cht": "PID", "xloc": [ - "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea3->deskarea3x->DeskTools->5->1->0", "default.handlebars->29->856", "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->1" ] @@ -26495,7 +26493,7 @@ "zh-chs": "零件号", "zh-cht": "零件號", "xloc": [ - "default-mobile.handlebars->9->397", + "default-mobile.handlebars->9->395", "default.handlebars->29->1005" ] }, @@ -26571,7 +26569,7 @@ "zh-cht": "部分權限", "xloc": [ "default-mobile.handlebars->9->104", - "default-mobile.handlebars->9->414", + "default-mobile.handlebars->9->412", "default.handlebars->29->1300" ] }, @@ -26918,7 +26916,7 @@ "zh-cht": "糊", "xloc": [ "default-mobile.handlebars->9->128", - "default-mobile.handlebars->9->324", + "default-mobile.handlebars->9->322", "default-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->2->1->3", "default-mobile.handlebars->container->page_content->column_l->p5->p5myfiles->p5toolbar->1->0->1->3", "default.handlebars->29->1580", @@ -27200,7 +27198,7 @@ "zh-chs": "权限", "zh-cht": "權限", "xloc": [ - "default-mobile.handlebars->9->466", + "default-mobile.handlebars->9->464", "default.handlebars->29->1503", "default.handlebars->29->1718" ] @@ -27956,7 +27954,6 @@ "zh-chs": "进程控制", "zh-cht": "進程控制", "xloc": [ - "default-mobile.handlebars->9->301", "default.handlebars->29->870", "desktop.handlebars->3->24" ] @@ -27978,7 +27975,6 @@ "zh-chs": "进程", "zh-cht": "進程", "xloc": [ - "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea3->deskarea3x->DeskTools->DeskToolsBar", "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabProcess" ] }, @@ -28119,7 +28115,7 @@ "zh-chs": "配置状态", "zh-cht": "配置狀態", "xloc": [ - "default-mobile.handlebars->9->373", + "default-mobile.handlebars->9->371", "default.handlebars->29->981" ] }, @@ -28673,7 +28669,7 @@ "zh-cht": "遞迴刪除", "xloc": [ "default-mobile.handlebars->9->121", - "default-mobile.handlebars->9->312", + "default-mobile.handlebars->9->310", "default.handlebars->29->1572", "default.handlebars->29->902" ] @@ -28718,7 +28714,6 @@ "zh-chs": "刷新", "zh-cht": "刷新", "xloc": [ - "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea3->deskarea3x->DeskTools->DeskToolsRefreshButton", "default-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->2->1->3", "default-mobile.handlebars->container->page_content->column_l->p5->p5myfiles->p5toolbar->1->0->1->3", "default.handlebars->29->526", @@ -28981,7 +28976,7 @@ "fr": "Commandes distantes", "nl": "Externe opdrachten", "xloc": [ - "default-mobile.handlebars->9->441", + "default-mobile.handlebars->9->439", "default.handlebars->29->1462" ] }, @@ -29002,8 +28997,8 @@ "zh-chs": "遥控", "zh-cht": "遙控", "xloc": [ - "default-mobile.handlebars->9->428", - "default-mobile.handlebars->9->448", + "default-mobile.handlebars->9->426", + "default-mobile.handlebars->9->446", "default.handlebars->29->1448", "default.handlebars->29->1484" ] @@ -29195,7 +29190,7 @@ "zh-chs": "远程网格用户", "zh-cht": "遠程網格用戶", "xloc": [ - "default-mobile.handlebars->9->469" + "default-mobile.handlebars->9->467" ] }, { @@ -29232,8 +29227,8 @@ "zh-chs": "仅远程查看", "zh-cht": "僅遠程查看", "xloc": [ - "default-mobile.handlebars->9->429", - "default-mobile.handlebars->9->453", + "default-mobile.handlebars->9->427", + "default-mobile.handlebars->9->451", "default.handlebars->29->1449", "default.handlebars->29->1489" ] @@ -29945,7 +29940,7 @@ "zh-cht": "改名", "xloc": [ "default-mobile.handlebars->9->125", - "default-mobile.handlebars->9->316", + "default-mobile.handlebars->9->314", "default-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->2->1->1", "default-mobile.handlebars->container->page_content->column_l->p5->p5myfiles->p5toolbar->1->0->1->1", "default.handlebars->29->1576", @@ -30124,7 +30119,7 @@ "fr": "Réinitialiser / Éteindre", "nl": "Reset / uitschakelen", "xloc": [ - "default-mobile.handlebars->9->442", + "default-mobile.handlebars->9->440", "default.handlebars->29->1463" ] }, @@ -30239,7 +30234,7 @@ "fr": "Réinitialisation / arrêt", "nl": "Reset/Uit", "xloc": [ - "default-mobile.handlebars->9->462", + "default-mobile.handlebars->9->460", "default.handlebars->29->1499", "default.handlebars->29->689", "default.handlebars->29->710" @@ -30434,7 +30429,7 @@ "zh-cht": "根", "xloc": [ "default-mobile.handlebars->9->107", - "default-mobile.handlebars->9->306", + "default-mobile.handlebars->9->304", "default.handlebars->29->1544", "default.handlebars->29->891" ] @@ -31321,7 +31316,7 @@ "zh-chs": "已使用TLS保安", "zh-cht": "已使用TLS保安", "xloc": [ - "default-mobile.handlebars->9->376", + "default-mobile.handlebars->9->374", "default.handlebars->29->984" ] }, @@ -31343,7 +31338,7 @@ "zh-cht": "安全", "xloc": [ "default-mobile.handlebars->9->282", - "default-mobile.handlebars->9->375", + "default-mobile.handlebars->9->373", "default.handlebars->29->1952", "default.handlebars->29->294", "default.handlebars->29->770", @@ -31614,7 +31609,7 @@ "zh-chs": "仅自我事件", "zh-cht": "僅自我事件", "xloc": [ - "default-mobile.handlebars->9->458", + "default-mobile.handlebars->9->456", "default.handlebars->29->1495" ] }, @@ -32021,7 +32016,7 @@ "zh-chs": "序列号", "zh-cht": "序列號", "xloc": [ - "default-mobile.handlebars->9->387", + "default-mobile.handlebars->9->385", "default.handlebars->29->995" ] }, @@ -32102,8 +32097,8 @@ "zh-chs": "服务器档案", "zh-cht": "伺服器檔案", "xloc": [ - "default-mobile.handlebars->9->435", - "default-mobile.handlebars->9->450", + "default-mobile.handlebars->9->433", + "default-mobile.handlebars->9->448", "default.handlebars->29->1456", "default.handlebars->29->1486", "default.handlebars->29->1804", @@ -33024,7 +33019,7 @@ "zh-chs": "只显示自己的事件", "zh-cht": "只顯示自己的事件", "xloc": [ - "default-mobile.handlebars->9->438", + "default-mobile.handlebars->9->436", "default.handlebars->29->1459" ] }, @@ -34838,7 +34833,6 @@ "fr": "Arrêter me processus #{0} \\\"{1}\\\"?", "nl": "Stop proces #{0} \\\"{1}\\\"?", "xloc": [ - "default-mobile.handlebars->9->302", "default.handlebars->29->871", "desktop.handlebars->3->25" ] @@ -34877,7 +34871,7 @@ "zh-chs": "储存", "zh-cht": "儲存", "xloc": [ - "default-mobile.handlebars->9->403", + "default-mobile.handlebars->9->401", "default.handlebars->29->1011" ] }, @@ -35354,7 +35348,7 @@ "zh-chs": "未设置TLS", "zh-cht": "未設置TLS", "xloc": [ - "default-mobile.handlebars->9->377", + "default-mobile.handlebars->9->375", "default.handlebars->29->985" ] }, @@ -37023,7 +37017,7 @@ "zh-chs": "类型", "zh-cht": "類型", "xloc": [ - "default-mobile.handlebars->9->411", + "default-mobile.handlebars->9->409", "default-mobile.handlebars->9->98", "default.handlebars->29->1289", "default.handlebars->29->1331", @@ -37341,7 +37335,7 @@ "zh-chs": "卸载", "zh-cht": "卸載", "xloc": [ - "default-mobile.handlebars->9->460", + "default-mobile.handlebars->9->458", "default.handlebars->29->1497", "default.handlebars->29->687", "default.handlebars->29->708" @@ -37364,7 +37358,7 @@ "zh-chs": "卸载代理", "zh-cht": "卸載代理", "xloc": [ - "default-mobile.handlebars->9->440", + "default-mobile.handlebars->9->438", "default.handlebars->29->437", "default.handlebars->29->753" ] @@ -37428,8 +37422,8 @@ "xloc": [ "default-mobile.handlebars->9->208", "default-mobile.handlebars->9->35", - "default-mobile.handlebars->9->367", - "default-mobile.handlebars->9->374", + "default-mobile.handlebars->9->365", + "default-mobile.handlebars->9->372", "default-mobile.handlebars->9->6", "default.handlebars->29->107", "default.handlebars->29->108", @@ -37465,7 +37459,7 @@ "zh-chs": "未知＃{0}", "zh-cht": "未知＃{0}", "xloc": [ - "default-mobile.handlebars->9->405", + "default-mobile.handlebars->9->403", "default.handlebars->29->1325" ] }, @@ -37758,9 +37752,9 @@ "zh-cht": "上載檔案", "xloc": [ "default-mobile.handlebars->9->126", - "default-mobile.handlebars->9->317", - "default-mobile.handlebars->9->335", - "default-mobile.handlebars->9->338", + "default-mobile.handlebars->9->315", + "default-mobile.handlebars->9->333", + "default-mobile.handlebars->9->336", "default.handlebars->29->1577", "default.handlebars->29->1585", "default.handlebars->29->907", @@ -37902,7 +37896,7 @@ "zh-chs": "上传将覆盖1个档案。继续？", "zh-cht": "上傳將覆蓋1個檔案。繼續？", "xloc": [ - "default-mobile.handlebars->9->336", + "default-mobile.handlebars->9->334", "default.handlebars->29->1586", "default.handlebars->29->932" ] @@ -37924,7 +37918,7 @@ "zh-chs": "上传将覆盖{0}个档案。继续？", "zh-cht": "上傳將覆蓋{0}個檔案。繼續？", "xloc": [ - "default-mobile.handlebars->9->337", + "default-mobile.handlebars->9->335", "default.handlebars->29->1587", "default.handlebars->29->933" ] @@ -38184,7 +38178,7 @@ "zh-chs": "用户授权", "zh-cht": "用戶授權", "xloc": [ - "default-mobile.handlebars->9->413", + "default-mobile.handlebars->9->411", "default.handlebars->29->1378", "default.handlebars->29->664" ] @@ -38296,7 +38290,7 @@ "zh-chs": "用户识别码", "zh-cht": "用戶識別碼", "xloc": [ - "default-mobile.handlebars->9->465" + "default-mobile.handlebars->9->463" ] }, { @@ -38379,7 +38373,7 @@ "zh-chs": "用户名", "zh-cht": "用戶名", "xloc": [ - "default-mobile.handlebars->9->464", + "default-mobile.handlebars->9->462", "default.handlebars->29->1501" ] }, @@ -38871,8 +38865,8 @@ "zh-chs": "供应商", "zh-cht": "供應商", "xloc": [ - "default-mobile.handlebars->9->382", - "default-mobile.handlebars->9->385", + "default-mobile.handlebars->9->380", + "default-mobile.handlebars->9->383", "default.handlebars->29->990", "default.handlebars->29->993" ] @@ -39039,10 +39033,10 @@ "zh-chs": "版本", "zh-cht": "版", "xloc": [ - "default-mobile.handlebars->9->341", - "default-mobile.handlebars->9->366", - "default-mobile.handlebars->9->383", - "default-mobile.handlebars->9->388", + "default-mobile.handlebars->9->339", + "default-mobile.handlebars->9->364", + "default-mobile.handlebars->9->381", + "default-mobile.handlebars->9->386", "default.handlebars->29->939", "default.handlebars->29->974", "default.handlebars->29->991", @@ -39382,8 +39376,8 @@ "zh-chs": "唤醒设备", "zh-cht": "喚醒裝置", "xloc": [ - "default-mobile.handlebars->9->436", - "default-mobile.handlebars->9->451", + "default-mobile.handlebars->9->434", + "default-mobile.handlebars->9->449", "default.handlebars->29->1457", "default.handlebars->29->1487" ] @@ -42316,8 +42310,8 @@ "zh-chs": "{0} Mb", "zh-cht": "{0} Mb", "xloc": [ - "default-mobile.handlebars->9->396", - "default-mobile.handlebars->9->401", + "default-mobile.handlebars->9->394", + "default-mobile.handlebars->9->399", "default.handlebars->29->1004", "default.handlebars->29->1009", "default.handlebars->29->1556", @@ -42341,7 +42335,7 @@ "zh-chs": "{0} Mb，{1} Mhz", "zh-cht": "{0} Mb，{1} Mhz", "xloc": [ - "default-mobile.handlebars->9->394", + "default-mobile.handlebars->9->392", "default.handlebars->29->1002" ] }, @@ -43169,4 +43163,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index fdfc5413..93622242 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -407,7 +407,7 @@ } - +
@@ -608,8 +608,10 @@ - - + + + +
@@ -645,19 +647,9 @@
-
-
-
- -
- +
+
+
@@ -920,6 +912,7 @@ var passRequirements = '{{{passRequirements}}}'; if (passRequirements != '') { passRequirements = JSON.parse(decodeURIComponent(passRequirements)); } var sessionActivity = Date.now(); + var deskPinchZoom; function startup() { if ((features & 32) == 0) { @@ -2299,7 +2292,7 @@ } count++; - r += '
'; // This is a standin for the device, it gets rendered only if visible. + r += '
'; // This is a standin for the device, it gets rendered only if visible. // If we are displaying devices by group, put the device in the right group. /* @@ -2441,7 +2434,7 @@ // Node var icon = node.icon, nodestate = NodeStateStr(node); if ((!node.conn) || (node.conn == 0)) { icon += ' gray'; } - devdivs[i].innerHTML = '
' + devNotify + '
' + name + '
' + nodestate + '
'; + devdivs[i].innerHTML = '
' + devNotify + '
' + name + '
' + nodestate + '
'; } else { devdivs[i].innerHTML = ''; // Hide } @@ -3056,7 +3049,7 @@ // If the device desktop is already connected in multi-desktop, use that. if ((desktopNode != currentNode) || (desktop == null)) { // Device is not already connected, just setup a blank canvas - QH('DeskParent', ''); + //QH('DeskParent', ''); desktopNode = currentNode; // Setup the mouse wheel Q('Desk').addEventListener('DOMMouseScroll', function (e) { return dmousewheel(e); }); @@ -3130,7 +3123,7 @@ desktop.m.bpp = (desktopsettings.encoding == 1 || desktopsettings.encoding == 3) ? 1 : 2; desktop.m.useZRLE = (desktopsettings.encoding < 3); desktop.m.showmouse = true; - desktop.m.onScreenSizeChange = deskAdjust; + desktop.m.onScreenSizeChange = function (o, x, y) { if (fullscreen) { QS('deskarea3').width = (x * fullscreenzoom) + 'px'; QS('deskarea3').height = (y * fullscreenzoom) + 'px'; } deskAdjust(); } desktop.Start(desktopNode._id, 16994, '*', '*', 0); desktop.contype = 2; } else { @@ -3144,7 +3137,7 @@ desktop.m.ScalingLevel = desktopsettings.scaling; desktop.m.FrameRateTimer = desktopsettings.framerate; desktop.m.onDisplayinfo = deskDisplayInfo; - desktop.m.onScreenSizeChange = deskAdjust; + desktop.m.onScreenSizeChange = function (o, x, y) { if (fullscreen) { QS('deskarea3').width = (x * fullscreenzoom) + 'px'; QS('deskarea3').height = (y * fullscreenzoom) + 'px'; } deskAdjust(); } desktop.Start(desktopNode._id); desktop.contype = 1; } @@ -3272,7 +3265,18 @@ QV('deskkeybutton4b', fullscreen && (desktop.m.SwapMouse)); } + function deskChangeFullscreenZoom() { + if (desktop == null) return; + if (fullscreenzoom == 1) { fullscreenzoom = 0.5; } else { fullscreenzoom = 1; } + QV('deskkeybutton5a', fullscreen && (fullscreenzoom == 1)); + QV('deskkeybutton5b', fullscreen && (fullscreenzoom != 1)); + QS('deskarea3').width = (desktop.m.ScreenWidth * fullscreenzoom) + 'px'; + QS('deskarea3').height = (desktop.m.ScreenHeight * fullscreenzoom) + 'px'; + deskAdjust(); + } + var fullscreen = false; + var fullscreenzoom = 1; function deskToggleFull() { fullscreen = !fullscreen; QV('mastheadx', !fullscreen); @@ -3293,25 +3297,36 @@ QV('deskkeybutton3b', false); QV('deskkeybutton4a', fullscreen && (!desktop.m.SwapMouse)); QV('deskkeybutton4b', fullscreen && (desktop.m.SwapMouse)); + QV('deskkeybutton5a', fullscreen && (fullscreenzoom == 1)); + QV('deskkeybutton5b', fullscreen && (fullscreenzoom != 1)); if (fullscreen) { + QS('DeskParent').height = null; QS('page_content').top = '0px'; QS('page_content').bottom = '0px'; QS('p10desktop').top = '0px'; QS('p10desktop').overflow = 'scroll'; QS('deskarea3').top = '0px'; - QS('deskarea3').width = '1920px'; - QS('deskarea3').height = '1080px'; + QS('deskarea3').width = (desktop.m.ScreenWidth * fullscreenzoom) + 'px'; + QS('deskarea3').height = (desktop.m.ScreenHeight * fullscreenzoom) + 'px'; QS('deskarea3')['padding-right'] = '55px'; + QS('body')['background-color'] = '#000'; + QS('p10')['background-color'] = '#000'; openFullscreen(); } else { + QS('DeskParent').height = '100%'; QS('page_content').top = '50px'; QS('page_content').bottom = '32px'; QS('p10desktop').top = '55px'; QS('p10desktop').overflow = 'hidden'; QS('deskarea3').top = '32px'; + QS('deskarea3').left = null; QS('deskarea3').width = '100%'; QS('deskarea3').height = 'calc(100% - 64px)'; QS('deskarea3')['padding-right'] = ''; + QS('DeskParent')['margin-top'] = null; + QS('DeskParent')['margin-left'] = null; + QS('body')['background-color'] = null; + QS('p10')['background-color'] = null; closeFullscreen(); } deskAdjust(); @@ -3323,6 +3338,10 @@ QS('Desk')['margin-bottom'] = null; QS('Desk').width = '100%'; QS('Desk').height = '100%'; + var parentH = Q('p10desktop').clientHeight, parentW = Q('p10desktop').clientWidth; + var deskH = Q('deskarea3').clientHeight, deskW = Q('deskarea3').clientWidth - 55; + if (parentH > deskH) { QS('deskarea3').top = ((parentH - deskH) / 2) + 'px'; } else { QS('deskarea3').top = null; } + if (parentW > deskW) { QS('deskarea3').left = ((parentW - deskW) / 2) + 'px'; } else { QS('deskarea3').left = null; } } else { var parentH = Q('DeskParent').clientHeight, parentW = Q('DeskParent').clientWidth; var deskH = Q('Desk').height, deskW = Q('Desk').width; @@ -3444,52 +3463,6 @@ setDialogMode(3, "Special Keys", 3, deskSendKeys); } - // Show process dialogs - function toggleDeskTools() { - setSessionActivity(); - if (xxdialogMode) return; - if (QS('DeskTools').display == 'none') { - QV('DeskTools', true); - Q('DeskTools').nodeid = currentNode._id; - refreshDeskTools(); - } else { - QV('DeskTools', false); - } - } - - // Refresh all of the desktop tool panels - function refreshDeskTools() { - setSessionActivity(); - QV('DeskToolsRefreshButton', false); - setTimeout(refreshDeskToolsEx, 500); - meshserver.send({ action: 'msg', type: 'ps', nodeid: currentNode._id }); - } - function refreshDeskToolsEx() { QV('DeskToolsRefreshButton', true); } - var deskTools = { sort: 1, msg: null }; - function sortProcess(sort) { deskTools.sort = sort; showDeskToolsProcesses(deskTools.msg); } - function sortProcessPid(a, b) { if (a.p > b.p) return 1; if (a.p < b.p) return (-1); return 0; } - function sortProcessName(a, b) { if (a.d > b.d) return 1; if (a.d < b.d) return (-1); return 0; } - function showDeskToolsProcesses(message) { - deskTools.msg = message; - if (message == null) { QH('DeskToolsProcesses', ''); return; } - if (Q('DeskTools').nodeid != message.nodeid) return; - var p = [], processes = null; - try { processes = JSON.parse(message.value); } catch (e) { } - if (processes != null) { - for (var pid in processes) { p.push({ p: parseInt(pid), c: processes[pid].cmd, d: processes[pid].cmd.toLowerCase(), u: processes[pid].user }); } - if (deskTools.sort == 0) { p.sort(sortProcessPid); } else if (deskTools.sort == 1) { p.sort(sortProcessName); } - var x = ''; - for (var i in p) { - if (p[i].p != 0) { - var c = p[i].c; - if (c.length > 30) { c = '' + EscapeHtml(c.substring(0, 30)) + '...' } else { c = EscapeHtml(c); } - x += '
' + EscapeHtml(p[i].p) + '
' + (p[i].u ? EscapeHtml(p[i].u) : '') + '
' + c + '
'; - } - } - QH('DeskToolsProcesses', x); - } - } - // Save the desktop image to file function deskSaveImage() { setSessionActivity(); @@ -3517,13 +3490,11 @@ QV('DeskScreens', displayCount > 1); } - function dmousedown(e) { setSessionActivity(); if ((!xxdialogMode && desktop != null)) { if (fullscreen) { e.addx = Q('p10desktop').scrollLeft; e.addy = Q('p10desktop').scrollTop; } desktop.m.mousedown(e); } } - function dmouseup(e) { setSessionActivity(); if ((!xxdialogMode && desktop != null)) { if (fullscreen) { e.addx = Q('p10desktop').scrollLeft; e.addy = Q('p10desktop').scrollTop; } desktop.m.mouseup(e); } } - function dmousemove(e) { setSessionActivity(); if ((!xxdialogMode && desktop != null)) { if (fullscreen) { e.addx = Q('p10desktop').scrollLeft; e.addy = Q('p10desktop').scrollTop; } desktop.m.mousemove(e); } } - function dmousewheel(e) { setSessionActivity(); if ((!xxdialogMode && desktop != null) && desktop.m.mousewheel) { if (fullscreen) { e.addx = Q('p10desktop').scrollLeft; e.addy = Q('p10desktop').scrollTop; } desktop.m.mousewheel(e); haltEvent(e); return true; } return false; } + function dmousedown(e) { setSessionActivity(); if ((!xxdialogMode && desktop != null)) { if (fullscreen) { e.addx = Q('p10desktop').scrollLeft * (1 / fullscreenzoom); e.addy = Q('p10desktop').scrollTop * (1 / fullscreenzoom); } desktop.m.mousedown(e); } } + function dmouseup(e) { setSessionActivity(); if ((!xxdialogMode && desktop != null)) { if (fullscreen) { e.addx = Q('p10desktop').scrollLeft * (1 / fullscreenzoom); e.addy = Q('p10desktop').scrollTop * (1 / fullscreenzoom); } desktop.m.mouseup(e); } } + function dmousemove(e) { setSessionActivity(); if ((!xxdialogMode && desktop != null)) { if (fullscreen) { e.addx = Q('p10desktop').scrollLeft * (1 / fullscreenzoom); e.addy = Q('p10desktop').scrollTop * (1 / fullscreenzoom); } desktop.m.mousemove(e); } } + function dmousewheel(e) { setSessionActivity(); if ((!xxdialogMode && desktop != null) && desktop.m.mousewheel) { if (fullscreen) { e.addx = Q('p10desktop').scrollLeft * (1 / fullscreenzoom); e.addy = Q('p10desktop').scrollTop * (1 / fullscreenzoom); } desktop.m.mousewheel(e); haltEvent(e); return true; } return false; } function drotate(x) { if (!xxdialogMode && desktop != null) { desktop.m.setRotation(desktop.m.rotation + x); deskAdjust(); } } - function stopProcess(id, name) { setDialogMode(2, "Process Control", 3, stopProcessEx, format("Stop process #{0} \"{1}\"?", id, name), id); return false; } - function stopProcessEx(buttons, tag) { meshserver.send({ action: 'msg', type: 'pskill', nodeid: currentNode._id, value: tag }); setTimeout(refreshDeskTools, 300); } // // FILES