Skip to content

Commit

Permalink
Merge pull request #64 from eea/100969_matomo_tracking_code
Browse files Browse the repository at this point in the history 
Updated fetch Eionet footer command refs #100969
  • Loading branch information
@melish
melish authored Jan 3, 2019
2 parents 209d43a + e19852f commit 774f065
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 69 deletions.
4 changes: 4 additions & 0 deletions gemet/thesaurus/management/commands/fetchtemplates.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ def prepare_html(html):
breadcrumbs_old = '<div class="breadcrumbitemlast">' + \
'Eionet</div>'
html = html.replace(breadcrumbs_old, breadcrumbs)
# Replace site id for Matomo
tracking_old = '_paq.push([\'setSiteId\', \'2\'])'
tracking_new = '_paq.push([\'setSiteId\', \'38\'])'
html = html.replace(tracking_old, tracking_new)
return html


Expand Down
33 changes: 20 additions & 13 deletions gemet/thesaurus/templates/zope/footer_cached.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,39 @@
<div id="pagefoot">
<p>
Document last modified:
2017/08/29
2018/12/09
.
Content in this portal is modified daily by a community of providers.
</p>
<p>
<a href="http://www.eionet.europa.eu/disclaimer">Disclaimer</a>.
<a href="http://www.eionet.europa.eu/disclaimer">Disclaimer</a> | <a href="http://www.eionet.europa.eu/gdpr">Privacy statement</a> |
Copyright: <a rel="license"
href="http://creativecommons.org/licenses/by/2.5/dk/deed.en_GB"
title="Creative Commons Attribution License">
<img alt="Creative Commons Attribution License"
src="https://i.creativecommons.org/l/by/2.5/dk/80x15.png" /></a>
</p>
</div>
<script type="text/javascript">

var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-49448622-1']);
_gaq.push (['_gat._anonymizeIp']);
_gaq.push(['_trackPageview']);

