Merge pull request #7755 from SvenDowideit/post-1.1.2-docs-update-1docs-1.1

Post 1.1.2 docs update 1

2 files changed, 10 insertions, 21 deletions

diff --git a/docs/theme/mkdocs/base.html b/docs/theme/mkdocs/base.html
index 2b2b9bcbcf..c825423f89 100644
--- a/docs/theme/mkdocs/base.html
+++ b/docs/theme/mkdocs/base.html
@@ -28,15 +28,15 @@
   <![endif]-->
   {% if config.google_analytics %}
   <script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '{{ config.google_analytics[0] }}']);
-  _gaq.push(['_trackPageview']);
-  _gaq.push(['_trackPageLoadTime']);
-  (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);
-  })();
+  (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','//www.google-analytics.com/analytics.js','ga');
+  ga('create', '{{ config.google_analytics[0] }}', 'docker.com');
+  ga('require', 'linkid', 'linkid.js');
+  ga('send', 'pageview', {
+   'page': location.pathname + location.search  + location.hash,
+  });
   </script>
   {% endif %}
 </head>
@@ -132,17 +132,6 @@ piCId = '1482';
 })();
 </script>
 <script type="text/javascript">
-  // Function to make the sticky header possible
-  var shiftWindow = function() {
-    scrollBy(0, -80);
-  };
-
-  window.addEventListener("hashchange", shiftWindow);
-  $(window).load(function() {
-    if (window.location.hash) {
-      shiftWindow();
-    }
-  });
   $(document).ready(function() {
     $('#content').css("min-height", $(window).height() - 553 );
     // load the complete versions list
diff --git a/docs/theme/mkdocs/footer.html b/docs/theme/mkdocs/footer.html
index 0b887b82d0..ba48c9bb13 100644
--- a/docs/theme/mkdocs/footer.html
+++ b/docs/theme/mkdocs/footer.html
@@ -56,7 +56,7 @@
         <span class="footer-title">Connect</span>
         <div class="search">
           <span>Subscribe to our newsletter</span>
-          <form action="http://www.docker.com/subscribe_newsletter/" method="post">
+          <form action="https://www.docker.com/subscribe_newsletter/" method="post">
             <input type='hidden' name='csrfmiddlewaretoken' value='aWL78QXQkY8DSKNYh6cl08p5eTLl7sOa' />
             <tr><th><label for="id_email">Email:</label></th><td><input class="form-control" id="id_email" name="email" placeholder="Enter your email" type="text" /></td></tr>