Changeset fb327e1 in OpenWorkouts-current

Timestamp:

Feb 8, 2019, 12:53:00 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

20782ac

Parents:

feab169

Message:

Fixed title(s) on the edit workout template.
Round distance value shown in the edit workout template.

Location:

ow

Files:

• templates/add_manual_workout.pt (modified) (4 diffs)
• templates/edit_manual_workout.pt (modified) (1 diff)
• views/workout.py (modified) (1 diff)

ow/templates/add_manual_workout.pt

@@ -8 +8 @@
       tal:attributes="lang request.locale_name">
 
-  <metal:head-title metal:fill-slot="head-title">
+  <metal:head-title metal:fill-slot="head-title" metal:define-slot="head-title">
     <tal:t i18n:translate="">Add workout manually</tal:t>
   </metal:head-title>
 
-  <metal:title metal:fill-slot="title">
+  <metal:title metal:fill-slot="title" metal:define-slot="head-title">
     <tal:t i18n:translate="">Add workout Manually</tal:t>
   </metal:title>
@@ -26 +26 @@
     <div class="add_workout ow-forms">
       <a href="" class="back"
-             tal:attributes="href request.resource_url(context)"
-             i18n:translate="">Back</a>
-        <h2 i18n:translate="">Add a new workout</h2>
+         tal:attributes="href request.resource_url(context)"
+         i18n:translate="">Back</a>
+
+      <h2>
+        <metal:form-title metal:define-slot="form-title">
+          <tal:t i18n:translate="">Add a new workout</tal:t>
+        </metal:form-title>
+      </h2>
+
         ${form.begin()}
         ${form.csrf_token()}
@@ -43 +49 @@
               ${form.text('title')}
           </p>
-          <div class="input-container ly-flex ly-2 has-gap">
+          <div class="input-container ly-flex ly-3 has-gap">
+            <div>
+              <label for="distance" i18n:translate="">Distance (Km):</label>
+              ${form.errorlist('distance')}
+              ${form.text('distance', size=4, **{'class': "number"})}
+            </div>
               <div>
                   <label for="start_date" i18n:translate="">Start date (dd/mm/yyyy)</label>
@@ -73 +84 @@
             </div>
           </div>
-
-          <p>
-              <label for="distance" i18n:translate="">Distance (Km):</label>
-              ${form.errorlist('distance')}
-              ${form.text('distance', size=4, **{'class': "number"})}
-          </p>
           <div>
             <label for="notes" i18n:translate="">Notes:</label>

ow/templates/edit_manual_workout.pt

@@ -23 +23 @@
   </metal:title>
 
+  <metal:form-title metal:fill-slot="form-title">
+    <tal:t i18n:translate="">Edit workout</tal:t>
+  </metal:form-title>
+
 </html>

ow/views/workout.py

@@ -128 +128 @@
         return HTTPFound(location=request.resource_url(context))
 
+
+    # round some values before rendering
+    if form.data['distance']:
+        form.data['distance'] = round(form.data['distance'], 2)
+
     return {
         'form': FormRenderer(form)