Changeset 2d2eb0d in OpenWorkouts-current for ow/templates/dashboard.pt


Ignore:
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:

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ow/templates/dashboard.pt

    r5cbc4a0 r2d2eb0d  
    8888            <div class="workout-intro" tal:content="workout.notes"></div>
    8989
     90            <div class="workout-map" tal:condition="workout.has_gpx">
     91                <a href="" tal:attributes="href request.resource_url(workout)">
     92                    <img src="" tal:attributes="src request.static_url(workout.map_screenshot);
     93                              alt workout.title; title workout.title">
     94                </a>
     95            </div>
     96
    9097            <ul class="workout-options">
    9198              <li class="owo-edit"><a href="" i18n:translate="" tal:attributes="href request.resource_url(workout, 'edit')"><span>edit</span></a></li>
Note: See TracChangeset for help on using the changeset viewer.