diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2017-06-26 00:35:31 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@edx.srv.br> | 2017-06-26 05:38:08 +0200 |
| commit | b915986913b52910c342eb831351897868226c0d (patch) | |
| tree | bc059a785e58bfa80af50ee949f868bb2e317260 | |
| parent | 181b72469b27cc2f711525838463e98a0920161c (diff) | |
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 <olivier.hallot@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br>
| -rw-r--r-- | help3xsl/help.js | 6 | ||||
| -rw-r--r-- | help3xsl/online_transform.xsl | 27 |
2 files changed, 25 insertions, 8 deletions
diff --git a/help3xsl/help.js b/help3xsl/help.js index 982f4bc8e1..76ec59b53a 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<n; i++) {setURLParam(itemlink[i], pSystem, pAppl) @@ -60,7 +60,7 @@ function setURLParam (itemlink, pSystem, pAppl) { } // Set System change buttons function setSystemURLButton (module) { - if (module == null){module="SHARED"} + if (module == null){module="WRITER"} var button = document.getElementById("lin").getElementsByTagName("a"); setURLParam(button[0],'UNIX', module); button = document.getElementById("win").getElementsByTagName("a"); diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 9107c6ecd2..3d8f1736c3 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -117,14 +117,31 @@ <!--<base href="file:///home/tdf/git/core/helpcontent2/source/html/"/> --> <base href="/"/> <title><xsl:call-template name="brand"><xsl:with-param name="string"> - <xsl:value-of select="$title"/> - </xsl:with-param></xsl:call-template> + <xsl:value-of select="$title"/> + </xsl:with-param></xsl:call-template> </title> <link href="{$productversion}/default.css" rel="Stylesheet" type="text/css" /> <link href="{$productversion}/tabs.css" rel="Stylesheet" type="text/css" /> <link href="{$productversion}/tree.css" rel="Stylesheet" type="text/css" /> <script type="text/javascript" src="{$productversion}/jquery-3.1.1.min.js"></script> - <script type="text/javascript" src="{$productversion}/help.js"></script> + <script type="text/javascript" src="{$productversion}/help.js"></script> + <!-- Piwik --> + <script type="text/javascript"> + <![CDATA[ + var _paq = _paq || []; + /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="//piwik.documentfoundation.org/"; + _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setSiteId', '68']); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + })(); + ]]> + </script> + <!-- End Piwik Code --> <meta http-equiv="Content-type" content="text/html; charset=utf-8"/> </head> <body lang="{$lang}"> @@ -147,7 +164,7 @@ <ul id="bookmarkIMPRESS" hidden="true"></ul> <ul id="bookmarkMATH" hidden="true"></ul> <ul id="bookmarkBASE" hidden="true"></ul> - <ul id="bookmarkSHARED" hidden="true"></ul> + <ul id="bookmarkSHARED"></ul> <ul id="bookmarkBASIC" hidden="true"></ul> </div> </div> @@ -235,7 +252,7 @@ <li><a href="{$productversion}/{$lang}/text/sbasic/shared/main0601.html?DbPAR=BASIC">Basic</a></li> <li><a href="{$productversion}/{$lang}/text/smath/main0000.html?DbPAR=MATH">Math</a></li> <li><a href="{$productversion}/{$lang}/text/shared/explorer/database/main.html?DbPAR=BASE">Base</a></li> - <li><a href="{$productversion}/{$lang}/text/shared/guide/main.html?DbPAR=SHARED">Guide</a></li> + <!--<li><a href="{$productversion}/{$lang}/text/shared/guide/main.html?DbPAR=SHARED">Guide</a></li>--> </ul> </nav> </div> |