Merge branch 'develop' into feature/forcemanagement

rowers/interactiveplots.py

@@ -890,7 +890,7 @@ def leaflet_chart2(lat,lon,name=""):
           )
 
     div = """
-    <div id="map_canvas" style="width: 100%; height: 400px;"><p>&nbsp;</p></div>
+    <div id="map_canvas" style="width: 100%; height: 100%; min-height: 100vh"><p>&nbsp;</p></div>
     """
 
 

rowers/templates/map_view.html

@@ -29,14 +29,13 @@
 </script>
 <style>
   /* Need this to get the page in "desktop mode"; not having an infinite height.*/
-  html, body {height: 100%; margin:5px;}
+  html, body, #mymap {height: 100%; margin:5px;}
 </style>
 
 
 <div id="workouts" class="grid_12 alpha">
   
   
-  <h1>Map View</h1>
   
   {% if user.is_authenticated and mayedit %}
   <div class="grid_2 alpha">
@@ -52,7 +51,7 @@
   </div>
   {% endif %}
 </div>
-<div id="theplot" class="grid_12 alpha flexplot">
+<div style="height:100%;" id="theplot" class="grid_12 alpha flexplot">
   {{ mapdiv|safe }}
 
 

rowers/views.py

@@ -6439,6 +6439,10 @@ def workout_map_view(request,id=0):
         mapscript,mapdiv = leaflet_chart2(rowdata.df[' latitude'],
                                          rowdata.df[' longitude'],
                                          row.name)
+    else:
+        mapscript = ""
+        mapdiv = ""
+        
     mayedit=0
     if not request.user.is_anonymous():
 	r = getrower(request.user)