From 717fdeca03ad589b2f570deb7bfa0ce1de853641 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 18 Oct 2018 07:44:22 +0200
Subject: [PATCH 1/3] bug fix

---
 rowers/templates/menu_analytics.html |  2 +-
 rowers/templates/menu_workout.html   |  2 +-
 rowers/views.py                      | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html
index cfcfa152..6d92023e 100644
--- a/rowers/templates/menu_analytics.html
+++ b/rowers/templates/menu_analytics.html
@@ -23,7 +23,7 @@
         </a>
       </li>
       <li id="fitness-powerprogress">
-        <a href="/rowers/fitnessprogress/">
+        <a href="/rowers/fitness-progress/">
           <i class="far fa-watch-fitness fa-fw"></i>&nbsp;Power Progress
         </a>
       </li>
diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html
index 5164c65f..7eb43a97 100644
--- a/rowers/templates/menu_workout.html
+++ b/rowers/templates/menu_workout.html
@@ -2,7 +2,7 @@
 <h1>Workout</h1>
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="workout">
-    <input type="checkbox" name="group-workout" id="group-workout">
+    <input type="checkbox" name="group-workout" id="group-workout" checked>
     <label for="group-workout">Workout</label>
     <ul>
       <li id="workout-dashboard">
diff --git a/rowers/views.py b/rowers/views.py
index 8a7d3440..f3342eb2 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -4002,11 +4002,14 @@ def rankings_view2(request,theuser=0,
 	velo = d/t
 	p = 500./velo
 	pwr = 2.8*(velo**3)
-	a = {'distance':int(d),
-	     'duration':timedeltaconv(t),
-	     'pace':timedeltaconv(p),
-	     'power':int(pwr)}
-	predictions.append(a)
+        try:
+	    a = {'distance':int(d),
+	         'duration':timedeltaconv(t),
+	         'pace':timedeltaconv(p),
+	         'power':int(pwr)}
+	    predictions.append(a)
+        except:
+            pass
 
 	# CP model
 	pwr = p1[0]/(1+t/p1[2])

From b415846a98f6628a8e2bf58414e51397c137ca12 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 18 Oct 2018 08:20:23 +0200
Subject: [PATCH 2/3] removed padding on right front page

---
 rowers/templates/frontpage.html | 12 +++++++-----
 static/css/frontstyles.css      |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html
index f12f6778..d97447a7 100644
--- a/rowers/templates/frontpage.html
+++ b/rowers/templates/frontpage.html
@@ -21,9 +21,11 @@
   <li>
     &nbsp;
   </li>
-  <li class="rounder whiteborder">
+  <li>
     <a class="button midden" href="/rowers/register">
-      <h1 class="midden">SIGN UP FREE</h1>
+      <h1 class="midden">
+        <div class="rounder whiteborder">SIGN UP FREE</div>
+      </h1>
     </a>
   </li>
   <li>
@@ -112,9 +114,9 @@
   <li>
     &nbsp;
   </li>
-  <li class="rounder whiteborder">
-    <a class="button midden" href="/rowers/features">
-      <h2 class="midden">VIEW ALL</h2>
+  <li>
+    <a class="button midden" href="">
+      <h2 class="midden"><div class="rounder whiteborder">and more</div></h2>
     </a>
   </li>
   <li>
diff --git a/static/css/frontstyles.css b/static/css/frontstyles.css
index f41aaf4c..ff7c6da8 100644
--- a/static/css/frontstyles.css
+++ b/static/css/frontstyles.css
@@ -11,7 +11,6 @@
     .wrapper > * {
         /*    border: 2px solid #f08c00; */
         border 0;
-         padding: 5px;  
     }
 
     .wrapper nav {

From e990a17cce38f7faf7f13a5aeeaca43770f59207 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 18 Oct 2018 08:46:12 +0200
Subject: [PATCH 3/3] using grid better on front page

---
 rowers/templates/frontpage.html          | 111 ++++++++++-------------
 rowers/templates/registration/login.html |  64 +++++++------
 static/css/rowsandall2.css               |   8 ++
 3 files changed, 90 insertions(+), 93 deletions(-)

diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html
index d97447a7..e4e3f7f6 100644
--- a/rowers/templates/frontpage.html
+++ b/rowers/templates/frontpage.html
@@ -14,51 +14,6 @@
       <h2 class="midden">For Rowers. By Rowers.</h2>
     </p>
   </li>
-    {% if user.is_anonymous %}
-  <li>
-    &nbsp;
-  </li>
-  <li>
-    &nbsp;
-  </li>
-  <li>
-    <a class="button midden" href="/rowers/register">
-      <h1 class="midden">
-        <div class="rounder whiteborder">SIGN UP FREE</div>
-      </h1>
-    </a>
-  </li>
-  <li>
-    &nbsp;
-  </li>
-  <li>
-    &nbsp;
-  </li>
-  <li>
-    &nbsp;
-  </li>
-  <li>
-    &nbsp;
-  </li>
-  <li class="rounder whiteborder">
-    <form  id="idLogInForm" method="post" action="{% url 'login' %}" class="loginForm">{% csrf_token %}
-    <a class="button midden" href="/rowers/register">
-      <h2 class="midden">Sign In</h2></a>
-      {{ form.as_p }}
-      <button class="midden button white"
-              id="idLogInSubmit"
-              name="idLogInSubmit"
-              type="submit">Login
-      </button>
-  </form>  
-  </li>
-  <li>
-    &nbsp;
-  </li>
-  <li>
-    &nbsp;
-  </li>
-  {% endif %}
   <li class="grid_5">
     <p class="midden">There is no shortage of training advice for rowers.</p>
 
@@ -69,10 +24,49 @@
       you are, set objectives, make a plan, track progress,
       and adjust based on the results you are getting.
     </p>
-    <h2 class="midden">WHAT WE OFFER</h2>
+
+    <p class="midden">This site is more than a rowing log book. It enables you
+      and your coach
+      to plan and track all your rowing, indoor and on the water, with a large
+      number of devices and apps. On top of that, it offers the best in
+      rowing data analytics. Train smart.
   </li>
+  <li class="grid_5">
+    <div class="midden">
+      <img src="/static/img/horizontal_line.png"
+           alt="horizontal line">
+    </div>
+  </li>
+    {% if user.is_anonymous %}
   <li>
-    &nbsp;
+    <a class="button midden" href="/rowers/register">
+      <h1 class="midden">
+        <div class="rounder whiteborder">SIGN UP FREE</div>
+      </h1>
+    </a>
+  </li>
+  <li class="rounder whiteborder">
+    <form  id="idLogInForm" method="post" action="{% url 'login' %}" class="loginForm">{% csrf_token %}
+    <a class="button midden" href="/rowers/register">
+      <h2 class="midden">Sign In</h2></a>
+      <a href="/password_reset/">Forgot password?</a>
+      {{ form.as_p }}
+      <button class="midden button white"
+              id="idLogInSubmit"
+              name="idLogInSubmit"
+              type="submit">Login
+      </button>
+    </form>  
+  </li>
+  <li class="grid_5">
+    <div class="midden">
+      <img src="/static/img/horizontal_line.png"
+           alt="horizontal line">
+    </div>
+  </li>
+  {% endif %}
+  <li class="grid_5">
+    <h2 class="midden">WHAT WE OFFER</h2>
   </li>
   <li class="frontitem">
     <h3 class="midden">LOG</h3>
@@ -105,15 +99,6 @@
       Compare your results between workouts and with other rowers in your team
     </p>
   </li>
-  <li>
-    &nbsp;
-  </li>
-  <li>
-    &nbsp;
-  </li>
-  <li>
-    &nbsp;
-  </li>
   <li>
     <a class="button midden" href="">
       <h2 class="midden"><div class="rounder whiteborder">and more</div></h2>
@@ -131,15 +116,15 @@
            alt="horizontal line">
       </div>
   </li>    
-  <li class="grid_5">
-    <p class="midden">
-      <a class="twitter-follow-button"
-         href="https://twitter.com/rowsandall">
-        Follow @rowsandall</a>
-    </p>
-  </li>
 </ul>
 
+<p class="midden">
+  <a class="twitter-follow-button"
+     href="https://twitter.com/rowsandall">
+    Follow @rowsandall</a>
+</p>
+
+
 <p class="midden">
   Local Time: {% now "jS F Y H:i" %}
 </p>
diff --git a/rowers/templates/registration/login.html b/rowers/templates/registration/login.html
index 4b4a1698..354a5918 100644
--- a/rowers/templates/registration/login.html
+++ b/rowers/templates/registration/login.html
@@ -1,39 +1,43 @@
-{% extends "basefront.html" %}
+{% extends "newbasefront.html" %}
 
-{% block content %}
+{% block main %}
 
 {% if form.errors %}
 <p>Your username and password didn't match. Please try again.</p>
 {% endif %}
 
-<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
-{% csrf_token %}
-<table>
-<tr>
-    <td>{{ form.username.label_tag }}</td>
-    <td>{{ form.username }}</td>
-</tr>
-<tr>
-    <td>{{ form.password.label_tag }}</td>
-    <td>{{ form.password }}</td>
-</tr>
-<tr>
-  <td></td>
-  <td><a href="/password_reset/">Forgot password?</a></td>
-</tr>
-
-
-
-</table>
-
-<input type="submit" value="login" />
-<input type="hidden" name="next" value="{{ next }}" />
-</form>
-
-  <p class="midden"><a class="twitter-follow-button"
-       href="https://twitter.com/rowsandall">
-      Follow @rowsandall</a>
-  </p>
+<ul class="main-content">
+  <li class="frontitem">
+    <form method="post" action="{% url 'django.contrib.auth.views.login' %}">
+      {% csrf_token %}
+      <table>
+        <tr>
+          <td>{{ form.username.label_tag }}</td>
+          <td>{{ form.username }}</td>
+        </tr>
+        <tr>
+          <td>{{ form.password.label_tag }}</td>
+          <td>{{ form.password }}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td><a href="/password_reset/">Forgot password?</a></td>
+        </tr>
+        
+        
+        
+      </table>
+      
+      <input type="submit" value="login" />
+      <input type="hidden" name="next" value="{{ next }}" />
+    </form>
+  </li>
+</ul>
+    
+<p class="midden"><a class="twitter-follow-button"
+                     href="https://twitter.com/rowsandall">
+    Follow @rowsandall</a>
+</p>
 
 
 {% endblock %}
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index 358440c6..84c31376 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -288,6 +288,14 @@ th.rotate > div > span {
     color: black;
 }
 
+.frontitem label {
+    color: black;
+}
+
+.frontitem a {
+    color: #1c75bc;
+}
+
 .vignet {
     border-radius: 50%;
     display: block;