diff options
| author | Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> | 2019-03-10 10:57:34 +0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2019-03-10 19:22:22 +0100 |
| commit | 54e3236790baca8a55d0bea3b1dd3e8de5ec5dd5 (patch) | |
| tree | 09b8aac4732136f114a20b3304154eb4d384d9a7 /help3xsl/online_transform.xsl | |
| parent | tdf#53524 (compl) Minor tweaks in Help page. (diff) | |
| download | help-54e3236790baca8a55d0bea3b1dd3e8de5ec5dd5.tar.gz help-54e3236790baca8a55d0bea3b1dd3e8de5ec5dd5.zip | |
Show module & lang navigation on mobile
Module & languages menus were not shown on screen widths < 960.
Changed module & languages menu background to span the whole
width, when on mobile.
An arrow function was used in help2.js, which means it was broken
on IE.
Moved all src .js files to head and used defer for all.
Moved inline Piwik & system info JS into help2.js and added a
test for onlineness targeting the first meta element in the body.
Change-Id: Ic1a928b53ce9029f9f655117977cd511b7e3246d
Reviewed-on: https://gerrit.libreoffice.org/69005
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'help3xsl/online_transform.xsl')
| -rw-r--r-- | help3xsl/online_transform.xsl | 67 |
1 files changed, 14 insertions, 53 deletions
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 02a669a56f..33a9537d34 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -145,21 +145,24 @@ <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org *.google.com *.googleapis.com"/> </xsl:if> <title><xsl:value-of select="$titleL10N"/></title> - <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" /> - <link type="text/css" href="{$target}prism.css" rel="Stylesheet" /> - <script type="text/javascript" src="{$target}help2.js"></script> - <script type="text/javascript" src="{$target}languages.js"></script> - <script type="text/javascript" src="{$target}{$lang}/langnames.js"></script> - <script type="text/javascript" src="{$target}fuzzysort.js"></script> - <script type="text/javascript" src="{$target}paginathing.js"></script> - <script type="text/javascript" src="{$target}prism.js"></script> + <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"/> + <link type="text/css" href="{$target}prism.css" rel="Stylesheet"/> + <script type="text/javascript" src="{$target}help2.js" defer=""/> + <script type="text/javascript" src="{$target}languages.js" defer=""/> + <script type="text/javascript" src="{$target}{$lang}/langnames.js" defer=""/> + <script type="text/javascript" src="{$target}fuzzysort.js" defer=""/> + <script type="text/javascript" src="{$target}paginathing.js" defer=""/> + <script type="text/javascript" src="{$target}prism.js" defer=""/> + <script type="text/javascript" src="{$target}{$lang}/bookmarks.js" defer=""/> + <script type="text/javascript" src="{$target}{$lang}/contents.js" defer=""/> + <script type="text/javascript" src="{$target}help.js" defer=""/> <meta name="viewport" content="width=device-width,initial-scale=1"/> </head> <body itemscope="true" itemtype="http://schema.org/TechArticle"> <xsl:if test="$online"> - <meta itemprop="version" content="{$productversion}"/> + <meta itemprop="version" content="{$productversion}"/><!-- This is used by help2.js to test, if we are online --> <meta itemprop="inLanguage" content="{$lang}"/> <meta itemprop="datePublished" content="2017"/> <meta itemprop="headline" content="{$titleL10N}"/> @@ -252,48 +255,6 @@ <p id="bm_HID"></p> </div> </footer> - <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"/> - <script type="text/javascript"> - <![CDATA[ - var module = getParameterByName("DbPAR"); - var helpID = getParameterByName("HID"); - ]]> - <xsl:choose> - <xsl:when test="$online"><![CDATA[var system = getParameterByName("System");]]></xsl:when> - <xsl:otherwise><![CDATA[var system = getSystem();]]></xsl:otherwise> - </xsl:choose> - <![CDATA[ - fixURL(module,system); - var dbg = getParameterByName("Debug"); - if (dbg == null){dbg=0} - 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; - document.getElementById("bm_HID").innerHTML ="HID is: "+helpID; - ]]> - </script> - <xsl:if test="$online"> - <!-- Piwik --> - <script type="text/javascript"> - <![CDATA[ - var _paq = _paq || []; - /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ - _paq.push(['disableCookies']); - _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 --> - </xsl:if> </body> </html> </xsl:template> |