Changeset fc01180 in OpenWorkouts-current


Ignore:
Timestamp:
Feb 7, 2019, 7:23:04 PM (4 years ago)
Author:
Segundo Fdez <segun.2@…>
Branches:
current, feature/docs, master
Children:
713de61
Parents:
b05824e (diff), 4985618 (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

Location:
ow/templates
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ow/templates/dashboard.pt

    rb05824e rfc01180  
    6363                <tal:c tal:content="workout.rounded_distance"></tal:c> km
    6464              </li>
     65              <li tal:condition="workout.uphill">
     66                +<tal:c tal:content="workout.uphill"></tal:c> m
     67              </li>
    6568            </ul>
    6669
     
    6871              <li tal:condition="hr">
    6972                <span i18n:translate="">HR (bpm)</span>:
    70                 <tal:c tal:content="hr['min']"></tal:c>
    71                 <tal:t i18n:translate="">Min.</tal:t>,
    7273                <tal:c tal:content="hr['avg']"></tal:c>
    7374                <tal:t i18n:translate="">Avg.</tal:t>,
     
    7778              <li tal:condition="cad">
    7879                <span i18n:translate="">Cad</span>:
    79                 <tal:c tal:content="cad['min']"></tal:c>
    80                 <tal:t i18n:translate="">Min.</tal:t>,
    8180                <tal:c tal:content="cad['avg']"></tal:c>
    8281                <tal:t i18n:translate="">Avg.</tal:t>,
     
    9493                </a>
    9594            </div>
    96 
    97             <ul class="workout-options">
    98               <li class="owo-edit"><a href="" i18n:translate="" tal:attributes="href request.resource_url(workout, 'edit')"><span>edit</span></a></li>
    99               <li class="owo-update"><a href="" i18n:translate="" tal:attributes="href request.resource_url(workout, 'update-from-file')"><span>update with tracking file</span></a></li>
    100               <li class="owo-del"><a href="" i18n:translate="" tal:attributes="href request.resource_url(workout, 'delete')"><span>delete</span></a></li>
    101             </ul>
    10295
    10396          </article>
  • ow/templates/profile.pt

    rb05824e rfc01180  
    112112                  <tal:c tal:content="workout.rounded_distance"></tal:c> km
    113113                </li>
     114                <li tal:condition="workout.uphill">
     115                  +<tal:c tal:content="workout.uphill"></tal:c> m
     116                </li>
    114117              </ul>
    115118
     
    117120                <li tal:condition="hr">
    118121                  <span i18n:translate="">HR (bpm)</span>:
    119                   <tal:c tal:content="hr['min']"></tal:c>
    120                   <tal:t i18n:translate="">Min.</tal:t>,
    121122                  <tal:c tal:content="hr['avg']"></tal:c>
    122123                  <tal:t i18n:translate="">Avg.</tal:t>,
     
    126127                <li tal:condition="cad">
    127128                  <span i18n:translate="">Cad</span>:
    128                   <tal:c tal:content="cad['min']"></tal:c>
    129                   <tal:t i18n:translate="">Min.</tal:t>,
    130129                  <tal:c tal:content="cad['avg']"></tal:c>
    131130                  <tal:t i18n:translate="">Avg.</tal:t>,
Note: See TracChangeset for help on using the changeset viewer.