diff options
| -rw-r--r-- | CustomTarget_html.mk | 8 | ||||
| -rw-r--r-- | Package_html_dynamic.mk | 1 | ||||
| -rw-r--r-- | help3xsl/help.html | 2 | ||||
| -rw-r--r-- | help3xsl/index.html | 2 | ||||
| -rw-r--r-- | help3xsl/index2.html | 2 | ||||
| -rw-r--r-- | help3xsl/online_transform.xsl | 5 | ||||
| -rw-r--r-- | help3xsl/tdf_matomo.js | 24 |
7 files changed, 5 insertions, 39 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index ac3f21956a..167c947d97 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/help3xsl,\ languages.js \ default.css \ help2.js \ - $(if $(HELP_ONLINE),tdf_matomo.js) \ $(foreach lang,$(gb_HELP_LANGS),\ $(lang)/bookmarks.js \ $(lang)/contents.js \ @@ -68,7 +67,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/xap_tpl : \ $(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp endef - + $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_xaptpl_dep,$(lang)))) $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/xap_tpl : \ @@ -332,9 +331,4 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/help2.js : \ $(BUILDDIR)/config_host.mk sed -e "s/%PRODUCTNAME/$(gb_PRODUCTNAME_JS)/g" $< > $@ -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/tdf_matomo.js : \ - $(SRCDIR)/helpcontent2/help3xsl/tdf_matomo.js - mkdir -p $(dir $@) - cp $(SRCDIR)/helpcontent2/help3xsl/tdf_matomo.js $@ - # vim: set noet sw=4 ts=4: diff --git a/Package_html_dynamic.mk b/Package_html_dynamic.mk index b7d3e8082f..6e23cf892e 100644 --- a/Package_html_dynamic.mk +++ b/Package_html_dynamic.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Package_add_files,helpcontent2_html_dynamic,$(LIBO_SHARE_HELP_F languages.js \ default.css \ help2.js \ - $(if $(HELP_ONLINE),tdf_matomo.js) \ )) # vim: set noet sw=4 ts=4: diff --git a/help3xsl/help.html b/help3xsl/help.html index 8ee3510cf6..eceed41a12 100644 --- a/help3xsl/help.html +++ b/help3xsl/help.html @@ -9,7 +9,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/> + <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'"/> </head> <body> <script type="text/javascript"> diff --git a/help3xsl/index.html b/help3xsl/index.html index 69d7ee6afc..fa04607c82 100644 --- a/help3xsl/index.html +++ b/help3xsl/index.html @@ -9,7 +9,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/> + <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'/> </head> <body> <script type="text/javascript"> diff --git a/help3xsl/index2.html b/help3xsl/index2.html index 2394c084e1..506eebd102 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -9,7 +9,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/> + <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'"/> <script type="text/javascript" src="polyfills.js"></script> <script type="text/javascript" src="hid2file.js"></script> <script type="text/javascript" src="languages.js"></script> diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index b2f7adde01..674f0fe635 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -152,7 +152,7 @@ <noscript><meta http-equiv="refresh" content="0; URL={$install}{$lang}/noscript.html"/></noscript> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <xsl:if test="$online"> - <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/> + <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'"/> </xsl:if> <title><xsl:value-of disable-output-escaping="yes" select="$titleL10N"/></title> <link rel="shortcut icon" href="media/navigation/favicon.ico"/> @@ -165,9 +165,6 @@ <script type="text/javascript" src="flexsearch.debug.js"></script> <script type="text/javascript" src="prism.js"></script> <script type="text/javascript" src="help2.js" defer=""></script> - <xsl:if test="$online"> - <script type="text/javascript" src="tdf_matomo.js" defer=""></script> - </xsl:if> <script type="text/javascript" src="a11y-toggle.js" defer=""></script> <script type="text/javascript" src="paginathing.js" defer=""></script> <script type="text/javascript" src="{$lang}/bookmarks.js" defer=""></script> diff --git a/help3xsl/tdf_matomo.js b/help3xsl/tdf_matomo.js deleted file mode 100644 index fb05d9e188..0000000000 --- a/help3xsl/tdf_matomo.js +++ /dev/null @@ -1,24 +0,0 @@ -/* -*- 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/. - */ -// Test, if we are online -if (document.body.getElementsByTagName('meta')) { - 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); - })(); -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |