[#1101] Small HTML code improvements

* Move Piwik code to the bottom of the page * Use protocol relative URL when including 3rd party libs
akvo · Feb 16, 2015 · a36eeb0 · a36eeb0
1 parent 4275784
commit a36eeb0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/akvo/templates/base.html b/akvo/templates/base.html
@@ -48,13 +48,10 @@
     <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700%7COpen+Sans:400,300,600,700,400italic,600italic,300italic%7CMontserrat:400,700%7CRaleway:400,500,600,700%7CDancing+Script:400,700" rel="stylesheet" type="text/css">
 
     {# CSS #}
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css">
     {% compressed_css 'rsr_v3_style' %}
     {% if stylesheet %}<link rel="stylesheet" href="{{MEDIA_URL}}{{stylesheet}}">{% endif %}
 
-    {# Piwik #}
-    {% tracking_code %}
-
     {% block head %}{% endblock head %}
 
     {% block head_js %}{% endblock %}
@@ -77,11 +74,11 @@
     </script>
 
     {# jQuery #}
-    <script src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
+    <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
 
     {# React #}
-    <script src="http://fb.me/react-0.10.0.js"></script>
+    <script src="//fb.me/react-0.10.0.js"></script>
 
     {% compressed_js 'rsr_v3_script' %}
     {% compressed_js 'rsr_v3_libraries' %}
@@ -94,5 +91,8 @@
         {% block jq %}{% endblock %}
      });
     </script>
+
+    {# Piwik #}
+    {% tracking_code %}
   </body>
 </html>
diff --git a/akvo/templates/widgets/base.html b/akvo/templates/widgets/base.html
@@ -7,10 +7,10 @@
   {% block style %}{% endblock style %}
   <link href='http://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
   <base target="_top" />
-  {#  Piwik #}
-  {% tracking_code %}
 </head>
 <body>
 {% block body %}{% endblock body %}
+{#  Piwik #}
+{% tracking_code %}
 </body>
-</html>
+</html>
diff --git a/akvo/templates/widgets/projects_map.html b/akvo/templates/widgets/projects_map.html
@@ -24,9 +24,6 @@
     #footer a img { border:none;}
   </style>
   <base target="_top" />
-  {#  Piwik #}
-  {% tracking_code %}
-
 </head>
 <body>
 {% projects_map projects widthpx heightpx state %}
@@ -35,5 +32,7 @@
       <img src="{{ STATIC_URL }}rsr/widgets/img/akvo-badge_small.png" width="60" height="18" alt="Akvo.org" />
     </a>
   </div>
+  {#  Piwik #}
+  {% tracking_code %}
 </body>
 </html>