From 10c207f682a65bb3ff434689822024e828308341 Mon Sep 17 00:00:00 2001 From: Ilmari Lauhakangas Date: Tue, 20 Nov 2018 20:44:57 +0200 Subject: tdf#119415 Add placeholder text for index filter Change-Id: If7a0a863eb6b8bb95a5b6236f4f3d490739810a1 Reviewed-on: https://gerrit.libreoffice.org/63672 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit 126ef50e9756e79bf5b500edeaa9275260a1b7d3) Reviewed-on: https://gerrit.libreoffice.org/63682 --- help3xsl/help.js | 10 ++++++++-- help3xsl/online_transform.xsl | 14 +++++++++++++- source/text/shared/help/browserhelp.xhp | 2 ++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/help3xsl/help.js b/help3xsl/help.js index 7837f7f670..2237ed5b18 100644 --- a/help3xsl/help.js +++ b/help3xsl/help.js @@ -11,8 +11,14 @@ var url = document.URL; var moduleRegex = new RegExp('text\\/(\\w+)\\/'); var regexArray = moduleRegex.exec(url); -// get the module name from the URL and remove the first character -var currentModule = regexArray[1].toUpperCase().substring(1); +var currentModule = null; +// get the module name from the URL and remove the first character, +// but first deal with snowflake Base +if(url.indexOf('explorer/database/') !== -1) { + currentModule = 'BASE'; +} else { + currentModule = regexArray[1].toUpperCase().substring(1); +} var results = null; var fullLinkified = ''; var modules = ['CALC', 'WRITER', 'IMPRESS', 'DRAW', 'BASE', 'MATH', 'CHART', 'BASIC', 'SHARED']; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index ee6a5fbf27..95892bdd4c 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -108,6 +108,8 @@ + + @@ -195,7 +197,17 @@
🔎︎
- + + + + + + + + + + +
diff --git a/source/text/shared/help/browserhelp.xhp b/source/text/shared/help/browserhelp.xhp index 0f29667c1c..a0e33d635e 100644 --- a/source/text/shared/help/browserhelp.xhp +++ b/source/text/shared/help/browserhelp.xhp @@ -20,6 +20,8 @@ Language Contents Index + Search in all modules + Search in chosen module %PRODUCTNAME %PRODUCTVERSION Help Click on text to copy to clipboard -- cgit v1.2.3