[Libreoffice-commits] help.git: 2 commits - help3xsl/default.css help3xsl/help2.js help3xsl/HELP-IN-BROWSER-README.txt help3xsl/help.js help3xsl/online_transform.xsl Package_html_static.mk source/HELP-IN-BROWSER-README.txt source/index.html
Olivier Hallot
olivier.hallot at libreoffice.org
Tue Apr 17 02:39:15 UTC 2018
Package_html_static.mk | 1
help3xsl/default.css | 3 +
help3xsl/help.js | 113 --------------------------------------
help3xsl/help2.js | 123 ++++++++++++++++++++++++++++++++++++++++++
help3xsl/online_transform.xsl | 3 -
source/index.html | 50 -----------------
6 files changed, 129 insertions(+), 164 deletions(-)
New commits:
commit 49375fa3358ea5bf8cb8ba0f1bf4f5ab0ada40c3
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date: Mon Apr 16 19:19:10 2018 -0300
Helpcontent2 housekeeping
Deleted spurious file in source/
Change-Id: Ia7417413e615635496398c223a0d95911c994123
Reviewed-on: https://gerrit.libreoffice.org/53012
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/source/HELP-IN-BROWSER-README.txt b/help3xsl/HELP-IN-BROWSER-README.txt
similarity index 100%
rename from source/HELP-IN-BROWSER-README.txt
rename to help3xsl/HELP-IN-BROWSER-README.txt
diff --git a/source/index.html b/source/index.html
deleted file mode 100644
index 32a2a5302..000000000
--- a/source/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-* This file is part of the LibreOffice project.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public
-* License, v. 2.0. If a copy of the MPL was not distributed with this
-* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-*
--->
-<html>
-<head>
-<title>LibreOffice Help</title>
-<link href="default.css" rel="Stylesheet" type="text/css" />
-<script type="text/javascript" src="jquery-3.1.1.min.js"></script>
-<script type="text/javascript" src="help.js"></script>
-</head>
-<body>
- <div id="DisplayArea"></div>
- <div id="TopLeft">
- <table>
- <tr>
- <td><p class="topmenu" onclick="displayResult('text/scalc/main0000.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=scalc','calc')">Calc</p></td>
- <td><p class="topmenu" onclick="displayResult('text/swriter/main0000.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=swriter','writer')">Writer</p></td>
- <td><p class="topmenu" onclick="displayResult('text/simpress/main0000.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=simpress','impress')">Impress</p></td>
- <td><p class="topmenu" onclick="displayResult('text/sdraw/main0000.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=sdraw','draw')">Draw</p></td>
- <td><p class="topmenu" onclick="displayResult('text/schart/main0000.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=schart','chart')">Chart</p></td>
- <td><p class="topmenu" onclick="displayResult('text/sbasic/shared/main0601.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=sbasic','basic')">Basic</p></td>
- <td><p class="topmenu" onclick="displayResult('text/smath/main0000.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=smath','math')">Math</p></td>
- <td><p class="topmenu" onclick="displayResult('text/shared/explorer/database/main.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=shared','shared')">Base</p></td>
- <td><p class="topmenu" onclick="displayResult('text/shared/guide/main.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=shared','shared')">Guide</p></td>
- </tr>
- </table>
- <p>Search: <input type="text" id="search-bar"/></p>
- </div>
- <div id="BottomLeft"></div>
- <div id="NavigationHistory"></div>
- <div id="TopRight"></div>
-<script type="text/javascript">
-if (window.location.href.indexOf('?') && getParameterByName('page')) {
- var module = getParameterByName("DbPAR");
- var language = getParameterByName("Language");
- var system = getParameterByName("System");
- var usedb = getParameterByName("UseDB");
- displayResult('text/' + getParameterByName('page') + '?&DbPAR='+module+'&Language='+language+'&System='+system+'&UseDB='+usedb);
-} else {
- displayResult('text/shared/main0108.xhp?Language=en-US&System=WIN&UseDB=no&DbPAR=shared','shared');
-}
-</script>
-</body>
-</html>
commit 22691f35eea6bf031fe271790d9b19093a12f8f4
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date: Mon Apr 16 19:16:05 2018 -0300
Fix index in sidebar
The last commit of online_transform.xsl instrpduced a bug in
index search on the left. This one fixes it.
Change-Id: I8055389a324d1fc5fde90ac2b76ff6f0a4a42493
Reviewed-on: https://gerrit.libreoffice.org/53011
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/Package_html_static.mk b/Package_html_static.mk
index 361987783..79c0be172 100644
--- a/Package_html_static.mk
+++ b/Package_html_static.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Package_add_file,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOL
$(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),''),\
help.js \
+ help2.js \
fuse.js \
paginathing.js \
normalize.css \
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 391c4d213..8d6d3df2d 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -266,6 +266,9 @@ h6 {
display:inline-block;
border:none;
}
+.switch,
+.switchinline {}
+
.tintro {
color: white;
background-color: green;
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 585ff2ef8..76d47dd77 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -6,120 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-// Used to set Application in caseinline=APP
-function setApplSpan(SpanID) {
- var module = getParameterByName("DbPAR");
- if (module === null) {
- module = "WRITER";
- }
- 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 setSystemSpan(spanID) {
- var system = getParameterByName("System");
- // if no System in URL, get browser system
- if (system === null) {
- system = getSystem();
- }
- 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;
- }
- }
- 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");
- }
- }
- }
-}
-/* add &DbPAR= and &System= to the links in DisplayArea div */
-/* skip for object files */
-function fixURL(module, system) {
- var itemlink = document.getElementById("DisplayArea").getElementsByTagName("a");
- var pSystem = (system === null) ? getSystem() : system;
- var pAppl = (module === null) ? "WRITER" : module;
- var n = itemlink.length;
- for (var i = 0; i < n; i++) {
- if (itemlink[i].getAttribute("class") != "objectfiles"){
- setURLParam(itemlink[i], pSystem, pAppl);
- };
- }
-}
-//Set the params inside URL
-function setURLParam(itemlink, pSystem, pAppl) {
- var href = itemlink.getAttribute("href");
- if (href !== null) {
- // skip external links
- if (!href.startsWith("http")) {
- // handle bookmark.
- if (href.lastIndexOf('#') != -1) {
- var postf = href.substring(href.lastIndexOf('#'), href.length);
- var pref = href.substring(0, href.lastIndexOf('#'));
- itemlink.setAttribute("href", pref + "?" + '&DbPAR=' + pAppl + '&System=' + pSystem + postf);
- } else {
- itemlink.setAttribute("href", href + "?" + '&DbPAR=' + pAppl + '&System=' + pSystem);
- }
- }
- }
-}
-
-function getSystem() {
- var system = "Unknown OS";
- if (navigator.appVersion.indexOf("Win") != -1) system = "WIN";
- if (navigator.appVersion.indexOf("Mac") != -1) system = "MAC";
- if (navigator.appVersion.indexOf("X11") != -1) system = "UNIX";
- if (navigator.appVersion.indexOf("Linux") != -1) system = "UNIX";
- return system;
-}
-function getParameterByName(name, url) {
- if (!url) {
- url = window.location.href;
- }
- name = name.replace(/[\[\]]/g, "\\$&");
- var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)");
- var results = regex.exec(url);
- if (!results) {
- return null;
- }
- if (!results[2]) {
- return '';
- }
- return decodeURIComponent(results[2].replace(/\+/g, " "));
-}
// Pagination and fuzzy search
var fuseshown = document.getElementsByClassName("fuseshown");
var indexkids = document.getElementsByClassName("index")[0].children;
diff --git a/help3xsl/help2.js b/help3xsl/help2.js
new file mode 100644
index 000000000..0e7b9d332
--- /dev/null
+++ b/help3xsl/help2.js
@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+// Used to set Application in caseinline=APP
+function setApplSpan(SpanID) {
+ var module = getParameterByName("DbPAR");
+ if (module === null) {
+ module = "WRITER";
+ }
+ 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 setSystemSpan(spanID) {
+ var system = getParameterByName("System");
+ // if no System in URL, get browser system
+ if (system === null) {
+ system = getSystem();
+ }
+ 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;
+ }
+ }
+ 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");
+ }
+ }
+ }
+}
+/* add &DbPAR= and &System= to the links in DisplayArea div */
+/* skip for object files */
+function fixURL(module, system) {
+ var itemlink = document.getElementById("DisplayArea").getElementsByTagName("a");
+ var pSystem = (system === null) ? getSystem() : system;
+ var pAppl = (module === null) ? "WRITER" : module;
+ var n = itemlink.length;
+ for (var i = 0; i < n; i++) {
+ if (itemlink[i].getAttribute("class") != "objectfiles"){
+ setURLParam(itemlink[i], pSystem, pAppl);
+ };
+ }
+}
+//Set the params inside URL
+function setURLParam(itemlink, pSystem, pAppl) {
+ var href = itemlink.getAttribute("href");
+ if (href !== null) {
+ // skip external links
+ if (!href.startsWith("http")) {
+ // handle bookmark.
+ if (href.lastIndexOf('#') != -1) {
+ var postf = href.substring(href.lastIndexOf('#'), href.length);
+ var pref = href.substring(0, href.lastIndexOf('#'));
+ itemlink.setAttribute("href", pref + "?" + '&DbPAR=' + pAppl + '&System=' + pSystem + postf);
+ } else {
+ itemlink.setAttribute("href", href + "?" + '&DbPAR=' + pAppl + '&System=' + pSystem);
+ }
+ }
+ }
+}
+
+function getSystem() {
+ var system = "Unknown OS";
+ if (navigator.appVersion.indexOf("Win") != -1) system = "WIN";
+ if (navigator.appVersion.indexOf("Mac") != -1) system = "MAC";
+ if (navigator.appVersion.indexOf("X11") != -1) system = "UNIX";
+ if (navigator.appVersion.indexOf("Linux") != -1) system = "UNIX";
+ return system;
+}
+
+function getParameterByName(name, url) {
+ if (!url) {
+ url = window.location.href;
+ }
+ name = name.replace(/[\[\]]/g, "\\$&");
+ var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)");
+ var results = regex.exec(url);
+ if (!results) {
+ return null;
+ }
+ if (!results[2]) {
+ return '';
+ }
+ return decodeURIComponent(results[2].replace(/\+/g, " "));
+}
+/* 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 b96cb1948..34838a517 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -138,7 +138,7 @@
<link rel="shortcut icon" href="{$target}media/navigation/favicon.ico" />
<link type="text/css" href="{$target}normalize.css" rel="Stylesheet" />
<link type="text/css" href="{$target}default.css" rel="Stylesheet" />
- <script type="text/javascript" src="{$target}help.js"></script>
+ <script type="text/javascript" src="{$target}help2.js"></script>
<script type="text/javascript" src="{$target}fuse.js"></script>
<script type="text/javascript" src="{$target}paginathing.js"></script>
<meta name="viewport" content="width=device-width,initial-scale=1"/>
@@ -307,6 +307,7 @@
</div>
<script type="text/javascript" src="{$target}{$lang}/bookmarks.js"/>
<script type="text/javascript" src="{$target}{$lang}/contents.js"/>
+ <script type="text/javascript" src="{$target}help.js"/>
<xsl:choose>
<xsl:when test="$online">
<script type="text/javascript">
More information about the Libreoffice-commits
mailing list