From 7cd1e061222500b90a016885b60c4287c0df3d8d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Sun, 8 Dec 2019 10:16:01 +0100
Subject: [PATCH 1/4] gauge comment improvements
---
static/js/videogauges.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/static/js/videogauges.js b/static/js/videogauges.js
index 102c3783..f6c068e4 100644
--- a/static/js/videogauges.js
+++ b/static/js/videogauges.js
@@ -41,8 +41,8 @@ var opts = {
staticZones: [
{strokeStyle: "#00FF00", min: 0, max: 2}, // Greem
{strokeStyle: "#0000FF", min: 2, max: 3}, // Blue`
- {strokeStyle: "#00FFFF", min: 3, max: 4}, // Yellow
- {strokeStyle: "#FFDD00", min: 4, max: 5}, // Purple
+ {strokeStyle: "#00FFFF", min: 3, max: 4}, // Cyan
+ {strokeStyle: "#FFDD00", min: 4, max: 5}, // Orange
{strokeStyle: "#FF0000", min: 5, max: 6} // Red
],
From 08d46c1957bce4514fc7206882ccc9a955d9d6e1 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Mon, 9 Dec 2019 10:57:43 +0100
Subject: [PATCH 2/4] added sharing buttons
---
rowers/templates/embedded_video.html | 62 ++++++++++++++++++++++++++--
rowers/templates/workout_view.html | 15 ++++---
2 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html
index dfd5c573..4d27ae10 100644
--- a/rowers/templates/embedded_video.html
+++ b/rowers/templates/embedded_video.html
@@ -7,6 +7,24 @@
{% block title %}Workout Video{% endblock %}
+{% block og_title %}{{ analysis.name }}{% endblock %}
+{% block description %}Rowing Video Analysis:{{ analysis.name }}{% endblock %}
+{% block og_description %}Rowing Video Analysis:{{ analysis.name }}{% endblock %}
+{% block og_image %}
+{% if analysis %}
+
+
+{% else %}
+
+
+{% endif %}
+{% endblock %}
+
+{% if analysis %}
+{% block image_src %}
+
+{% endblock %}
+{% endif %}
{% block meta %}
{% leaflet_js %}
@@ -22,6 +40,18 @@
});
});
+
{% endblock %}
{% block main %}
@@ -80,16 +110,38 @@
controls
to move around in the video and play it.
You can make manual adjustments to the delay to fine tune the alignment.
- Once you are finished, check "Lock Video and Data" to lock the video and the data.
- Once you are happy with the alignment, you can save the analysis, and share with other people.
+ Once you are finished, check "Lock Video and Data" to lock the video and the data.
+ Once you are happy with the alignment, you can save the analysis, and
+ share with other people.
{% else %}
Playing the video will advance the data in synchronization. Use the regular
YouTube controls to move around in the video and play it.
+
{% endif %}
-
-
+ {% if analysis %}
+
+
+
+ Share
+
+
+
+
+
+
+
+
+ {% endif %}
+
+
{{ mapdiv | safe}}
@@ -602,6 +654,8 @@ document.getElementById("dataplay").appendChild(dataplay);
// datastop.value = "Stop";
// document.getElementById("datastop").appendChild(datastop)
+
+
dataplay.onclick = function() {
if (lock.checked) {
dataplaying = false;
diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html
index bf99c2e1..9abc218e 100644
--- a/rowers/templates/workout_view.html
+++ b/rowers/templates/workout_view.html
@@ -19,7 +19,7 @@
{% block og_description %}{{ workout.name }}
{{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %}
-{% for graph in graphs %}
+
{% block og_image %}
{% if graphs %}
{% for graph in graphs %}
@@ -39,7 +39,6 @@
{% endfor %}
{% endblock %}
-{% endfor %}
{% block main %}
{{ workout.name }}
@@ -63,10 +62,10 @@
{% endif %}
@@ -74,7 +73,7 @@
@@ -122,7 +121,7 @@
{{ mapdiv|safe }}
-
+
{{ mapscript|safe }}
@@ -132,7 +131,7 @@
-
+
{{ interactiveplot |safe }}
{{ the_div|safe }}
@@ -141,7 +140,7 @@
{% for graph in graphs %}
-
From 561dfffa7c3ccfe99d87ee4936b97078b6d76c53 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Mon, 9 Dec 2019 12:29:02 +0100
Subject: [PATCH 3/4] color of share link
---
rowers/templates/embedded_video.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html
index 4d27ae10..69641929 100644
--- a/rowers/templates/embedded_video.html
+++ b/rowers/templates/embedded_video.html
@@ -136,7 +136,8 @@ function copyText() {
data-text="@rowsandall #rowingdata">Tweet
-
+
{% endif %}
From 27c7a172a02e8e0e320341d28353963fda166a65 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Sat, 14 Dec 2019 10:36:40 +0100
Subject: [PATCH 4/4] removed temp gauge
---
rowers/templates/embedded_video.html | 2 --
rowsandall_app/settings.py | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html
index 69641929..480dad9d 100644
--- a/rowers/templates/embedded_video.html
+++ b/rowers/templates/embedded_video.html
@@ -692,8 +692,6 @@ dataplay.onclick = function() {
});
-
-
{% endlanguage %}
{% endblock %}
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index a916a5f2..2df72fc8 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -84,7 +84,7 @@ MIDDLEWARE = [
'django.middleware.common.CommonMiddleware',
'django.middleware.common.BrokenLinkEmailsMiddleware',
'django.middleware.gzip.GZipMiddleware',
- 'htmlmin.middleware.HtmlMinifyMiddleware',
+# 'htmlmin.middleware.HtmlMinifyMiddleware',
# 'htmlmin.middleware.MarkRequestMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.middleware.security.SecurityMiddleware',