attempting to speed up

rowers/templates/course_edit_view.html

@@ -1,6 +1,13 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
+
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
+
 {% block scripts %}
 {% include "monitorjobs.html" %}
 {% endblock %}
@@ -8,6 +15,7 @@
 {% block title %}{{ course.name }} {% endblock %}
 {% block og_title %}{{ course.name }} {% endblock %}
 {% block main %}
+
 <h1>{{ course.name }}</h1>
 
 <ul class="main-content">

rowers/templates/course_replace.html

@@ -1,6 +1,13 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
+
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
+
 {% block scripts %}
 {% include "monitorjobs.html" %}
 {% endblock %}
@@ -8,6 +15,7 @@
 {% block title %}{{ course.name }} {% endblock %}
 {% block og_title %}{{ course.name }} {% endblock %}
 {% block main %}
+
 <h1>Replace {{ course.name }}</h1>
 
 <ul class="main-content">

rowers/templates/course_view.html

@@ -1,6 +1,13 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
+
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
+
 {% block scripts %}
 {% include "monitorjobs.html" %}
 {% endblock %}
@@ -8,6 +15,7 @@
 {% block title %}{{ course.name }} {% endblock %}
 {% block og_title %}{{ course.name }} {% endblock %}
 {% block main %}
+
 <h1>{{ course.name }}</h1>
 
 <ul class="main-content">

rowers/templates/coursemap.html

@@ -1,6 +1,13 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
+
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
+
 {% block scripts %}
 {% include "monitorjobs.html" %}
 {% endblock %}
@@ -8,6 +15,7 @@
 {% block title %}{{ course.name }} {% endblock %}
 {% block og_title %}{{ course.name }} {% endblock %}
 {% block main %}
+
 <h1>{{ course.name }}</h1>
 <div class="mapdiv">
   {{ mapdiv|safe }}

rowers/templates/list_workouts.html

@@ -59,10 +59,7 @@
 
 <ul class="main-content">
   <li class="grid_2" style="min-height:200px;">
-    <script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
+    <script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
-    <script async="true" type="text/javascript">
-      Bokeh.set_log_level("info");
-    </script>
     
     {{ interactiveplot |safe }}
     

rowers/templates/map_view.html

@@ -1,9 +1,15 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
 
 {% block title %}{{ workout.name }} {% endblock %}
 
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
+
 {% block main %}
 
 <script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>

rowers/templates/plannedsessionview.html

