Merge branch 'feature/notes' into develop

rowers/templates/help.html

@@ -128,7 +128,7 @@
     <p>
       <a href="/rowers/virtualevents">On-line challenges</a> are a
       fun way to test your boat speed and course line against other Rowsandall.com users
-      rowing on the same stretch of water or on the Concept2 ergometer. 
+      rowing on the same stretch of water or on the Concept2 ergometer.
     </p>
 
     <h2>Training Plan</h2>
@@ -155,7 +155,7 @@
     <p>
       The links in the menu on the left bring you to our blog, where we
       regularly publish how-to's and articles about new functionality, to
-      our Facebook group where you can discuss with other users, and to
+      our discussion group where you can discuss with other users, and to
       a contact page where you can learn how to contact the developers
       of this site.
     </p>

rowers/views/workoutviews.py

@@ -4836,9 +4836,6 @@ def workout_upload_api(request):
             dologging('debuglog.log','Time zone set to {zone}'.format(zone=w.timezone))
             w.save()
 
-
-
-
         if make_plot: # pragma: no cover
             res, jobid = uploads.make_plot(r,w,f1,f2,plottype,t)
         elif r.staticchartonupload != 'None': # pragma: no cover

templates/newbase.html

@@ -353,8 +353,8 @@
             <a href="https://analytics.rowsandall.com/">
               <i class="fab fa-wordpress-simple"></i>
             </a>&nbsp;
-            <a href="https://www.facebook.com/rowsandall">
+            <a href="https://rowing-data-analytics.mn.co/feed">
-              <i class="fab fa-facebook"></i>
+              <i class="fas fa-chart-network"></i>
             </a>&nbsp;
         </p>
         <p>
@@ -371,8 +371,8 @@
                 </a>
               </li>
               <li>
-                <a href="https://www.facebook.com/rowsandall">
+                <a href="https://rowing-data-analytics.mn.co/feed">
-                  Rowing Data Facebook Group</a>
+                  Rowing Data Discussion Group</a>
               </li>
               <li>
                 <a href="/rowers/physics/">Rowing Physics</a>