<!-- Matomo -->
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
_paq.push(["setCookieDomain", "*.eionet.europa.eu"]);
_paq.push(["setDomains", ["*.eionet.europa.eu"]]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
var u="//matomo.eea.europa.eu/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '38']);
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>
<noscript><p><img src="http://www.eionet.europa.eu//matomo.eea.europa.eu/piwik.php?idsite=2&amp;rec=1" style="border:0;" alt="" /></p></noscript>
<!-- End Matomo Code -->

</body>
</html>
</html>
114 changes: 60 additions & 54 deletions gemet/thesaurus/templates/zope/header_after_login_cached.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<a id="printlink" title="Print this page" href="javascript:this.print();"><span>Print</span></a>
<a id="fullscreenlink" href="javascript:toggleFullScreenMode()" title="Switch to/from full screen mode"><span>Switch to/from full screen mode</span></a>
<a id="acronymlink" href="http://www.eionet.europa.eu/acronyms" title="Look up acronyms"><span>Acronyms</span></a>
<a id="rsslink" type="application/rss+xml" href="http://www.eionet.europa.eu/announcements.rdf" title="Eionet headlines as RSS"><span>RSS</span></a>

<form action="https://www.google.com/cse" id="cse-search-box">
Expand All @@ -14,6 +13,8 @@
<input id="freesrchbtn" type="image" src="https://www.eionet.europa.eu/styles/eionet2007/button_go.gif" alt="Go"/>
</div>
</form>
<a id="eionetlink" title="Go to Eionet portal" href="https://www.eionet.europa.eu/"><span>Eionet portal</span></a>

</div>
</div> <!-- toolribbon -->
<div id="pagehead">
Expand All @@ -23,61 +24,66 @@
<div id="sitetagline">Networking improving Europe's environment</div>
</div>
<div id="menuribbon">
<!-- Last updated: 2017-04-19T06:53:55Z
To update download http://www.eionet.europa.eu/dropdownmenus.txt -->
<!-- Last updated: 2018-12-29T18:01:37Z
To update download https://www.eionet.europa.eu/dropdownmenus.txt -->
<ul id="dropdowns">
<li><a href="http://www.eionet.europa.eu/menuservices">Services</a>
<li><a href="https://www.eionet.europa.eu/menuforum">Workspace</a>
<ul>
<li><a href="http://www.eionet.europa.eu/helpdesk">Helpdesk</a></li>
<li><a href="https://forum.eionet.europa.eu/">Forum</a></li>
<li><a href="https://forum.eionet.europa.eu/">Eionet Forum</a></li>
<li><a href="https://projects.eionet.europa.eu/">Projects</a></li>
<li><a href="http://www.eionet.europa.eu/ldap-roles">Roles</a></li>
<li><a href="http://planner.eionet.europa.eu/">Workplan</a></li>
<li><a href="http://uns.eionet.europa.eu/">Subscriptions</a></li>
<li><a href="http://transfer.eionet.europa.eu/">Web Transfer</a></li>
<li><a href="http://www.eionet.europa.eu/networknews">News</a></li>
<li><a href="http://www.eionet.europa.eu/rolemails">NFP mails</a></li>
<li><a href="https://archives.eionet.europa.eu/">Archived IGs</a></li>
<li><a href="https://www.eionet.europa.eu/userdirectory">User Directory</a></li>
<li><a href="https://planner.eionet.europa.eu/">Eionet Planner 2014 - 2017</a></li>
<li><a href="https://eionetplanner.eionet.europa.eu/">Eionet Planner 2019 -</a></li>
<li><a href="https://www.eionet.europa.eu/rolemails">NFP mails</a></li>
<li><a href="https://transfer.eionet.europa.eu/">Transfer files</a></li>
<li><a href="https://uns.eionet.europa.eu/">Subscriptions</a></li>
</ul>
</li>
<li><a href="http://www.eionet.europa.eu/menureportnet">Reportnet</a>
<li><a href="https://www.eionet.europa.eu/menureportnet">Reportnet</a>
<ul>
<li><a href="http://cdr.eionet.europa.eu/">CDR Repository</a></li>
<li><a href="http://rod.eionet.europa.eu/">ROD Obligations</a></li>
<li><a href="http://dd.eionet.europa.eu/">Data Dictionary</a></li>
<li><a href="http://etcdd.eionet.europa.eu/">ETC Data Dictionary</a></li>
<li><a href="http://cr.eionet.europa.eu/">Content Registry</a></li>
<li><a href="http://converters.eionet.europa.eu/">Conversion service</a></li>
<li><a href="https://cdr.eionet.europa.eu/">CDR Repository</a></li>
<li><a href="https://rod.eionet.europa.eu/">ROD Obligations</a></li>
<li><a href="https://dd.eionet.europa.eu/">Data Dictionary</a></li>
<li><a href="https://cr.eionet.europa.eu/">Content Registry</a></li>
<li><a href="https://converters.eionet.europa.eu/">Conversion service</a></li>
<li><a href="https://mdr.eionet.europa.eu/">Mediterranean Data Repository</a></li>
<li><a href="https://bdr.eionet.europa.eu/">Business Data Repository</a></li>
<li><a href="http://papers.eionet.europa.eu/">AQ Plans &amp; Programmes reporting</a></li>
<li><a href="http://uwwtd.eionet.europa.eu/">UWWTD reporting</a></li>
<li><a href="https://papers.eionet.europa.eu/">AQ Plans &amp; Programmes reporting</a></li>
<li><a href="http://webforms.eionet.europa.eu/">Webforms</a></li>
<li><a href="http://www.eionet.europa.eu/reportnet">Reportnet Documents</a></li>
<li><a href="https://www.eionet.europa.eu/reportnet">Reportnet Documents</a></li>
</ul>
</li>
<li><a href="http://www.eionet.europa.eu/menutools">Tools</a>
<li><a href="https://www.eionet.europa.eu/menutoolsservices">Tools and services</a>
<ul>
<li><a href="http://www.eionet.europa.eu/gis/">GIS</a></li>
<li><a href="http://www.eionet.europa.eu/software/">Software</a></li>
<li><a href="https://svn.eionet.europa.eu/">SVN Repository</a></li>
<li><a href="https://taskman.eionet.europa.eu/">Task Management</a></li>
<li><a href="http://www.eionet.europa.eu/software/design">Design Guidelines</a></li>
<li><a href="http://www.eionet.europa.eu/software/swstandards">Standards</a></li>
<li><a href="http://ci.eionet.europa.eu/">Continuous Integration</a></li>
<li><a href="http://archiva.eionet.europa.eu/">Maven repository</a></li>
<li><a href="http://www.eionet.europa.eu/gemet">GEMET Thesaurus</a></li>
<li><a href="http://sparqlclient.eionet.europa.eu/">SPARQL client</a></li>
<li><a href="https://www.eionet.europa.eu/helpdesk">Helpdesk</a></li>
<li><a href="https://www.eionet.europa.eu/gis/">GIS</a></li>
<li><a href="https://www.eionet.europa.eu/gemet">GEMET Thesaurus</a></li>
<li><a href="https://aqportal.discomap.eea.europa.eu/">Air Quality Portal</a></li>
<li><a href="https://www.eionet.europa.eu/itdevelop">IT developers</a></li>
</ul>
</li>
<li><a href="http://www.eionet.europa.eu/menutopics">Topics (ETCs)</a>
<li><a href="https://www.eionet.europa.eu/menueionet">Countries</a>
<ul>
<li><a href="http://acm.eionet.europa.eu/">Air pollution and Climate Change mitigation</a></li>
<li><a href="http://bd.eionet.europa.eu/">Biological Diversity</a></li>
<li><a href="http://cca.eionet.europa.eu/">Climate Change impacts, vulnerability and Adaptation</a></li>
<li><a href="http://wmge.eionet.europa.eu/">ETC WMGE Waste and Material in Green Economy</a></li>
<li><a href="http://icm.eionet.europa.eu/">Inland, Coastal and Marine waters</a></li>
<li><a href="http://uls.eionet.europa.eu/">Urban, Land and Soil systems</a></li>
<li><a href="https://www.eionet.europa.eu/countries">Eionet countries</a></li>
<li><a href="https://www.eionet.europa.eu/dataflows">Eionet core dataflows</a></li>
<li><a href="https://www.eionet.europa.eu/seris">SERIS</a></li>
</ul>
</li>
<li><a href="https://www.eionet.europa.eu/menutopics">Topics (ETCs)</a>
<ul>
<li><a href="https://acm.eionet.europa.eu/">ETC/ACM (Air pollution and Climate Change mitigation)</a></li>
<li><a href="https://bd.eionet.europa.eu/">ETC/BD (Biological Diversity)</a></li>
<li><a href="https://cca.eionet.europa.eu/">ETC/CCA (Climate Change impacts, vulnerability and Adaptation)</a></li>
<li><a href="https://wmge.eionet.europa.eu/">ETC/WMGE (Waste and Material in Green Economy)</a></li>
<li><a href="https://icm.eionet.europa.eu/">ETC/ICM (Inland, Coastal and Marine waters)</a></li>
<li><a href="https://uls.eionet.europa.eu/">ETC/ULS (Urban, Land and Soil systems)</a></li>
<li><a href="http://eionet.europa.eu/ETC-2019/index_html">New ETCs 2019</a></li>
</ul>
</li>
<li><a href="https://www.eionet.europa.eu/menuabout/">About...</a>
<ul>
<li><a href="https://www.eionet.europa.eu/about/">About Eionet</a></li>
<li><a href="https://www.eionet.europa.eu/gdpr/">Data Protection Notice</a></li>
</ul>
</li>
</ul>
Expand All @@ -92,19 +98,19 @@

<div id="leftcolumn">
<div class="localnav">
<h2>Local navigation</h2>
<h2>Shortcuts</h2>
<ul>
<li><a href="https://forum.eionet.europa.eu/" title="Forum Homepage">Eionet Forum</a></li>
<li><a href="https://forum.eionet.europa.eu/nfp-eionet" title="NFP / Eionet Interest Group [Eionet login required]"> - - NFP/Eionet</a></li>
<li><a href="https://forum.eionet.europa.eu/eea-mb/" title="Management Board adn Bureau Interest group [Eionet login required]"> - - MB and Bureau</a></li>
<li><a href="https://forum.eionet.europa.eu/eea-sc/" title="Scientific Committee Interest group [Eionet login required]"> - - Scientific Committee</a></li>
<li><a href="https://forum.eionet.europa.eu/interest-groups?startswith=etc" title="All ETC Interest Groups"> - - ETC Forum groups</a></li>
<li><a href="https://forum.eionet.europa.eu/interest-groups?startswith=nrc" title="All NRC Interest Groups"> - - NRC Forum groups</a></li>
<li><a href="http://www.eionet.europa.eu/helpdesk/" title="Eionet Helpdesk">Helpdesk</a></li>
<li><a href="http://www.eionet.europa.eu/directory/" title="Eionet user directory">User directory</a></li>
<li><a href="http://www.eionet.europa.eu/ldap-roles/" title="Roles - Who is who">Roles</a></li>
<li><a href="http://www.eionet.europa.eu/ldap-organisations/" title="Oranisations">Organisations</a></li>
<li><a href="https://forum.eionet.europa.eu/nfp-eionet" title="NFP / Eionet Interest Group [Eionet login required]">NFP/Eionet IG</a></li>
<li><a href="http://www.eionet.europa.eu/rolemails" title="Mails to NFPs [Eionet login required]">Mails to NFPs</a></li>
<li><a href="https://forum.eionet.europa.eu/nrc-state-environment/seris/" title="Countries' state of the environment reports">SERIS</a></li>
<li><a href="http://planner.eionet.europa.eu/" title="Eionet workplan/planner">Workplan/planner</a></li>
<li><a href="http://www.eionet.europa.eu/events" title="Meetings and events">Meetings &amp; events</a></li>
<li><a href="http://www.eionet.europa.eu/dataflows" title="Overview of reporting status for core data flows">Core data flows</a></li>
<li><a href="http://www.eionet.europa.eu/aqportal" title="The Air Quality Portal">AQ Portal</a></li>
<li><a href="http://www.eionet.europa.eu/userdirectory/" title="Eionet User Directory">User Directory</a></li>
<li><a href="http://www.eionet.europa.eu/ldap-roles/" title="Roles - Who is who">- - Roles</a></li>
<li><a href="http://www.eionet.europa.eu/ldap-organisations/" title="Organisations">- - Organisations</a></li>
<li><a href="https://transfer.eionet.europa.eu/" title="Transfer files">Transfer files</a></li>
</ul>

</div>
Expand All @@ -122,8 +128,8 @@ <h2><label for="membername">Find a person</label></h2>
<h2>Account services</h2>
<ul>
<li>I have <a href="http://www.eionet.europa.eu/password-reset">lost my password</a></li>


</ul>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion gemet/thesaurus/templates/zope/header_before_login_cached.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<div id="lefttools">
<a id="skiplink" href="#workarea" accesskey="2"><span>Skip to content</span></a>
<a id="eealink" href="http://www.eea.europa.eu/">EEA</a>
<a id="ewlink" href="http://ew.eea.europa.eu/">EnviroWindows</a>
</div>
<div id="righttools">

2 changes: 1 addition & 1 deletion gemet/thesaurus/templates/zope/header_before_title_cached.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-gb">
<head>
Expand Down

0 comments on commit 774f065

Please sign in to comment.