Merge branch 'develop' into feature/stravaapi

rowers/templates/menu_workout.html

@@ -231,6 +231,20 @@
         </a>
         {% endif %}
       </li>
+      <li id="export-intervals">
+	{% if workout.uploadedtointervals and workout.uploadedtointervals != '0' %}
+	<a href="https://intervals.icu/activities/{{ workout.uploadedtointervals }}">
+	  Intervals.icu <i class="fas fa-check"></i>
+	</a>
+	{% elif user.rower.intervals_token == None or user.rower.intervals_token == '' %}
+	<a href="/rowers/me/intervalsauthorize">
+	  Connect to Intervals.icu
+	</a>
+	{% else %}
+	<a href="/rowers/workout/{{ workout.id|encode }}/intervalsuploadw/">
+	  Intervals.icu
+	</a>
+	{% endif %}
       <li id="export-csv">
         <a href="/rowers/workout/{{ workout.id|encode }}/emailcsv/">
           CSV

rowers/templates/menu_workouts.html

@@ -57,6 +57,7 @@
       <li id="sporttracks"><a href="/rowers/workout/sporttracksimport/">SportTracks</a></li>
       <li id="polar"><a href="/rowers/workout/polarimport/">Polar</a></li>
       <li id="rp3"><a href="/rowers/workout/rp3import/">RP3</a></li>
+      <li id="intervals"><a href="/rowers/workout/intervalsimport/">Intervals.icu</a></li>
     </ul>
   </li>
 </ul> <!-- cd-accordion-menu -->

rowers/templates/rower_exportsettings.html

@@ -32,10 +32,13 @@
       Strava,
       {% endif %}
       {% if rower.rp3token is not None and rower.rp3token != '' %}
-      RP3
+      RP3,
       {% endif %}
       {% if rower.rojabo_token is not None and rower.rojabo_token != '' %}
-      Rojabo
+      Rojabo,
+      {% endif %}
+      {% if rower.intervals_token is not None and rower.intervals_token != '' %}
+      Intervals.icu
       {% endif %}
     </p>
   
@@ -132,6 +135,8 @@
 					      alt="connect with RP3" width="130"></a></p>
     <p><a href="/rowers/me/rojaboauthorize"><img src="/static/img/rojabo.png"
 						 alt="connect with Rojabo" width="130"></a></p>
+<p><a href="/rowers/me/intervalsauthorize"><img src="/static/img/intervals_icu.png"
+						alt="connect with intervals.icu" height="30"></a></p>
 
 {% endblock %}