Merge branch 'develop' into feature/gauges

rowers/templates/embedded_video.html

@@ -46,7 +46,7 @@
 function copyText() {
   var tempInput = document.createElement("input");
     tempInput.style = "position: absolute; left: -1000px; top: -1000px";
-    tempInput.value = "https://rowsandall.com/rowers/video/{{ analysis.id|encode }}/";
+    tempInput.value = "{{ siteurl }}/rowers/video/{{ analysis.id|encode }}/";
     document.body.appendChild(tempInput);
     tempInput.select();
     document.execCommand("copy");
@@ -125,7 +125,7 @@ function copyText() {
   {% if analysis %}
   <li class="grid_2">
     <span class="fb-share-button" style="height:20px; vertical-align: top;"
-    data-href="https://rowsandall.com/rowers/video/{{ analysis.id|encode }}"
+    data-href="{{ siteurl }}/rowers/video/{{ analysis.id|encode }}"
     data-layout="button" data-size="small" data-mobile-iframe="false">
       <a class="fb-xfbml-parse-ignore" target="_blank"
       href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/video/{{ analysis.id|encode }}/">
@@ -134,7 +134,7 @@ function copyText() {
     <span>
       <a class="twitter-share-button"
       href="https://twitter.com/intent/tweet"
-      data-url="https://rowsandall.com/rowers/video/{{ analysis.id|encode }}/"
+      data-url="{{ siteurl }}/rowers/video/{{ analysis.id|encode }}/"
       data-text="@rowsandall #rowingdata">Tweet</a>
     </span>
     <span>
@@ -310,7 +310,7 @@ function copyText() {
       }
     </script>
   </li>
-  {% if user.is_authenticated and user == workout.user.user %}
+  {% if user.is_authenticated and workout|may_edit:request %}
   <li class="grid_4">
     <input type="checkbox" name="lock" id="lock" value="Lock">Lock Data and Video
   </li>
@@ -326,7 +326,7 @@ function copyText() {
     <li class="grid_2">
 
 
-      {% if form and user.is_authenticated and user == workout.user.user %}
+      {% if form and user.is_authenticated and workout|may_edit:request %}
 
       <table>
         {{ form.as_table }}