From a744aac3324cb960b19859a4962472b96b6de005 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 17 Oct 2018 20:32:41 +0200
Subject: [PATCH 1/5] bug fix

---
 rowers/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rowers/models.py b/rowers/models.py
index cbc298ef..ffdb668e 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1200,7 +1200,8 @@ def createmicrofillers(plan):
         plan = plan
         ).order_by("startdate")
 
-    if cycles[0].startdate > plan.startdate:
+    
+    if cycles and cycles[0].startdate > plan.startdate:
         macr = TrainingMicroCycle(
             plan=plan,
             startdate = plan.startdate,

From e764daeee1061c1ccbfb0be555989ec1fc5373b4 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 17 Oct 2018 20:58:02 +0200
Subject: [PATCH 2/5] fixes

---
 rowers/templates/menu_workout.html | 10 +++++-----
 rowers/templates/summary_edit.html | 32 ++++++++++++++++++++++++++++++
 rowers/views.py                    |  6 +++++-
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html
index 01a2f1d8..5164c65f 100644
--- a/rowers/templates/menu_workout.html
+++ b/rowers/templates/menu_workout.html
@@ -49,6 +49,11 @@
         </li>
         -->
       {% if user.is_authenticated and workout|may_edit:request %}
+      <li id="chart-image">
+        <a href="/rowers/workout/{{ workout.id }}/image">
+          <i class="fas fa-file-image fa-fw"></i>&nbsp;Upload Image
+        </a>
+      </li>
       <li id="workout-delete">
         <a href="/rowers/workout/{{ workout.id }}/delete">
           <i class="fas fa-trash-alt fa-fw"></i>&nbsp;Delete
@@ -117,11 +122,6 @@
         </a>
       </li>
       {% endif %}
-      <li id="chart-image">
-        <a href="/rowers/workout/{{ workout.id }}/image">
-          <i class="fas fa-file-image fa-fw"></i>&nbsp;Upload Image
-        </a>
-      </li>
     </ul>
   </li>
   <li class="has-children" id="export">
diff --git a/rowers/templates/summary_edit.html b/rowers/templates/summary_edit.html
index d4de5063..62957cca 100644
--- a/rowers/templates/summary_edit.html
+++ b/rowers/templates/summary_edit.html
@@ -87,6 +87,38 @@
       </pre>
     </p>
   </li>
+  <li class="grid_2">
+    <h1>Detailed Summary Edit</h1>
+    <p>This is still experimental and there are known bugs. Use at your own risk. Nothing is stored permanently until you hit Save on the summary above. You can use the restore original button to restore the original values.</p>
+    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals" method="post">
+      <table width=100%> 
+        <thead>
+          <tr>
+            <th>#</th><th>Time</th><th>Distance</th><th>Type</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for i in nrintervals|times %}
+          <tr>
+            <td>{{ i }}&nbsp;</td>
+	    <td>
+	      {% get_field_id i "intervalt_" detailform %}
+	    </td>
+	    <td>
+	      {% get_field_id i "intervald_" detailform %}
+	    </td>
+	    <td>
+	      {% get_field_id i "type_" detailform %}
+	    </td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+      {% csrf_token %}
+      <input type="hidden" name="nrintervals" value={{ nrintervals }}>
+      <input class="button green" type="submit" value="Update">
+    </form>
+  </li>
   <li class="grid_4">
     <h1 id="howto">Interval Shorthand How-To</h1>
     <p>This is a quick way to enter the intervals using a special mini-language.</p>
diff --git a/rowers/views.py b/rowers/views.py
index 0b761670..8a7d3440 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -11961,7 +11961,11 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 	rowdata.updateintervaldata(ivalues,iunits,itypes,iresults=iresults)
 	intervalstats = rowdata.allstats()
 	row.summary = intervalstats
-	row.notes += "\n"+s
+	try:
+            row.notes += "\n"+s
+        except TypeError:
+            pass
+        
 	row.save()
 	rowdata.write_csv(f1,gzip=True)
         dataprep.update_strokedata(id,rowdata.df)

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 3/5] 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 4/5] 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 5/5] 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;