Merge branch 'release/v9.91' into develop

rowers/templates/landingpage.html

@@ -204,7 +204,14 @@
     
     <div style="position:relative;">
       <div style="color:#ddd;background-color:#282E34;text-align:center;padding:50px 80px;text-align: justify;">
+	<h2>Testimonials</h2>
 	<p>"Check out @rowsandall as well - his site is really useful for dissecting rowing data, especially if you eventually get power/angles on the water - check out the articles in the blog - if you’re logging your ergs on C2logbook you can have a play dissecting the data" - Tom Carter</p>
+	<p>"Sander has made amazing tools for self-coaching or working with a coach."</p>
+
+	<p>“I just wanted to say that I absolutely love this website. I‘ve been
+using my NK empower oarlock for about a month now, and I‘m really
+	  excited to be able to better visualize my data.”</p>
+	<p> “I discovered rowsandall.com – which is brilliant.”</p>
       </div>
     </div>
     
@@ -218,13 +225,30 @@
     
     <div style="position:relative;">
       <div style="color:#ddd;background-color:#282E34;text-align:center;padding:50px 80px;text-align: justify;">
-        <h2>Potentially to be replaced with log/race/plan/analyze/sync from old landing page</h2>
+        <h1>What we offer</h1>
-        <ul>
+
-          <li>Commit to a goal</li>
+	<h2>Plan.</h2>
-          <li>Plan your training</li>
+	<p>We offer a fully integrated way for you or your coach to set up the goal you commit to, plan to
-          <li>Track your execution and progress</li>
+	  achieve it, and monitor plan versus execution based on time, distance, heart rate or power.</p>
-          <li>Monitor key rowing technique metrics</li>
+
-        </ul>
+	<h2>Sync</h2>
+	<p>Maintain a consistent log for all your rowing (indoor and on the water) and sync your workouts
+	  to popular tools as the Concept2 logbook, Strava, TrainingPeaks, SportTracks and others.</p>
+
+	<h2>Analyze</h2>
+	<p>Analyze your workouts with a consistent set of tools, developed by rowers for rowers.</p>
+
+	<h2>Compare</h2>
+	<p>Compare youre results between workouts and with other rowers in your team.</p>
+
+	<h2>Race</h2>
+	<p>Virtual regattas are an informal way to add a competitive element to your training
+	  and can be used as a quick way to set up small regattas</p>
+
+	<h2>Coaching</h2>
+	<p>Rowsandall.com is the ideal platform for remote rowing coaching. As a coach, you can
+	  easily manage your athletes, set up plans and monitor execution and technique</p>
+	
       </div>
     </div>
     
@@ -250,7 +274,6 @@
     <footer class="main-footer">
       <ul>
         <li>
-          <h1>Help</h1>
           <ul>
             <li>
               <a href="/rowers/help/">Help</a>
@@ -267,7 +290,6 @@
           </ul>
         </li>
         <li>
-          <h1>About</h1>
             <ul>
               <li>
                 <a href="/rowers/email/">Contact</a>
@@ -281,7 +303,6 @@
             </ul>
         </li>
         <li>
-          <h1>Paid Plans</h1>
           <ul>
             <li>
               <a href="/rowers/paidplans/">Paid Plans</a>
@@ -289,7 +310,6 @@
           </ul>
         </li>
         <li>
-          <h1>Legal</h1>
           <ul>
             <li>
               <a href="/rowers/legal/">Terms and Conditions</a>

rowsandall_app/urls.py

@@ -54,7 +54,7 @@ urlpatterns += [
     re_path(r'^admin/', admin.site.urls),
     re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
     re_path(r'^$',rootview),
-    re_path(r'^landing$',landingview),
+    re_path(r'^landing/$',landingview),
     re_path(r'^getblogs/$',rowersviews.get_blog_posts),
     re_path(r'^login/',
 #            auth_views.LoginView,