@@ -1,8 +1,11 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
 
 {% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
 {% endblock %}
 
 {% block title %}Planned Session{% endblock %}

rowers/templates/virtualevent.html

@@ -1,6 +1,12 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
+
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
 
 {% block title %}Rowsandall Virtual Race{% endblock %}
 

rowers/templates/virtualeventranking.html

@@ -1,6 +1,12 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
+
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
 
 {% block title %}Rowsandall Virtual Race{% endblock %}
 

rowers/templates/workout_form.html

@@ -1,6 +1,12 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
+
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
 {% load tz %}
 
 

rowers/templates/workout_view.html

@@ -1,6 +1,13 @@
 {% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% load leaflet_tags %}
+
+{% block meta %}
+{% leaflet_js %}
+{% leaflet_css %}
+{% endblock %}
+
 {% block scripts %}
 {% include "monitorjobs.html" %}
 {% endblock %}

rowsandall_app/settings.py

@@ -84,7 +84,7 @@ MIDDLEWARE = [
     'django.middleware.common.CommonMiddleware',
     'django.middleware.common.BrokenLinkEmailsMiddleware',
     'django.middleware.gzip.GZipMiddleware',
-#    'htmlmin.middleware.HtmlMinifyMiddleware',
+    'htmlmin.middleware.HtmlMinifyMiddleware',
 #    'htmlmin.middleware.MarkRequestMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.security.SecurityMiddleware',
@@ -103,7 +103,7 @@ MIDDLEWARE = [
 ]
 
 ROOT_URLCONF = 'rowsandall_app.urls'
-#HTML_MINIFY = True
+HTML_MINIFY = True
 
 #EXCLUDE_FROM_MINIFYING = ('^rowers/flexall',
 #                          '^rowers/list-workouts',

templates/newbase.html

@@ -10,23 +10,6 @@
 <html>
   <head>
     <title>{% block title %}Rowsandall Rowing Data Analytics{% endblock %}</title>
-    {% block scripts %} {% endblock %}
-
-    <script type="text/javascript" src="/jsi18n/"></script>
-    <script type="text/javascript" src="/static/admin/js/core.js"></script>
-    <script type="text/javascript" src="/static/admin/js/jquery.min.js"></script>
-    <script type="text/javascript" src="/static/admin/js/jquery.init.js"></script>
-    <script type="text/javascript" src="/static/admin/js/admin/RelatedObjectLookups.js">
-    </script>
-    <script type="text/javascript" src="/static/admin/js/calendar.js"></script>
-    <script type="text/javascript" src="/static/admin/js/urlify.js"></script>
-    <script type="text/javascript" src="/static/admin/js/prepopulate.js"></script>
-    <script type="text/javascript" src="/static/admin/js/vendor/xregexp/xregexp.min.js"></script>
-    <script type="text/javascript" src="/static/admin/js/SelectBox.js"></script>
-    <script type="text/javascript" src="/static/admin/js/SelectFilter2.js"></script>
-    <script type="text/javascript" src="/static/admin/js/admin/DateTimeShortcuts.js"></script>
-    <script type="text/javascript" src="/static/admin/js/inlines.js"></script>
-    <script src="/static/cookielaw/js/cookielaw.js"></script>
     {% analytical_head_top %}
 
     <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
@@ -58,14 +41,12 @@
     <link rel="stylesheet" type="text/css" href="/static/admin/css/widgets.css"/>
 
     <link rel="stylesheet" href="/static/css/resetnew.css" />
-    <link rel="stylesheet" href="/static/fontawesome/css/fontawesome.css">
+    <link rel="stylesheet" href="/static/fontawesome/css/fontawesome.min.css">
-    <link rel="stylesheet" href="/static/fontawesome/css/all.css">
+    <link rel="stylesheet" href="/static/fontawesome/css/all.min.css">
     <link rel="stylesheet" href="/static/css/styles2.css">
     <link rel="stylesheet" href="/static/css/text2.css" />
     <link rel="stylesheet" href="/static/css/rowsandall2.css" />
     {% block meta %} {% endblock %}
-    {% leaflet_js %}
-    {% leaflet_css %}
     <div id="fb-root"></div>
     <script>(function(d, s, id) {
       var js, fjs = d.getElementsByTagName(s)[0];
@@ -95,16 +76,22 @@
       return t;
       }(document, "script", "twitter-wjs"));</script>
 
-    <script type='text/javascript'
+    <script id="script-batch" type="text/javascript">
-            src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+      (function(d){
+          var js = d.createElement('script'); js.async = true; js.defer = true;
+            js.src = "https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js";
+            d.getElementsByTagName('head')[0].appendChild(js);
+      }(document));
     </script>
-    <script
+
+
+    <script defer
       type="text/javascript"
-      async defer
       src="//assets.pinterest.com/js/pinit.js"
       >
     </script>
     <script>
+      window.addEventListener('DOMContentLoaded', function() {
 	  $(document).ready(function(){
 	      var accordionsMenu = $('.cd-accordion-menu');
     
@@ -120,14 +107,17 @@
 		      });
 		  });
 	      }
-});
+	  });
+      });
 
     </script>
     <script>
+      window.addEventListener('DOMContentLoaded', function() {
 	  $(document).ready(function(){
 	      var active = "#{{ active }}";
 	      $(active).addClass("nav-active");
 	  });
+      });
     </script>
     {% analytical_head_bottom %}
   </head>
@@ -312,7 +302,7 @@
       
       <ad class="ad">
         {% if request|announcements %}
-        <h1>What's New?</h1>
+        <h1>News</h1>
         {% for a in request|announcements %}
         <div class="site-announcement-box">
           <div class="site-announcement-white">
@@ -421,21 +411,36 @@
   </body>
 </html>
 
-<script
+    {% block scripts %} {% endblock %}
-  type='text/javascript'
+
-  src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+    <script defer type="text/javascript" src="/jsi18n/"></script>
-</script>
+    <script defer type="text/javascript" src="/static/admin/js/core.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/jquery.min.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/jquery.init.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/admin/RelatedObjectLookups.js">
+    </script>
+    <script defer type="text/javascript" src="/static/admin/js/calendar.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/urlify.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/prepopulate.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/vendor/xregexp/xregexp.min.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/SelectBox.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/SelectFilter2.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/admin/DateTimeShortcuts.js"></script>
+    <script defer type="text/javascript" src="/static/admin/js/inlines.js"></script>
+    <script src="/static/cookielaw/js/cookielaw.js"></script>
+
+
 <script>
+      window.addEventListener('DOMContentLoaded', function() {
 	  $(function() {
 	      $("#id-logout").click( function() {
 		  localStorage.clear();
 		  console.log('cleared storage');
 	      });
 	  });
+      });
 </script>
-<script type='text/javascript'
+
-        src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
-</script>
 
 <script>
 $( document ).ready(function() {