sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/opaqueid

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-12 09:15:08 +01:00
parent 1e3f3844f7 36349eede7
commit 909143f6b9
59 changed files with 18164 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
rowers/templates/menu_workout.html
View File

@@ -7,53 +7,52 @@
<ul>
<li id="workout-dashboard">
{% if user.is_authenticated and workout|may_edit:request %}
<a href="/rowers/workout/{{ workout.id|encode }}/workflow">
<a href="/rowers/workout/{{ workout.id|encode }}/workflow/">
<i class="fas fa-tachometer-alt fa-fw"></i>&nbsp;View
</a>
{% else %}
<a href="/rowers/workout/{{ workout.id|encode }}/workflow">
<a href="/rowers/workout/{{ workout.id|encode }}/workflow/">
<i class="fas fa-tachometer-alt fa-fw"></i>&nbsp;View
</a>
{% endif %}
</li>
{% if user.is_authenticated and workout|may_edit:request %}
<li id="workout-edit">
<a href="/rowers/workout/{{ workout.id|encode }}/edit">
<a href="/rowers/workout/{{ workout.id|encode }}/edit/">
<i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Edit
</a>
</li>
<li id="workout-intervals">
<a href="/rowers/workout/{{ workout.id|encode }}/editintervals">
<a href="/rowers/workout/{{ workout.id|encode }}/editintervals/">
<i class="fas fa-pause fa-fw"></i>&nbsp;Intervals
</a>
</li>
{% endif %}
{% if user.is_authenticated %}
<li id="workout-comments">
<a href="/rowers/workout/{{ workout.id|encode }}/comment">
<a href="/rowers/workout/{{ workout.id|encode }}/comment/">
<i class="fas fa-comments fa-fw"></i>&nbsp;Comments
({{ workout|aantalcomments }})
</a>
</li>
{% endif %}
<li id="workout-stats">
<a href="/rowers/workout/{{ workout.id|encode }}/stats">
<a href="/rowers/workout/{{ workout.id|encode }}/stats/">
<i class="fal fa-table fa-fw"></i>&nbsp;Statistics
</a>
</li>
<li id="compare">
<a href="/rowers/multi-compare/workout/{{ workout.id|encode }}">
<a href="/rowers/multi-compare/workout/{{ workout.id|encode }}/">
<i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare
</a>
</li>
{% if user.is_authenticated and workout|may_edit:request %}
<li id="chart-image">
<a href="/rowers/workout/{{ workout.id|encode }}/image">
<a href="/rowers/workout/{{ workout.id|encode }}/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">
<a href="/rowers/workout/{{ workout.id }}/delete/">
<i class="fas fa-trash-alt fa-fw"></i>&nbsp;Delete
</a>
</li>
@@ -65,23 +64,23 @@
<label for="group-flexchart">Interactive Charts</label>
<ul>
<li id="chart-flexchart">
<a href="/rowers/workout/{{ workout.id|encode }}/flexchart">
<a href="/rowers/workout/{{ workout.id|encode }}/flexchart/">
<i class="fas fa-chart-line fa-fw"></i>&nbsp;Flex Chart
</a>
</li>
{% if workout|water %}
<li id="chart-map">
<a href="/rowers/workout/{{ workout.id|encode }}/map">
<a href="/rowers/workout/{{ workout.id|encode }}/map/">
<i class="fas fa-map-marked-alt fa-fw"></i>&nbsp;Map
</a>
</li>
<li id="chart-empower">
<a href="/rowers/workout/{{ workout.id|encode }}/forcecurve">
<a href="/rowers/workout/{{ workout.id|encode }}/forcecurve/">
<i class="fas fa-dumbbell fa-fw"></i>&nbsp;Force Curve
</a>
</li>
<li id="chart-otwpower">
<a href="/rowers/workout/{{ workout.id|encode }}/interactiveotwplot">
<a href="/rowers/workout/{{ workout.id|encode }}/interactiveotwplot/">
<i class="fal fa-calculator-alt fa-fw"></i>&nbsp;Corrected Pace Plot
</a>
</li>
@@ -94,28 +93,28 @@
<label for="group-chart">Static Charts</label>
<ul>
<li id="chart-time">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/1">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/1/">
<i class="fas fa-stopwatch fa-fw"></i>&nbsp;Time
</a>
</li>
<li id="chart-distance">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/2">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/2/">
<i class="fas fa-ruler fa-fw"></i>&nbsp;Distance
</a>
</li>
<li id="chart-powerpie">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/13">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/13/">
<i class="far fa-chart-pie fa-fw"></i>&nbsp;Power (Pie)
</a>
</li>
<li id="chart-hrpie">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/3">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/3/">
<i class="fas fa-heartbeat fa-fw"></i>&nbsp;Heart Rate (Pie)
</a>
</li>
{% if workout|water %}
<li id="chart-otwpower">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/9">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/9/">
<i class="fas fa-chart-area fa-fw"></i>&nbsp;OTW Power
</a>
</li>
@@ -136,7 +135,7 @@
Connect to Concept2
</a>
{% else %}
<a href="/rowers/workout/{{ workout.id|encode }}/c2uploadw">
<a href="/rowers/workout/{{ workout.id|encode }}/c2uploadw/">
Concept2
</a>
{% endif %}
@@ -151,7 +150,7 @@
Connect to Strava
</a>
{% else %}
<a href="/rowers/workout/{{ workout.id|encode }}/stravauploadw">
<a href="/rowers/workout/{{ workout.id|encode }}/stravauploadw/">
Strava
</a>
{% endif %}
@@ -166,7 +165,7 @@
Connect to SportTracks
</a>
{% else %}
<a href="/rowers/workout/{{ workout.id|encode }}/sporttracksuploadw">
<a href="/rowers/workout/{{ workout.id|encode }}/sporttracksuploadw/">
SportTracks
</a>
{% endif %}
@@ -181,7 +180,7 @@
Connect to Runkeeper
</a>
{% else %}
<a href="/rowers/workout/{{ workout.id|encode }}/runkeeperuploadw">
<a href="/rowers/workout/{{ workout.id|encode }}/runkeeperuploadw/">
Runkeeper
</a>
{% endif %}
@@ -196,7 +195,7 @@
Connect to MapMyFitness
</a>
{% else %}
<a href="/rowers/workout/{{ workout.id|encode }}/underarmouruploadw">
<a href="/rowers/workout/{{ workout.id|encode }}/underarmouruploadw/">
MapMyFitness
</a>
{% endif %}
@@ -211,23 +210,23 @@
Connect to TrainingPeaks
</a>
{% else %}
<a href="/rowers/workout/{{ workout.id|encode }}/tpuploadw">
<a href="/rowers/workout/{{ workout.id|encode }}/tpuploadw/">
TrainingPeaks
</a>
{% endif %}
</li>
<li id="export-csv">
<a href="/rowers/workout/{{ workout.id|encode }}/emailcsv">
<a href="/rowers/workout/{{ workout.id|encode }}/emailcsv/">
CSV
</a>
</li>
<li id="export-gpx">
<a href="/rowers/workout/{{ workout.id|encode }}/emailgpx">
<a href="/rowers/workout/{{ workout.id|encode }}/emailgpx/">
GPX
</a>
</li>
<li id="export-tcx">
<a href="/rowers/workout/{{ workout.id|encode }}/emailtcx">
<a href="/rowers/workout/{{ workout.id|encode }}/emailtcx/">
TCX
</a>
</li>
@@ -238,12 +237,12 @@
<label for="group-data">Data</label>
<ul>
<li id="data-smoothen">
<a href="/rowers/workout/{{ workout.id|encode }}/smoothenpace">
<a href="/rowers/workout/{{ workout.id|encode }}/smoothenpace/">
<i class="fas fa-magic fa-fw"></i>&nbsp;Smoothen
</a>
</li>
<li id="data-raw">
<a href="/rowers/workout/{{ workout.id|encode }}/undosmoothenpace">
<a href="/rowers/workout/{{ workout.id|encode }}/undosmoothenpace/">
<i class="fas fa-undo fa-fw"></i>&nbsp;Restore Raw
</a>
</li>
@@ -253,12 +252,12 @@
</a>
</li>
<li id="data-split">
<a href="/rowers/workout/{{ workout.id|encode }}/split">
<a href="/rowers/workout/{{ workout.id|encode }}/split/">
<i class="fas fa-cut fa-fw"></i>&nbsp;Split Workout
</a>
</li>
<li id="data-view">
<a href="/rowers/workout/{{ workout.id|encode }}/data">
<a href="/rowers/workout/{{ workout.id|encode }}/data/">
<i class="fal fa-table fa-fw"></i>&nbsp;Explore Raw Data
</a>
</ul>
@@ -269,28 +268,28 @@
<ul>
{% if workout|water %}
<li id="advanced-wind">
<a href="/rowers/workout/{{ workout.id|encode }}/wind">
<a href="/rowers/workout/{{ workout.id|encode }}/wind/">
<i class="fas fa-pennant fa-fw"></i>&nbsp;Wind
</a>
</li>
<li id="advanced-stream">
<a href="/rowers/workout/{{ workout.id|encode }}/stream">
<a href="/rowers/workout/{{ workout.id|encode }}/stream/">
<i class="fas fa-stream fa-fw"></i>&nbsp;Stream
</a>
</li>
<li id="advanced-otwpower">
<a href="/rowers/workout/{{ workout.id|encode }}/otwsetpower">
<a href="/rowers/workout/{{ workout.id|encode }}/otwsetpower/">
<i class="fas fa-calculator-alt fa-fw"></i>&nbsp;OTW Power
</a>
</li>
{% endif %}
<li id="advanced-instroke">
<a href="/rowers/workout/{{ workout.id|encode }}/instroke">
<a href="/rowers/workout/{{ workout.id|encode }}/instroke/">
<i class="fas fa-search-plus fa-fw"></i>&nbsp;In-Stroke Metrics
</a>
</li>
<li id="advanced-recalcsummary">
<a href="/rowers/workout/{{ workout.id|encode }}/recalcsummary">
<a href="/rowers/workout/{{ workout.id|encode }}/recalcsummary/">
<i class="fas fa-window-restore fa-fw"></i>&nbsp;Update Summary
</a>
</li>