Merge branch 'bootstrap' into download-popup

README.rst

@@ -79,6 +79,12 @@ package names will usually add python- prefix) or using pip:
 
     pip install -r requirements-test.txt
 
+You might want to import some data to have at least some content on the website:
+
+.. code-block:: sh
+
+    ./manage.py loaddata pmaweb/fixtures/test_data.json
+
 Once you have all dependencies, you can start development server:
 
 .. code-block:: sh

pmaweb/templates/_security_contact.html

@@ -16,3 +16,9 @@
 uid                          phpMyAdmin Security Team <security@phpmyadmin.net>
 sub   4096R/5E4176FB497A31F7 2016-08-02
 </pre>
+
+<p>
+The key can be either obtained from the keyserver or is available in 
+<a href="https://files.phpmyadmin.net/phpmyadmin.keyring">phpMyAdmin keyring</a>
+available on our download server.
+</p>

pmaweb/templates/base.html

@@ -158,7 +158,7 @@ <h4>phpMyAdmin needs your continued support to grow and thrive</h4>
   (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');
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
   ga('create', 'UA-2718724-14', 'auto');
   ga('send', 'pageview');