Changeset 2d2eb0d in OpenWorkouts-current for ow/templates

Timestamp:

Jan 23, 2019, 2:07:26 PM (5 years ago)

Author:

Segundo Fdez <segun.2@…>

Branches:

current, feature/docs, master

Children:

4dcf28d

Parents:

5cbc4a0 (diff), c6219ed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/ui

# Conflicts:

Location:

ow/templates

Files:

• dashboard.pt (modified) (1 diff)
• workout-map.pt (added)
• workout.pt (modified) (3 diffs)

ow/templates/dashboard.pt

@@ -88 +88 @@
             <div class="workout-intro" tal:content="workout.notes"></div>
 
+            <div class="workout-map" tal:condition="workout.has_gpx">
+                <a href="" tal:attributes="href request.resource_url(workout)">
+                    <img src="" tal:attributes="src request.static_url(workout.map_screenshot);
+                              alt workout.title; title workout.title">
+                </a>
+            </div>
+
             <ul class="workout-options">
               <li class="owo-edit"><a href="" i18n:translate="" tal:attributes="href request.resource_url(workout, 'edit')"><span>edit</span></a></li>

ow/templates/workout.pt

@@ -87 +87 @@
           <tal:c tal:content="context.rounded_distance"></tal:c> km
         </li>
+        <li tal:condition="context.speed">
+          <tal:t i18n:translate="">Speed:</tal:t>
+          <tal:t i18n:translate="">Avg.</tal:t>
+          <tal:c tal:content="round(context.speed['avg'], 1)"></tal:c> km/h |
+          <tal:t i18n:translate="">Max.</tal:t>
+          <tal:c tal:content="round(context.speed['max'], 1)"></tal:c> km/h
+        </li>
         <li tal:condition="hr">
           <tal:t i18n:translate="">Heart Rate:</tal:t>
@@ -145 +152 @@
     <script type="text/javascript" tal:condition="context.has_gpx">
      var workout_map = owjs.map({
+         map_id: 'map',
          latitude: ${start_point['latitude']},
          longitude: ${start_point['longitude']},
@@ -152 +160 @@
          end_icon: '${request.static_url('ow:static/components/leaflet-gpx/pin-icon-end.png')}',
          shadow: '${request.static_url('ow:static/components/leaflet-gpx/pin-shadow.png')}',
+         elevation: true,
+         zoom_control: true
      });
      workout_map.render();