[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl
help3xsl/help.js |2
help3xsl/online_transform.xsl | 103 +++---
2 files changed, 59 insertions(+), 46 deletions(-)
New commits:
commit e3164d8b3f10d2d3f856182044ff541adfcb1439
Author: Ilmari Lauhakangas
AuthorDate: Thu Apr 21 19:19:51 2022 +0300
Commit: Ilmari Lauhakangas
CommitDate: Thu May 12 14:44:46 2022 +0200
Add dir attribute to html element based on language directionality
Change-Id: I1dbb6cc2f3497ab70a806c94ad9d52ee1e10c13f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/133294
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas
diff --git a/help3xsl/help.js b/help3xsl/help.js
index dcf0dd365..65493ab0c 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -77,7 +77,7 @@ function fullLinkify(indexEl, bookmarks, modules,
currentModule) {
});
}
bookmarks.forEach(function(obj) {
-fullLinkified += '' + obj['text'] + '';
+fullLinkified += '' + obj['text'] + '';
});
return fullLinkified;
}
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 70c7ab0af..a9c47ae1e 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -132,7 +132,17 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -165,7 +175,7 @@
-
+
@@ -186,12 +196,12 @@
-
+
-
🔎︎
+
🔎︎
@@ -203,8 +213,8 @@
-
-
+
+
@@ -231,7 +241,7 @@
-
+
@@ -241,13 +251,13 @@
-https://www.libreoffice.org/donate/?pk_campaign=help"; target
="_blank">
+https://www.libreoffice.org/donate/?pk_campaign=help"; target
="_blank">
-http://schema.org/Organization";>
+http://schema.org/Organization";
dir="auto">
@@ -256,11 +266,11 @@
Help content debug info:
-This page is: https://opengrok.libreoffice.org/xref/help/source{$filename}";
target="_blank">
-Title is:
-
-
-
+This page is: https://opengrok.libreoffice.org/xref/help/source{$filename}";
target="_blank">
+Title is:
+
+
+
@@ -484,7 +494,7 @@
-
+
@@ -527,7 +537,7 @@
-
+
@@ -550,7 +560,7 @@
-
+
@@ -660,7 +670,7 @@
-Unsupported switch condition.
+Unsupported switch condition.
@@ -679,7 +689,7 @@
-Unsupported switch condition.
+Unsupported switch condition.
@@ -700,7 +710,7 @@
-Unsupported switch condition.
+Unsupported switch condition.
@@ -719,7 +729,7 @@
-Unsupported switch condition.
+Unsupported switch condition.
@@ -732,10 +742,10 @@
-
+
-
+
@@ -744,10 +754,10 @@
-
+
-
+
@@ -788,12 +798,14 @@
+auto
+auto
@@ -824,8 +836,8 @@
-
-
+
+
@@ -838,8 +850,8 @@
-
-
+
+
@@ -916,12 +928,12 @@
-http://schema.org/HowToStep";>
+http://schema.org/HowToStep"; dir="auto">
-http://schema.org/ItemListUnordered";>
+http://schema.org/ItemListUnordered"; dir="auto">
@@ -932,7 +944,7 @@
-http://schema.org/HowToSection";>
+http://schema.org/HowToS
[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl source/text
help3xsl/help.js| 11 +++
help3xsl/online_transform.xsl |9 ++---
source/text/shared/06/youtubevideos.xhp |5 -
source/text/shared/help/browserhelp.xhp |1 +
4 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit 751aa416e5aa4fdb6faf5be273aa8d999e1630e4
Author: Ilmari Lauhakangas
AuthorDate: Wed Feb 9 12:57:37 2022 +0200
Commit: Olivier Hallot
CommitDate: Wed Feb 9 16:24:41 2022 +0100
Add YouTube consent click
Change-Id: I60d64e1becbc7ea33301d4a8073f0b550998b87d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129716
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 0a7563e3f..dcf0dd365 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -246,4 +246,15 @@ document.addEventListener('click', function(event) {
});
}
});
+// YouTube consent click. This only works for a single video.
+let youtubePlaceholder = document.querySelector(".youtube_placeholder");
+if (youtubePlaceholder) {
+
youtubePlaceholder.prepend(...document.querySelectorAll(".youtube_consent"));
+}
+function youtubeLoader(ytId, width, height) {
+let iframeMarkup = `https://www.youtube-nocookie.com/embed/${ytId}?version=3";
allowfullscreen="true" frameborder="0">`;
+let placeholder = document.getElementById(ytId);
+placeholder.innerHTML = iframeMarkup;
+placeholder.removeAttribute("style");
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index a6ce8255b..ac6337d7e 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -108,6 +108,7 @@
+
[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl source/text
help3xsl/help.js| 10 --
help3xsl/online_transform.xsl | 14 +-
source/text/shared/help/browserhelp.xhp |2 ++
3 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 126ef50e9756e79bf5b500edeaa9275260a1b7d3
Author: Ilmari Lauhakangas
AuthorDate: Tue Nov 20 20:44:57 2018 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Nov 20 23:02:31 2018 +0100
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
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 7837f7f67..2237ed5b1 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 ee6a5fbf2..95892bdd4 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 0f29667c1..a0e33d635 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
If this page has been helpful, you can
support us!
%PRODUCTNAME %PRODUCTVERSION
Help
Click on text to copy to
clipboard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl
help3xsl/help.js | 65 +++
help3xsl/online_transform.xsl | 232 ++
2 files changed, 185 insertions(+), 112 deletions(-)
New commits:
commit d5ca87f12819b669646bb6f0978f79ebb5d3f035
Author: Olivier Hallot
Date: Sun Apr 15 22:43:17 2018 -0300
tdf#116150 Review XHP style transform
implement and with HTML and
Javascript, for 'sys' and 'appl'.
Change-Id: I6056e787146bb92617c2ce639acab16d16d6f765
Reviewed-on: https://gerrit.libreoffice.org/52929
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/help.js b/help3xsl/help.js
index cd454e6fb..585ff2ef8 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -7,42 +7,60 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
// Used to set Application in caseinline=APP
-function setModule(module) {
+function setApplSpan(SpanID) {
+var module = getParameterByName("DbPAR");
if (module === null) {
module = "WRITER";
}
-var itemspan = document.getElementsByTagName("span");
-var n = itemspan.length;
-for (var i = 0; i < n; i++) {
-if (itemspan[i].getAttribute("value") == module) {
-itemspan[i].removeAttribute("hidden");
+var y = document.getElementById(SpanID).getElementsByTagName("SPAN");
+var n = y.length;
+var foundSystem = false;
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( y[i].getAttribute("id").startsWith(module)){
+y[i].removeAttribute("hidden");
+foundSystem=true;
+}
+}
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( y[i].getAttribute("id").startsWith("default")){
+if(!foundSystem){
+y[i].removeAttribute("hidden");
+}
}
}
}
// Used to set system in case, caseinline=SYSTEM
-function setSystem(system) {
-var hasSystem;
+function setSystemSpan(spanID) {
+var system = getParameterByName("System");
// if no System in URL, get browser system
if (system === null) {
system = getSystem();
}
-// on loading page, DEFAULTSYS visible, sys is hidden
-// when hasSystem, show sys, hide DEFAULTSYS
-var itemspan = document.getElementsByTagName("span");
-var n = itemspan.length;
-//Show when system is found in page
-hasSystem = false;
-for (var i = 0; i < n; i++) {
-if (itemspan[i].getAttribute("value") == system) {
-itemspan[i].removeAttribute("hidden");
-hasSystem = true;
+var y = document.getElementById(spanID).getElementsByTagName("SPAN");
+var n = y.length;
+var foundSystem = false;
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( y[i].getAttribute("id").startsWith(system)){
+y[i].removeAttribute("hidden");
+foundSystem=true;
}
}
-//it hasSystem, then hide all DEFAULTSYS
-if (hasSystem){
-for (var i = 0; i < n; i++) {
-if (itemspan[i].getAttribute("value") == "DEFAULTSYS") {
-itemspan[i].setAttribute("hidden",true);
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( y[i].getAttribute("id").startsWith("default")){
+if(!foundSystem){
+y[i].removeAttribute("hidden");
}
}
}
@@ -229,5 +247,4 @@ if (typeof linkIndex !== "undefined") {
}
current.classList.add('contents-current');
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 6127ca924..6db51ccaf 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -138,6 +138,7 @@
+
@@ -306,16 +307,12 @@
-
[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl
help3xsl/help.js | 21 ++---
help3xsl/online_transform.xsl | 30 +++---
2 files changed, 33 insertions(+), 18 deletions(-)
New commits:
commit 13098ccef163c813ae3e196511f44a16a6e73fdd
Author: Olivier Hallot
Date: Fri Mar 2 19:20:42 2018 -0300
tdf#116150 Fix logic for case/caseinline with 'sys'
Change-Id: I5c9cb270fa89ea5281355fc80be2a155b9d9ef9e
Reviewed-on: https://gerrit.libreoffice.org/50650
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 9329f2d0f..838605526 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -19,16 +19,31 @@ function setModule(module) {
}
}
}
-// Used to set system in caseinline=SYSTEM
+// Used to set system in case, caseinline=SYSTEM
function setSystem(system) {
-var itemspan = document.getElementsByTagName("span");
+var hasSystem;
+// if no System in URL, get browser system
if (system === null) {
-system = "WIN";
+system = getSystem();
}
+// on loading page, DEFAULTSYS visible, sys is hidden
+// when hasSystem, show sys, hide DEFAULTSYS
+var itemspan = document.getElementsByTagName("span");
var n = itemspan.length;
+//Show when system is found in page
+hasSystem = false;
for (var i = 0; i < n; i++) {
if (itemspan[i].getAttribute("value") == system) {
itemspan[i].removeAttribute("hidden");
+hasSystem = true;
+}
+}
+//it hasSystem, then hide all DEFAULTSYS
+if (hasSystem){
+for (var i = 0; i < n; i++) {
+if (itemspan[i].getAttribute("value") == "DEFAULTSYS") {
+itemspan[i].setAttribute("hidden",true);
+}
}
}
}
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 0b9eed254..cd4774897 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -400,9 +400,9 @@
-
-
-
+
+
+
@@ -667,16 +667,16 @@
-
-
+
+
-
+
-
+
@@ -712,15 +712,15 @@
-
-
-
+
+
+
-
-
-
+
+
+
@@ -963,10 +963,10 @@
-
+
-
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl
help3xsl/help.js |2 --
help3xsl/online_transform.xsl |4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 46fc2324d0db000581fcbe5c55838bd58187a6fb
Author: Olivier Hallot
Date: Sun Jul 23 18:28:56 2017 -0300
tdf#97745 code cleanup
* Add debug param, to display page info in the bottom
&Debug={0|1}
Change-Id: I809548e5d59d0a55b258ca0ec69811efec51df67
Reviewed-on: https://gerrit.libreoffice.org/40341
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 0b22b5f89..6028802be 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -18,7 +18,6 @@ function setModule(module){
itemspan[i].removeAttribute("hidden");
}
}
-document.getElementById("M_"+module).selected="true";
}
// Used to set system in caseinline=SYSTEM
@@ -31,7 +30,6 @@ function setSystem(system){
itemspan[i].removeAttribute("hidden");
}
}
-document.getElementById("S_"+system).selected="true";
}
/* add &DbPAR= and &System= to the links in DisplayArea div */
function fixURL(module, system){
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index eef2cb982..f18caac2e 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -274,7 +274,7 @@
http://www.libreoffice.org/imprint";
target="_blank">Impressum (Legal Info) | http://www.libreoffice.org/privacy"; target="_blank">Privacy Policy |
http://www.documentfoundation.org/statutes.pdf";
target="_blank">Statutes (non-binding English translation) - http://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung
(binding German version) | Copyright information: Unless otherwise
specified, all text and images on this website are licensed under the http://creativecommons.org/licenses/by-sa/3.0/"; target="_blank">Creative
Commons Attribution-Share Alike 3.0 License. This does not include the
source code of LibreOffice, which is licensed under the http://www.libreoffice.org/download/license/"; target="_blank">Mozilla
Public License v2.0. âLibreOfficeâ and âThe Document Foundationâ
are registered trademarks of their corresponding registered owners or are in
actual use as trademarks
in one or more countries. Their respective logos and icons are also subject to
international copyright laws. Use thereof is explained in our http://wiki.documentfoundation.org/TradeMark_Policy";
target="_blank">trademark policy. LibreOffice was based on
OpenOffice.org.
-
+
Help content debug info:
This page is:
Title is:
@@ -291,6 +291,8 @@
var system = getParameterByName("System");
setSystem(system);
fixURL(module,system);
+var dbg = getParameterByName("Debug");
+document.getElementById("DEBUG").style.display = (dbg ==0) ?
"none":"block";
document.getElementById("bm_module").innerHTML ="Module is: "+module;
document.getElementById("bm_system").innerHTML ="System is: "+system;
]]>
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl
help3xsl/help.js |6 +++---
help3xsl/online_transform.xsl | 27 ++-
2 files changed, 25 insertions(+), 8 deletions(-)
New commits:
commit b915986913b52910c342eb831351897868226c0d
Author: Olivier Hallot
Date: Mon Jun 26 00:35:31 2017 -0300
Help-in-browser (v)
* Add piwik analysis
* handle SHARED module in search
Change-Id: I7c3c653d5e1211eed6c45b521fc35a9dc52ed21e
Reviewed-on: https://gerrit.libreoffice.org/39251
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 982f4bc8e..76ec59b53 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -9,7 +9,7 @@
// Used to set Apllication in caseinlie=APP
function setModule(module){
-if (module == null){module="SHARED"}
+if (module == null){module="WRITER"}
document.getElementById("bookmark"+module).hidden=false;
var itemspan = document.getElementsByTagName("span");
var n = itemspan.length;
@@ -35,7 +35,7 @@ function setSystem(system){
function fixURL(module, system){
var itemlink =
document.getElementById("DisplayArea").getElementsByTagName("a");
var pSystem = (system == null) ? "WIN" : system;
-var pAppl = (module == null) ? "SHARED" : module;
+var pAppl = (module == null) ? "WRITER" : module;
var n = itemlink.length;
var item;
for (var i = 0; i
-->
-
-
+
+
-
+
+
+
+
+
+
@@ -147,7 +164,7 @@
-
+
@@ -235,7 +252,7 @@
Basic
Math
Base
-Guide
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
