Merge branch 'release/v10.68'

rowers/templates/embedded_video.html

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

static/js/videogauges.js

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