From a59c1dd05f6e851a60087b4cebb4b4cbb5ab476d Mon Sep 17 00:00:00 2001 From: Joaquin Date: Wed, 26 Apr 2023 19:28:12 +0300 Subject: [PATCH] [ux/office] Add online installer option Add option for installation using online installer rather than heavy offline .img file, also fixed customKMS confirm button going straight to office 21 rather than the office selection menu, the legacy button removal does not mean I won't add it later on, I just found it useless and ugly --- main.js | 12 ++++++++++++ webPage/css/dist.css | 10 +++++++--- webPage/css/source.css | 6 +++--- webPage/office/19/index.html | 11 ++++++++++- webPage/office/21/index.html | 11 ++++++++++- webPage/office/setKMS/customKMS/index.html | 2 +- webPage/office/ver/index.html | 9 ++++----- 7 files changed, 47 insertions(+), 14 deletions(-) diff --git a/main.js b/main.js index 4506d7e..5085b0d 100644 --- a/main.js +++ b/main.js @@ -54,10 +54,18 @@ function downloadOffice21(){ shell.openExternal("https://officecdn.microsoft.com/db/492350f6-3a01-4f97-b9c0-c7c6ddf67d60/media/en-us/ProPlus2021Retail.img") } +function downloadOffice21_o(){ + shell.openExternal("https://c2rsetup.officeapps.live.com/c2r/download.aspx?ProductreleaseID=ProPlus2021Retail&platform=x64&language=en-us&version=O16GA") +} + function downloadOffice19(){ shell.openExternal("https://officecdn.microsoft.com/pr/492350f6-3a01-4f97-b9c0-c7c6ddf67d60/media/en-us/ProPlus2019Retail.img") } +function downloadOffice19_o(){ + shell.openExternal("https://c2rsetup.officeapps.live.com/c2r/download.aspx?ProductreleaseID=ProPlus2019Retail&platform=x64&language=en-us&version=O16GA") +} + function openServerPage(){ shell.openExternal("https://github.com/Wind4/vlmcsd") } @@ -91,8 +99,12 @@ ipcMain.on("activateOffice19", activateOffice19) ipcMain.on("downloadOffice21", downloadOffice21) +ipcMain.on("downloadOffice21-o", downloadOffice21_o) + ipcMain.on("downloadOffice19", downloadOffice19) +ipcMain.on("downloadOffice19-o", downloadOffice19_o) + ipcMain.on("uninstallCert", uninstallCert) ipcMain.on("openServerPage", openServerPage) diff --git a/webPage/css/dist.css b/webPage/css/dist.css index 08a3a6e..ca5bac6 100644 --- a/webPage/css/dist.css +++ b/webPage/css/dist.css @@ -581,6 +581,10 @@ Ensure the default browser behavior of the `hidden` attribute. width: 80%; } +.w-3\/4 { + width: 75%; +} + .w-5\/6 { width: 83.333333%; } @@ -887,11 +891,11 @@ p{ .officevercontainer { display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: 1fr 1fr; grid-template-rows: 1fr; - gap: 0px 0px; + gap: 0px; grid-template-areas: - "twentyone nineteen legacy"; + "twentyone nineteen"; } .twentyone { diff --git a/webPage/css/source.css b/webPage/css/source.css index 8b1d7bb..b19e525 100644 --- a/webPage/css/source.css +++ b/webPage/css/source.css @@ -64,11 +64,11 @@ p{ .officevercontainer { display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: 1fr 1fr; grid-template-rows: 1fr; - gap: 0px 0px; + gap: 0px; grid-template-areas: - "twentyone nineteen legacy"; + "twentyone nineteen"; } .twentyone { grid-area: twentyone; } diff --git a/webPage/office/19/index.html b/webPage/office/19/index.html index b052978..63be387 100644 --- a/webPage/office/19/index.html +++ b/webPage/office/19/index.html @@ -17,7 +17,10 @@

After downloading the .img file, open it and run 'Setup', after installation is done you can activate it using the tool below

- + + + +
@@ -56,6 +59,12 @@ }); + document.getElementById('downloadonline').addEventListener("click", function(){ + +ipcRenderer.send("downloadOffice19-o"); + +}); + diff --git a/webPage/office/21/index.html b/webPage/office/21/index.html index 5603822..f637ea4 100644 --- a/webPage/office/21/index.html +++ b/webPage/office/21/index.html @@ -17,7 +17,10 @@

After downloading the .img file, open it and run 'Setup', after installation is done you can activate it using the tool below

- + + + +
@@ -56,6 +59,12 @@ }); + document.getElementById('downloadonline').addEventListener("click", function(){ + +ipcRenderer.send("downloadOffice21-o"); + +}); + diff --git a/webPage/office/setKMS/customKMS/index.html b/webPage/office/setKMS/customKMS/index.html index 0aca9a1..d6433d7 100644 --- a/webPage/office/setKMS/customKMS/index.html +++ b/webPage/office/setKMS/customKMS/index.html @@ -52,7 +52,7 @@ kmsDefault.addEventListener("click", function(){ ipcRenderer.send("setKMS", customkms.value); console.log("--custom kms server--" + customkms.value); - location.href = "../../21/index.html"; + location.href = "../../ver/index.html"; }); diff --git a/webPage/office/ver/index.html b/webPage/office/ver/index.html index 679e9c0..4c1f47c 100644 --- a/webPage/office/ver/index.html +++ b/webPage/office/ver/index.html @@ -18,14 +18,13 @@
- +
- -
-
- +
+ +