diff --git a/AppPackages/README.md b/AppPackages/README.md index 7874bde7..821f8ebc 100644 --- a/AppPackages/README.md +++ b/AppPackages/README.md @@ -4,7 +4,7 @@ The easiest way to install the UWP app on Windows 10/11 is from the Microsoft St https://www.microsoft.com/en-gb/store/p/kiwix-js/9p8slz4j979j -There are portable and installable versions for Linux (Ubuntu, Debian, OpenSUSE), and Windows XP/Vista/7/8/10/11 available from https://kiwix.github.io/kiwix-js-pwa/kiwix-js-electron.html. The Store and Electron Setup and AppImage versions are self-updating. The `zip`, `deb` and `rpm` versions do not self-update. +There are portable and installable versions for Linux (Ubuntu, Debian, OpenSUSE), and Windows XP/Vista/7/8/10/11 available from https://kiwix.github.io/kiwix-js-pwa/app. The Store and Electron Setup and AppImage versions are self-updating. The `zip`, `deb` and `rpm` versions do not self-update. There is a PWA version at https://pwa.kiwix.org/ which can be installed as an offline app in any Chromium browser (Chrome, Edge) -- see Install button in Configuration. In Firefox, the app can be bookmarked, and will work offline, but it cannot be installed. diff --git a/README.md b/README.md index 66e973f6..2a6155f2 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,11 @@ offline knowledge!** The app is available either as an offline-capable, [installable Web App](#universal-progressive-web-app) (PWA), for almost all modern browsers and devices, or else as app packages for various Windows and Linux operating systems: see -**[Kiwix JS for Windows and Linux](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-uwp.html)**. For **Mac and iOS**, use the offline +**[Kiwix JS for Windows and Linux](https://kiwix.github.io/kiwix-js-pwa/app)**. For **Mac and iOS**, use the offline web app ([more info below](#universal-progressive-web-app)). -We also have packaged apps of **[WikiMed by Kiwix](https://kiwix.github.io/kiwix-js-pwa/wikimed-uwp.html)** (a complete medical -encyclopaedia), and **[Wikivoyage by Kiwix](https://kiwix.github.io/kiwix-js-pwa/wikivoyage-uwp.html)** (a complete travel guide) in +We also have packaged apps of **[WikiMed by Kiwix](https://kiwix.github.io/kiwix-js-pwa/wikimed)** (a complete medical +encyclopaedia), and **[Wikivoyage by Kiwix](https://kiwix.github.io/kiwix-js-pwa/wikivoyage)** (a complete travel guide) in English -- no extra download needed! (You can, however, download other languages in these apps.) If you are using **Windows 10 or 11**, then all three apps are conveniently available in the Microsoft Store: @@ -24,8 +24,8 @@ If you are using **Windows 10 or 11**, then all three apps are conveniently avai **[WikiMed by Kiwix](https://www.microsoft.com/store/apps/9PHJSNP1CZ8J)**, and **[Wikivoyage by Kiwix](https://www.microsoft.com/store/apps/9N5SB90Q4JBJ)**. They will automatically update when a new package is available. If you are using **Linux**, then the -[Electron AppImage package](http://kiwix.github.io/kiwix-js-pwa/kiwix-js-electron.html) of Kiwix JS also (optionally) self-updates, -as does the installable [Windows Electron package](http://kiwix.github.io/kiwix-js-pwa/kiwix-js-electron.html). All other apps can +[Electron AppImage package](http://kiwix.github.io/kiwix-js-pwa/app) of Kiwix JS also (optionally) self-updates, +as does the installable [Windows Electron package](http://kiwix.github.io/kiwix-js-pwa/app). All other apps can (optionally) notify you when a new version is available, and give you a download link. ## Universal Progressive Web App @@ -86,8 +86,8 @@ try switching the app to JQuery mode (see Content injection mode in Configuratio * As an application implemented with the following frameworks: - + Electron >= 1.8.0 (Ubuntu, Debian, Fedora, OpenSUSE, AppImage, Windows): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-electron.html) - + Universal Windows Platform (UWP) >=10.0.10240: [Microsoft Store app](https://www.microsoft.com/store/apps/9P8SLZ4J979J) or [GitHub release](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-uwp.html) - Windows 10/11 (Electron), Windows on ARM, Xbox, Windows 10 Mobile + + Electron >= 1.8.0 (Ubuntu, Debian, Fedora, OpenSUSE, AppImage, Windows): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/app) + + Universal Windows Platform (UWP) >=10.0.10240: [Microsoft Store app](https://www.microsoft.com/store/apps/9P8SLZ4J979J) or [GitHub release](https://kiwix.github.io/kiwix-js-pwa/app) - Windows 10/11 (Electron), Windows on ARM, Xbox, Windows 10 Mobile + NWJS >= 0.23.0 (Windows 7/8/10/11): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html) + NWJS 0.14.7 (Windows XP/Vista only): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html) @@ -122,7 +122,7 @@ APIs, see the bottom of this page: All three apps are available in the WinGet Package Manager. You can sideload the UWP version (in Windows 10/11) by opening a Command Prompt or PowerShell terminal and typing `winget install kiwix.kiwixjs` (this version will not auto-update, but it will let you know when a new update is ready to install). Alternative sideloading instructions are available in the -[release notes](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-uwp.html). The Electron version can be installed with +[release notes](https://kiwix.github.io/kiwix-js-pwa/app). The Electron version can be installed with `winget install kiwix.kiwixjs.electron`, or else by downloading a package from [Releases](https://github.com/kiwix/kiwix-js-pwa/releases/). For testing, the Store, Electron and NWJS versions come packaged with a mini archive of the top 100 Wikipedia articles (without images and with only the lede paragraph). diff --git a/scripts/Kiwix_JS_WikiMed_E_Release_Body.md b/scripts/Kiwix_JS_WikiMed_E_Release_Body.md index a2033905..0ed17312 100644 --- a/scripts/Kiwix_JS_WikiMed_E_Release_Body.md +++ b/scripts/Kiwix_JS_WikiMed_E_Release_Body.md @@ -1,6 +1,6 @@ ## Portable and installable builds of Kiwix JS WikiMed Electron Edition for Windows 7/8/10/11 and Linux -This is **not** the UWP/Microsoft Store build. If you are using Windows 10 or 11, we strongly recommend [the WikiMed release for the Microsoft Store](https://kiwix.github.io/kiwix-js-pwa/wikimed-uwp.html), which will keep itself up-to-date automatically. These portable and installable versions run on the included [Electron platform](https://www.electronjs.org/) version 10.4.0. +This is **not** the UWP/Microsoft Store build. If you are using Windows 10 or 11, we strongly recommend [the WikiMed release for the Microsoft Store](https://kiwix.github.io/kiwix-js-pwa/wikimed), which will keep itself up-to-date automatically. These portable and installable versions run on the included [Electron platform](https://www.electronjs.org/) version 10.4.0. These builds are packaged with the <> English-language WikiMed archive `<>`. They will run on 32bit and 64bit editions of Windows or Linux (tested on Ubuntu, Debian and OpenSUSE - but see instructions below). The Windows build is **not compatible with Windows XP or Windows Vista**. If you need an app compatible with those old platforms, get [Kiwix JS Windows reader](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html) and download the latest WikiMed archive from within the app. diff --git a/scripts/Kiwix_JS_Windows_E_Release_Body.md b/scripts/Kiwix_JS_Windows_E_Release_Body.md index 88089f03..461fe410 100644 --- a/scripts/Kiwix_JS_Windows_E_Release_Body.md +++ b/scripts/Kiwix_JS_Windows_E_Release_Body.md @@ -1,6 +1,6 @@ ## Portable and installable builds of Kiwix JS for Windows XP/Vista/7/8/10/11 and Linux -This is **not** the UWP/Microsoft Store build. If you are using Windows 10 or 11, we strongly recommend [the Kiwix JS UWP release](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-uwp.html), which will keep itself up-to-date automatically. These portable and installable versions run on the included [Electron platform](https://www.electronjs.org/) version 16.0.2 and [NWJS](https://nwjs.io/) 0.59.1 (Win7/8/10/11) or 0.14.7 (XP/Vista). +This is **not** the UWP/Microsoft Store build. If you are using Windows 10 or 11, we strongly recommend [the Kiwix JS UWP release](https://kiwix.github.io/kiwix-js-pwa/app), which will keep itself up-to-date automatically. These portable and installable versions run on the included [Electron platform](https://www.electronjs.org/) version 16.0.2 and [NWJS](https://nwjs.io/) 0.59.1 (Win7/8/10/11) or 0.14.7 (XP/Vista). These builds are packaged with the <> sample ZIM of the top 100 Wikipedia articles in English, `<>`. They will run on 32bit and 64bit editions of Windows or Linux (tested on Ubuntu, Debian and OpenSUSE - but see instructions below). diff --git a/scripts/Kiwix_JS_Windows_N_Release_Body.md b/scripts/Kiwix_JS_Windows_N_Release_Body.md index 5c904049..6c51eaa9 100644 --- a/scripts/Kiwix_JS_Windows_N_Release_Body.md +++ b/scripts/Kiwix_JS_Windows_N_Release_Body.md @@ -1,6 +1,6 @@ ## This is a portable build of Kiwix JS NWJS for any 32bit or 64bit edition of Windows -This is **not** the UWP/Microsoft Store build. If you are using **Windows 10**, you may prefer to use [the release for the Microsoft Store](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-uwp.html), which is smaller and faster to load. This version runs on the [NWJS platform](https://nwjs.io/) (which is very similar to ElectronJS, but supports older versions of Windows). The package does **not** auto-update (whereas the Store version does). Please choose the correct build as follows: +This is **not** the UWP/Microsoft Store build. If you are using **Windows 10**, you may prefer to use [the release for the Microsoft Store](https://kiwix.github.io/kiwix-js-pwa/app), which is smaller and faster to load. This version runs on the [NWJS platform](https://nwjs.io/) (which is very similar to ElectronJS, but supports older versions of Windows). The package does **not** auto-update (whereas the Store version does). Please choose the correct build as follows: For Windows XP or Windows Vista: [`kiwix_js_windows-XP-<>-win-ia32.zip`](https://github.com/kiwix/kiwix-js-pwa/releases/download/v<>/kiwix_js_windows-XP-<>-win-ia32.zip) For Windows 7,8,10 32bit: [`kiwix_js_windows-<>-win-ia32.zip`](https://github.com/kiwix/kiwix-js-pwa/releases/download/v<>/kiwix_js_windows-<>-win-ia32.zip) diff --git a/www/js/app.js b/www/js/app.js index 6e133b48..759b3efa 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -1701,7 +1701,7 @@ document.getElementById('allowInternetAccessCheck').addEventListener('change', f var message; if (!/PWA/.test(params.appType)) { message = '

You are accessing Kiwix JS from a remote server, and it is not possible to disable Internet access fully without exiting the app.

' + - '

Please visit Kiwix JS UWP/Electron/NWJS to find an app version that will run fully offline.

'; + '

Please visit Kiwix JS UWP/Electron/NWJS to find an app version that will run fully offline.

'; uiUtil.systemAlert(message); this.checked = true; params.allowInternetAccess = true;