diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-08-15 08:54:28 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-15 11:21:15 +0200 |
| commit | 77740035a0c95abac64eedd7eac54c210feaa447 (patch) | |
| tree | 1c2ef3c6befda76af9d8aa1bd3e6aec7de90d707 | |
| parent | 3b564bf5214e3b3a33ec93d9c1298aace161c37d (diff) | |
The <version>/index.html can default correctly, no need to do it in the root.
Change-Id: If74aaea6924638f9fef647121da4a35c66fc0213
Reviewed-on: https://gerrit.libreoffice.org/59045
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | help3xsl/help.html | 4 | ||||
| -rw-r--r-- | help3xsl/index.html | 3 | ||||
| -rw-r--r-- | help3xsl/index2.html | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/help3xsl/help.html b/help3xsl/help.html index e63435b45c..21afd2ff41 100644 --- a/help3xsl/help.html +++ b/help3xsl/help.html @@ -37,9 +37,7 @@ var newURL = version + '/index.html?' + query; window.location.href = newURL; } else { - // URL came from elsewhere, direct access to webroot, we redirect to main Help page - var userLang = navigator.language || navigator.userLanguage; - window.location.href = 'latest/' + userLang + '/text/shared/main0108.html?&DbPAR=WRITER&System=WIN'; + window.location.href = 'latest/index.html'; } </script> </body> diff --git a/help3xsl/index.html b/help3xsl/index.html index fcaa9bdda6..9f4dae9466 100644 --- a/help3xsl/index.html +++ b/help3xsl/index.html @@ -12,8 +12,7 @@ </head> <body> <script type="text/javascript"> - var userLang = navigator.language || navigator.userLanguage; - window.open('latest/'+userLang+'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self'); + window.location.href = 'latest/index.html'; </script> </body> </html> diff --git a/help3xsl/index2.html b/help3xsl/index2.html index ad12320433..8b58a4f6e0 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -20,7 +20,6 @@ if (n != -1) { // the URL came from LibreOffice help (F1) var target = getParameterByName("Target",url); - var version = getParameterByName("Version",url); var lang = existingLang(getParameterByName("Language", url)); var system = getParameterByName("System",url); var module; |