Merge branch 'devel' into integration

Jürgen Knödlseder
2 parents 2b81bfad c05e64e1
Showing 5 changed files with 22 additions and 2 deletions
doc/Doxyfile
doc/source/_themes/sphinx13/ga.html
doc/source/_themes/sphinx13/gtm.html
doc/source/_themes/sphinx13/layout.html
doc/source/conf.py
@@ -32,7 +32,7 @@ PROJECT_NAME           = ctools
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
  
-PROJECT_NUMBER         = 1.1.0dev
+PROJECT_NUMBER         = 1.1.0.dev1
  
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-27448879-1', 'auto');
+  ga('send', 'pageview');
+
+</script>
+<!-- Google Tag Manager -->
+<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-5JKNCP"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-5JKNCP');</script>
+<!-- End Google Tag Manager -->
@@ -65,6 +65,7 @@
 {% endblock %}
  
 {% block header %}
+{% include "gtm.html" %}
 <div class="pageheader">
   <ul>
     <li><a href="{{ pathto('about') }}">About</a></li>
@@ -69,7 +69,7 @@ copyright = u&#39;2014-2016, ctools developers&#39;
 version = '1.1'
  
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0dev'
+release = '1.1.0.dev1'
  
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.