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

Merge branch 'release/v10.68'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-12-08 10:11:10 +01:00
parent 52d13cc34e 92b66e13ce
commit bdc8746ddf
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rowers/templates/embedded_video.html
View File

@@ -281,23 +281,21 @@
{{ metricsform.as_table }} {{ metricsform.as_table }}
</table> </table>
{% else %}
<input type="hidden" id="id_delay" value="{{ analysis.delay }}">
{% endif %}
{% if not analysis.id %} {% if not analysis.id %}
<input type="submit" name="reload_button" value="Reload"> <input type="submit" name="reload_button" value="Reload">
{% endif %} {% endif %}
<input type="submit" name="save_button" value="Save"> <input type="submit" name="save_button" value="Save">
{% if analysis and user.is_authenticated and user == analysis.workout.user.user %} {% else %}
<p> <input type="hidden" id="id_delay" value="{{ analysis.delay }}">
<a href="/rowers/video/{{ analysis.id }}/delete/">Delete Analysis</a>
</p>
{% endif %} {% endif %}
</li> </li>
<li class="grid_2" > <li class="grid_2" >
@@ -326,6 +324,13 @@
{% endfor %} {% endfor %}
</ul> </ul>
</li> </li>
<li class="grid_2">
{% if analysis and user.is_authenticated and user == analysis.workout.user.user %}
<p>
<a href="/rowers/video/{{ analysis.id }}/delete/">Delete Analysis</a>
</p>
{% endif %}
</li>
</ul> </ul>
</form> </form>
<p>&nbsp;</p> <p>&nbsp;</p>
@@ -355,7 +360,7 @@
// lock // lock
var lock = document.getElementById("lock"); var lock = document.getElementById("lock");
var output = document.getElementById("id_delay"); var output = document.getElementById("id_delay");
var cookie = readCookie("lock"); var cookie = readCookie("lock{{ workout.id }}");
var delay = output.value; var delay = output.value;
if (cookie=="true") { if (cookie=="true") {
lock.checked = true; lock.checked = true;
@@ -526,10 +531,10 @@
lock.oninput = function() { lock.oninput = function() {
if (this.checked) { if (this.checked) {
output.disabled = true; output.disabled = true;
createCookie("lock","true",0); createCookie("lock{{ workout.id}}","true",0);
} else { } else {
output.disabled = false; output.disabled = false;
createCookie("lock","false",0); createCookie("lock{{ workout.id }}","false",0);
} }
} }
// Slider start stop // Slider start stop

8
static/js/videogauges.js
View File

@@ -39,10 +39,10 @@ var opts = {
generateGradient: true, generateGradient: true,
highDpiSupport: true, // High resolution support highDpiSupport: true, // High resolution support
staticZones: [ staticZones: [
{strokeStyle: "#00FF00", min: 0, max: 2}, // Red from 100 to 60 {strokeStyle: "#00FF00", min: 0, max: 2}, // Greem
{strokeStyle: "#0000FF", min: 2, max: 3}, // Yellow {strokeStyle: "#0000FF", min: 2, max: 3}, // Blue`
{strokeStyle: "#00FFFF", min: 3, max: 4}, // Green {strokeStyle: "#00FFFF", min: 3, max: 4}, // Yellow
{strokeStyle: "#FFDD00", min: 4, max: 5}, // Yellow {strokeStyle: "#FFDD00", min: 4, max: 5}, // Purple
{strokeStyle: "#FF0000", min: 5, max: 6} // Red {strokeStyle: "#FF0000", min: 5, max: 6} // Red
], ],