added glue to templates

rowers/templates/advancededit.html

@@ -6,7 +6,7 @@
 
 {% block content %}
 <div id="workouts" class="grid_6 alpha">
-
+  <div class="grid_6 alpha">
     {% if form.errors %}
     <p style="color: red;">
       Please correct the error{{ form.errors|pluralize }} below.
@@ -17,8 +17,11 @@
     {% if user.rower.rowerplan == 'basic' %}
     <p>This is a preview of the page with advanced functionality for Pro users.
       See
-    <a href="/rowers/promembership">the page about Pro membership</a> for more information and to sign up for Pro Membership</a>
+      <a href="/rowers/promembership">the page about Pro membership</a>
+      for more information and to sign up for Pro Membership</a></p>
     {% endif %}
+  </div>
+  <div class="grid_6 alpha">
     <div class="grid_2 alpha">
       <p>
         <a class="button gray small" href="/rowers/workout/{{ workout.id }}/edit">Edit Workout</a>
@@ -33,8 +36,9 @@
       <p>
         <a class="button gray small" href="/rowers/workout/{{ workout.id }}/export">Export</a>
       </p>
-
     </div>
+  </div>
+
   <div class="grid_6 alpha">
   
     <table width=100%>
@@ -116,28 +120,32 @@
       </p>
     </div>
     <div class="grid_2 omega">
-    <p>
-      <a class="button blue small" href="/rowers/workout/{{ workout.id }}/interactiveplot">Big Interactive Plot</a>
-    </p>
-    <p>
-      See (and save) the big interactive plot
-    </p>
-  </div>
-</div>
-<div class="grid_6 alpha">
-
-  <div class="grid_2 alpha">
       <p>
         {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
         <a class="button blue small" href="/rowers/workout/{{ workout.id }}/histo">Power Histogram</a>
         {% else %}
-      <a class="button blue small" href="/rowers/promembership">Dist Metrics Plot</a>
+        <a class="button blue small" href="/rowers/promembership">Power Histogram</a>
         {% endif %}
       </p>
       <p>
         Plot the Power Histogram of this workout
       </p>
     </div>
+  </div>
+  <div class="grid_6 alpha">
+    <div class="grid_2 alpha">
+      <p>
+        {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
+        <a class="button blue small" href="/rowers/workouts-join-select">Glue</a>
+        {% else %}
+        <a class="button blue small" href="/rowers/promembership">Glue</a>
+        {% endif %}
+      </p>
+      <p>
+        Glue multiple workouts together (into one workout). For example, to combine separately recorded intervals.
+      </p>
+    </div>
+    
     <div class="grid_2">
       <p>
         {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
@@ -163,6 +171,16 @@
       </p>
     </div>
   </div>
+  <div class="grid_6 alpha">
+        <div class="grid_2 alpha">
+      <p>
+        <a class="button blue small" href="/rowers/workout/{{ workout.id }}/interactiveplot">Big Interactive Plot</a>
+      </p>
+      <p>
+        See (and save) the big interactive plot
+      </p>
+    </div>
+  </div>
 </div>
 <div id="advancedplots" class="grid_6 omega">
   <div class="grid_6 alpha">
@@ -199,5 +217,6 @@
       {{ the_div |safe }}
     </div>
   </div>
+</div>
 
 {% endblock %}

rowers/templates/advancedotw.html

@@ -189,10 +189,14 @@
 <div class="grid_6 alpha">
     <div class="grid_2 alpha">
       <p>
-      <a class="button blue small" href="/rowers/workout/{{ workout.id }}/interactiveplot">Big Interactive Plot</a>
+        {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
+        <a class="button blue small" href="/rowers/workouts-join-select">Glue</a>
+        {% else %}
+        <a class="button blue small" href="/rowers/promembership">Glue</a>
+        {% endif %}
       </p>
       <p>
-      See (and save) the big interactive plot
+        Glue multiple workouts together (into one workout). For example, to combine separately recorded intervals.
       </p>
     </div>
   <div class="grid_2">
@@ -220,6 +224,17 @@
     </p>
   </div>
 
+</div>
+<div class="grid_6 alpha">
+  <div class="grid_2 alpha">
+    <p>
+      <a class="button blue small" href="/rowers/workout/{{ workout.id }}/interactiveplot">Big Interactive Plot</a>
+    </p>
+    <p>
+      See (and save) the big interactive plot
+    </p>
+  </div>
+
 </div>
 </div>
 <div id="advancedplots" class="grid_6 omega">

rowers/templates/list_workouts.html

@@ -195,7 +195,7 @@
 </div>
 
 
-<div class="grid_5 alpha">
+<div class="grid_6 alpha">
   {% if rankingonly and not team %}
     <div class="grid_2 prefix_1 alpha">
       <a class="button small green" href="/rowers/list-workouts">All Workouts</a>
@@ -205,6 +205,9 @@
       <a class="button small green" href="/rowers/list-workouts/ranking">Ranking Pieces Only</a>
     </div>    
     {% endif %}
+    <div class="grid_2 suffix_1 omega">
+      <a class="button small gray" href="/rowers/workouts-join-select">Glue Workouts</a>
+    </div>
     <p>&nbsp;</p>
   {% if team %}
   <form id="searchform" action="/rowers/list-workouts/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
@@ -223,7 +226,7 @@
     </div>
   </form>
 </div>
-<div class="grid_2 prefix_1 omega">
+<div class="grid_2 omega">
   <span class="button gray small">
     {% if workouts.has_previous %}
     {% if request.GET.q %}