Changeset 5f05e83 in OpenWorkouts-current for ow/templates/workout.pt

Timestamp:

Feb 5, 2019, 5:15:13 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

3169fe4

Parents:

d52ba50

git-author:

Borja Lopez <borja@…> (02/05/19 16:50:41)

git-committer:

Borja Lopez <borja@…> (02/05/19 17:15:13)

Message:

Replaced Leaflet.Elevation with a newer, improved version (fork of the original)

Done some clean-up of the map javascript code, removed old tests and WIP code
that is not needed anymore.

IMPORTANT: After pulling this patch, run js_deps to install the new version of
leaflet elevation:

./bin/js_deps

File:

• ow/templates/workout.pt (modified) (4 diffs)

ow/templates/workout.pt

@@ -17 +17 @@
           href="${request.static_url('ow:static/components/Leaflet/leaflet.css')}" />
     <link rel="stylesheet" tal:condition="context.has_gpx"
-          href="${request.static_url('ow:static/components/Leaflet.Elevation/dist/leaflet.elevation-0.0.4.css')}" />
+          href="${request.static_url('ow:static/components/leaflet-elevation/leaflet-elevation.css')}" />
+    <link rel="stylesheet"
+          href="${request.static_url('ow:static/css/leaflet-elevation.css')}" />
   </metal:css>
 
@@ -36 +38 @@
           <li>
             <a href="" i18n:translate=""
-             tal:attributes="href request.resource_url(context, 'edit')">
-            edit workout
+               tal:attributes="href request.resource_url(context, 'edit')">
+              edit workout
             </a>
           </li>
           <li>
             <a href="" i18n:translate=""
-             tal:attributes="href request.resource_url(context, 'update-from-file')">
-            update with tracking file
+               tal:attributes="href request.resource_url(context, 'update-from-file')">
+              update with tracking file
             </a>
           </li>
           <li class="owo-del"><a href="" i18n:translate=""
-             tal:attributes="href request.resource_url(context, 'delete')">
+                                 tal:attributes="href request.resource_url(context, 'delete')">
             delete
-            </a>
+          </a>
           </li>
         </ul>
@@ -72 +74 @@
             <span><tal:t i18n:translate="">Speed</tal:t></span>
             <span class="avg"><tal:t i18n:translate="">Avg.</tal:t>
-            <tal:c tal:content="round(context.speed['avg'], 1)"></tal:c>km/h</span>
+              <tal:c tal:content="round(context.speed['avg'], 1)"></tal:c>km/h</span>
             <span class="max"><tal:t i18n:translate="">Max.</tal:t>
-            <tal:c tal:content="round(context.speed['max'], 1)"></tal:c>km/h</span>
+              <tal:c tal:content="round(context.speed['max'], 1)"></tal:c>km/h</span>
           </li>
           <li tal:condition="hr">
             <span><tal:t i18n:translate="">Heart Rate</tal:t></span>
             <span class="avg"><tal:t i18n:translate="">Avg.</tal:t>
-            <tal:c tal:content="hr['avg']"></tal:c>bpm</span>
+              <tal:c tal:content="hr['avg']"></tal:c>bpm</span>
             <span class="max"><tal:t i18n:translate="">Max.</tal:t>
-            <tal:c tal:content="hr['max']"></tal:c> bpm</span>
+              <tal:c tal:content="hr['max']"></tal:c> bpm</span>
           </li>
           <li tal:condition="cad">
             <span><tal:t i18n:translate="">Cadence</tal:t></span>
             <span class="avg"><tal:t i18n:translate="">Avg.</tal:t>
-            <tal:c tal:content="cad['avg']"></tal:c></span>
+              <tal:c tal:content="cad['avg']"></tal:c></span>
             <span class="max"><tal:t i18n:translate="">Max.</tal:t>
-            <tal:c tal:content="cad['max']"></tal:c></span>
+              <tal:c tal:content="cad['max']"></tal:c></span>
           </li>
           <li tal:condition="atemp">
             <span><tal:t i18n:translate="">Temperature</tal:t></span>
             <span class="min"><tal:t i18n:translate="">Min.</tal:t>
-            <tal:c tal:content="atemp['min']"></tal:c>℃</span>
+              <tal:c tal:content="atemp['min']"></tal:c>℃</span>
             <span class="avg"><tal:t i18n:translate="">Avg.</tal:t>
-            <tal:c tal:content="atemp['avg']"></tal:c>℃</span>
+              <tal:c tal:content="atemp['avg']"></tal:c>℃</span>
             <span class="max"><tal:t i18n:translate="">Max.</tal:t>
-            <tal:c tal:content="atemp['max']"></tal:c>℃</span>
+              <tal:c tal:content="atemp['max']"></tal:c>℃</span>
           </li>
         </ul>
+        <div id="elevation"></div>
       </div>
     </div>
+
     <!--! Track map -->
     <div id="map" tal:condition="context.has_gpx"></div>
-
-    <!--! Additional map controls -->
-
-    <div id="ow-analysis">
-
-      <!--!
-          FIXME: the list of available charts should come from the workout
-          details, based on which data this workout has
-        -->
-      <!--! All those ids are needed for the leaflet openworkouts plugin -->
-      <tal:r tal:repeat="chart ['elevation', 'heartrate', 'cadence', 'temperature']">
-        <div id="ow-" tal:attributes="id 'ow-' + chart">
-          <div class="ow-average" id=""
-               tal:attributes="id 'ow-' + chart + '-average'"></div>
-          <div class="ow-chart" id=""
-               tal:attributes="id 'ow-' + chart + '-chart'"></div>
-          <div class="ow-current" id=""
-               tal:attributes="id 'ow-' + chart + '-current'"></div>
-        </div>
-      </tal:r>
-
-    </div>
   </metal:content>
 
   <metal:body-js metal:fill-slot="body-js">
 
-
-    <script src="//d3js.org/d3.v3.min.js" charset="utf-8"></script>
-    <!--
-    <script src="${request.static_url('ow:static/d3/d3.min.js')}"
+    <script src="${request.static_url('ow:static/components/d3/d3.min.js')}"
             tal:condition="context.has_gpx"></script>
-    -->
 
     <script src="${request.static_url('ow:static/components/Leaflet/leaflet.js')}"
@@ -143 +121 @@
             tal:condition="context.has_gpx"></script>
 
-    <script src="${request.static_url('ow:static/components/Leaflet.Elevation/dist/leaflet.elevation-0.0.4.min.js')}"
+    <script src="${request.static_url('ow:static/components/leaflet-elevation/leaflet-elevation.js')}"
             tal:condition="context.has_gpx"></script>