- Timestamp:
- Feb 7, 2019, 7:23:04 PM (5 years ago)
- 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. - Location:
- ow/templates
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
ow/templates/dashboard.pt
rb05824e rfc01180 63 63 <tal:c tal:content="workout.rounded_distance"></tal:c> km 64 64 </li> 65 <li tal:condition="workout.uphill"> 66 +<tal:c tal:content="workout.uphill"></tal:c> m 67 </li> 65 68 </ul> 66 69 … … 68 71 <li tal:condition="hr"> 69 72 <span i18n:translate="">HR (bpm)</span>: 70 <tal:c tal:content="hr['min']"></tal:c>71 <tal:t i18n:translate="">Min.</tal:t>,72 73 <tal:c tal:content="hr['avg']"></tal:c> 73 74 <tal:t i18n:translate="">Avg.</tal:t>, … … 77 78 <li tal:condition="cad"> 78 79 <span i18n:translate="">Cad</span>: 79 <tal:c tal:content="cad['min']"></tal:c>80 <tal:t i18n:translate="">Min.</tal:t>,81 80 <tal:c tal:content="cad['avg']"></tal:c> 82 81 <tal:t i18n:translate="">Avg.</tal:t>, … … 94 93 </a> 95 94 </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>102 95 103 96 </article> -
ow/templates/profile.pt
rb05824e rfc01180 112 112 <tal:c tal:content="workout.rounded_distance"></tal:c> km 113 113 </li> 114 <li tal:condition="workout.uphill"> 115 +<tal:c tal:content="workout.uphill"></tal:c> m 116 </li> 114 117 </ul> 115 118 … … 117 120 <li tal:condition="hr"> 118 121 <span i18n:translate="">HR (bpm)</span>: 119 <tal:c tal:content="hr['min']"></tal:c>120 <tal:t i18n:translate="">Min.</tal:t>,121 122 <tal:c tal:content="hr['avg']"></tal:c> 122 123 <tal:t i18n:translate="">Avg.</tal:t>, … … 126 127 <li tal:condition="cad"> 127 128 <span i18n:translate="">Cad</span>: 128 <tal:c tal:content="cad['min']"></tal:c>129 <tal:t i18n:translate="">Min.</tal:t>,130 129 <tal:c tal:content="cad['avg']"></tal:c> 131 130 <tal:t i18n:translate="">Avg.</tal:t>,
Note: See TracChangeset
for help on using the changeset viewer.