Changeset 02048a6 in OpenWorkouts-current for ow/templates/workout.pt

Timestamp:

Jan 16, 2019, 11:52:22 AM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

816820d, c6219ed

Parents:

7388b68 (diff), ad5759b (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:

Merged changes from darcs

File:

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

ow/templates/workout.pt

@@ -18 +18 @@
     <link rel="stylesheet" tal:condition="context.has_gpx"
           href="${request.static_url('ow:static/components/Leaflet.Elevation/dist/leaflet.elevation-0.0.4.css')}" />
-
-    <!--!
-    <link rel="stylesheet" tal:condition="context.has_gpx"
-          href="${request.static_url('ow:static/leaflet-elevation/leaflet.elevation.css')}" />
-
-    <link rel="stylesheet" tal:condition="context.has_gpx"
-          href="${request.static_url('ow:static/leaflet-openworkouts/leaflet.openworkouts.css')}" />
-    -->
-
   </metal:css>
 
@@ -149 +140 @@
             tal:condition="context.has_gpx"></script>
 
-    <!--!
-    <script src="${request.static_url('ow:static/leaflet-elevation/leaflet.elevation.min.js')}"
-            tal:condition="context.has_gpx"></script>
-    <script src="${request.static_url('ow:static/leaflet-openworkouts/leaflet.openworkouts.src.js')}"
-            tal:condition="context.has_gpx"></script>
-    -->
     <script src="${request.static_url('ow:static/js/ow.js')}"
             tal:condition="context.has_gpx"></script>
@@ -164 +149 @@
          zoom: 11,
          gpx_url: '${request.resource_url(context, 'gpx')}',
-         start_icon: '${request.static_url('ow:static/leaflet-gpx/pin-icon-start.png')}',
-         end_icon: '${request.static_url('ow:static/leaflet-gpx/pin-icon-end.png')}',
-         shadow: '${request.static_url('ow:static/leaflet-gpx/pin-shadow.png')}',
+         start_icon: '${request.static_url('ow:static/components/leaflet-gpx/pin-icon-start.png')}',
+         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')}',
      });
      workout_map.render();