diff --git a/Pipfile b/Pipfile index 391f45c0..1b4fc8ef 100644 --- a/Pipfile +++ b/Pipfile @@ -34,4 +34,5 @@ mkdocs = "*" mkdocs-material = "*" tblib = "*" black = "*" +djlint = "*" pysnooper = "*" diff --git a/babybuddy/static_src/fontello/demo.html b/babybuddy/static_src/fontello/demo.html index 5ae766f2..5f424dab 100644 --- a/babybuddy/static_src/fontello/demo.html +++ b/babybuddy/static_src/fontello/demo.html @@ -1,9 +1,9 @@ - - - - - - - - -
-

babybuddy font demo

- -
-
-
-
- icon-add0xe800 + + + +
+

+ babybuddy font demo +

+
-
- icon-camera0xe801 +
+
+
+ icon-add0xe800 +
+
+ icon-camera0xe801 +
+
+ icon-chat0xe802 +
+
+ icon-delete0xe803 +
+
+
+
+ icon-mail0xe804 +
+
+ icon-false0xe805 +
+
+ icon-graph0xe806 +
+
+ icon-list0xe807 +
+
+
+
+ icon-lock0xe808 +
+
+ icon-refresh0xe809 +
+
+ icon-stop0xe80a +
+
+ icon-timer0xe80b +
+
+
+
+ icon-true0xe80c +
+
+ icon-update0xe80d +
+
+ icon-user0xe80e +
+
+ icon-clock0xe80f +
+
+
+
+ icon-calendar0xe810 +
+
+ icon-arrow-up0xe811 +
+
+ icon-arrow-down0xe812 +
+
+ icon-cancel0xe813 +
+
+
+
+ icon-head-circumference0xe814 +
+
+ icon-measurements0xe815 +
+
+ icon-height0xf044 +
+
+ icon-dashboard0xf0e4 +
+
+
+
+ icon-tummytime0xf118 +
+
+ icon-sad0xf119 +
+
+ icon-source0xf126 +
+
+ icon-angle-circled-left0xf137 +
+
+
+
+ icon-angle-circled-right0xf138 +
+
+ icon-child0xf1ae +
+
+ icon-feeding0xf1b1 +
+
+ icon-activities0xf1b3 +
+
+
+
+ icon-timeline0xf1da +
+
+ icon-diaperchange0xf1f8 +
+
+ icon-sleep0xf236 +
+
+ icon-note0xf249 +
+
+
+
+ icon-weight0xf24e +
+
+ icon-today0xf274 +
+
+ icon-bmi0xf295 +
+
+ icon-temperature0xf2c8 +
+
+
+
+ icon-pumping0xf4a7 +
+
-
- icon-chat0xe802 +
+ Generated by fontello.com
-
- icon-delete0xe803 -
-
-
-
- icon-mail0xe804 -
-
- icon-false0xe805 -
-
- icon-graph0xe806 -
-
- icon-list0xe807 -
-
-
-
- icon-lock0xe808 -
-
- icon-refresh0xe809 -
-
- icon-stop0xe80a -
-
- icon-timer0xe80b -
-
-
-
- icon-true0xe80c -
-
- icon-update0xe80d -
-
- icon-user0xe80e -
-
- icon-clock0xe80f -
-
-
-
- icon-calendar0xe810 -
-
- icon-arrow-up0xe811 -
-
- icon-arrow-down0xe812 -
-
- icon-cancel0xe813 -
-
-
-
- icon-head-circumference0xe814 -
-
- icon-measurements0xe815 -
-
- icon-height0xf044 -
-
- icon-dashboard0xf0e4 -
-
-
-
- icon-tummytime0xf118 -
-
- icon-sad0xf119 -
-
- icon-source0xf126 -
-
- icon-angle-circled-left0xf137 -
-
-
-
- icon-angle-circled-right0xf138 -
-
- icon-child0xf1ae -
-
- icon-feeding0xf1b1 -
-
- icon-activities0xf1b3 -
-
-
-
- icon-timeline0xf1da -
-
- icon-diaperchange0xf1f8 -
-
- icon-sleep0xf236 -
-
- icon-note0xf249 -
-
-
-
- icon-weight0xf24e -
-
- icon-today0xf274 -
-
- icon-bmi0xf295 -
-
- icon-temperature0xf2c8 -
-
-
-
- icon-pumping0xf4a7 -
-
-
-
Generated by fontello.com
- + diff --git a/babybuddy/templates/admin/base_site.html b/babybuddy/templates/admin/base_site.html index 86601be9..a3eb55aa 100644 --- a/babybuddy/templates/admin/base_site.html +++ b/babybuddy/templates/admin/base_site.html @@ -1,10 +1,11 @@ {% extends "admin/base.html" %} {% load i18n %} - -{% block title %}{{ title }} | {% trans "Database Admin"%}{% endblock %} - -{% block branding %} -

{% trans "Database Admin"%}

+{% block title %} + {{ title }} | {% trans "Database Admin" %} +{% endblock %} +{% block branding %} +

+ {% trans "Database Admin" %} +

{% endblock %} - {% block nav-global %}{% endblock %} diff --git a/babybuddy/templates/babybuddy/base.html b/babybuddy/templates/babybuddy/base.html index 2d921009..bf7a029c 100644 --- a/babybuddy/templates/babybuddy/base.html +++ b/babybuddy/templates/babybuddy/base.html @@ -2,51 +2,48 @@ {% get_current_language as LANGUAGE_CODE %} {% get_current_locale as LOCALE %} {% get_current_timezone as TIMEZONE %} - - - - {% block title %}{% endblock %} | Baby Buddy - - - - - - - - - - - - - - - - - - - - -{% block nav %}{% endblock %} - -{% block breadcrumb_nav %} - -{% endblock %} - -{% block page %}{% endblock %} - - - - {% if user.is_authenticated %} - - {% endif %} - -{% block javascript %}{% endblock %} - + + + + {% block title %}{% endblock %} + | Baby Buddy + + + + + + + + + + + + + + + + + + + + {% block nav %}{% endblock %} + {% block breadcrumb_nav %} + + {% endblock %} + {% block page %}{% endblock %} + + + {% if user.is_authenticated %}{% endif %} + {% block javascript %}{% endblock %} + diff --git a/babybuddy/templates/babybuddy/filter.html b/babybuddy/templates/babybuddy/filter.html index 1b22ec0f..d7f9d851 100644 --- a/babybuddy/templates/babybuddy/filter.html +++ b/babybuddy/templates/babybuddy/filter.html @@ -1,11 +1,13 @@ {% load i18n widget_tweaks %} - -
+
{% for field in filter.form %} - +
{% if 'choice' or 'boolean' in field|field_type %} {{ field|add_class:"form-select form-select-sm" }} @@ -19,16 +21,13 @@ {% trans "Reset" %}
- +
-

+ aria-controls="filter_form">{% trans "Filters" %}

diff --git a/babybuddy/templates/babybuddy/form.html b/babybuddy/templates/babybuddy/form.html index 248fe491..099a408b 100644 --- a/babybuddy/templates/babybuddy/form.html +++ b/babybuddy/templates/babybuddy/form.html @@ -1,5 +1,4 @@ {% load i18n widget_tweaks %} - {# Load any form-javascript files #} {{ form.media.js }}
@@ -7,9 +6,7 @@ {% csrf_token %} {% for field in form %} {{ field.widget }} -
- {% include 'babybuddy/form_field.html' %} -
+
{% include 'babybuddy/form_field.html' %}
{% endfor %} diff --git a/babybuddy/templates/babybuddy/form_field.html b/babybuddy/templates/babybuddy/form_field.html index 9ea32c71..41509f78 100644 --- a/babybuddy/templates/babybuddy/form_field.html +++ b/babybuddy/templates/babybuddy/form_field.html @@ -1,7 +1,7 @@ {% load widget_tweaks %} -
-
diff --git a/babybuddy/templates/babybuddy/messages.html b/babybuddy/templates/babybuddy/messages.html index db3f80a6..4e34d577 100644 --- a/babybuddy/templates/babybuddy/messages.html +++ b/babybuddy/templates/babybuddy/messages.html @@ -1,11 +1,14 @@ {% load i18n %} - {% block messages %} {% if messages %} {% for message in messages %} - + {% endblock %} diff --git a/babybuddy/templates/babybuddy/page.html b/babybuddy/templates/babybuddy/page.html index 063b2ae7..9237d0a1 100644 --- a/babybuddy/templates/babybuddy/page.html +++ b/babybuddy/templates/babybuddy/page.html @@ -1,8 +1,8 @@ {% extends 'babybuddy/nav-dropdown.html' %} {% load static timers %} - {% block page %} -
+
{% include 'babybuddy/messages.html' %} @@ -10,4 +10,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/babybuddy/paginator.html b/babybuddy/templates/babybuddy/paginator.html index d539e431..2a7a2fc3 100644 --- a/babybuddy/templates/babybuddy/paginator.html +++ b/babybuddy/templates/babybuddy/paginator.html @@ -1,18 +1,17 @@ {% load i18n babybuddy %} - {% if is_paginated %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/babybuddy/templates/babybuddy/user_add_device.html b/babybuddy/templates/babybuddy/user_add_device.html index fbe2c755..2f2246c8 100644 --- a/babybuddy/templates/babybuddy/user_add_device.html +++ b/babybuddy/templates/babybuddy/user_add_device.html @@ -1,16 +1,14 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks babybuddy qr_code %} - -{% block title %}{% trans "Add a device" %}{% endblock %} - +{% block title %} + {% trans "Add a device" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "User" %}
  • {% trans "Add a device" %}
    • {% endblock %} - {% block content %}

    {% trans "Add a device" %}

    -
    {% trans "Authentication Methods" %}
    @@ -20,16 +18,19 @@
    {% csrf_token %} {{ user.settings.api_key }} - +
    -
    - {% qr_from_text qr_code_data size="s" %} -
    +
    {% qr_from_text qr_code_data size="s" %}
    diff --git a/babybuddy/templates/babybuddy/user_confirm_delete.html b/babybuddy/templates/babybuddy/user_confirm_delete.html index e1447dcc..a047650d 100644 --- a/babybuddy/templates/babybuddy/user_confirm_delete.html +++ b/babybuddy/templates/babybuddy/user_confirm_delete.html @@ -1,21 +1,24 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete User" %}{% endblock %} - +{% block title %} + {% trans "Delete User" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Users" %}
    • +
  • + {% trans "Users" %} +
  • {{ object }}
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/babybuddy/user_confirm_unlock.html b/babybuddy/templates/babybuddy/user_confirm_unlock.html index c639ab31..7a2b7d2d 100644 --- a/babybuddy/templates/babybuddy/user_confirm_unlock.html +++ b/babybuddy/templates/babybuddy/user_confirm_unlock.html @@ -1,21 +1,25 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Unlock User" %}{% endblock %} - +{% block title %} + {% trans "Unlock User" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Users" %}
    • +
  • + {% trans "Users" %} +
  • {{ object }}
  • {% trans "Unlock" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to unlock {{ object }}?

    +

    + Are you sure you want to unlock {{ object }}? +

    {% endblocktrans %} - {% trans "Cancel" %} + {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/babybuddy/user_form.html b/babybuddy/templates/babybuddy/user_form.html index e9682476..722bc927 100644 --- a/babybuddy/templates/babybuddy/user_form.html +++ b/babybuddy/templates/babybuddy/user_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load babybuddy i18n %} - {% block title %} {% if object %} {{ object }} @@ -8,9 +7,10 @@ {% trans "Create User" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Users" %}
    • +
  • + {% trans "Users" %} +
    • {% if object %}
  • {{ object }}
  • {% trans "Update" %}
    • @@ -18,22 +18,20 @@
  • {% trans "Create User" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% user_is_locked object as is_locked %} {% if is_locked %}
    -
    - {% blocktrans %}User locked.{% endblocktrans %} -
    - - {% blocktrans %}Unlock{% endblocktrans %} - +
    {% blocktrans %}User locked.{% endblocktrans %}
    + {% blocktrans %}Unlock{% endblocktrans %}
    {% endif %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Create User" %}

    diff --git a/babybuddy/templates/babybuddy/user_list.html b/babybuddy/templates/babybuddy/user_list.html index a44c5564..c4285049 100644 --- a/babybuddy/templates/babybuddy/user_list.html +++ b/babybuddy/templates/babybuddy/user_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load babybuddy bootstrap i18n widget_tweaks %} - -{% block title %}{% trans "Users" %}{% endblock %} - +{% block title %} + {% trans "Users" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Users" %}
    • {% endblock %} - {% block content %}

    Users

    {% include 'babybuddy/filter.html' %} @@ -40,19 +39,18 @@ {{ is_locked|bool_icon }}
    - {% if perms.admin.change_user %} - + {% endif %} - {% if perms.admin.delete_user %} - + {% endif %} -
    @@ -65,11 +63,9 @@
    {% include 'babybuddy/paginator.html' %} - {% if perms.admin.add_user %} {% trans "Create User" %} {% endif %} - {% endblock %} diff --git a/babybuddy/templates/babybuddy/user_password_form.html b/babybuddy/templates/babybuddy/user_password_form.html index 3b96e379..f17c00bc 100644 --- a/babybuddy/templates/babybuddy/user_password_form.html +++ b/babybuddy/templates/babybuddy/user_password_form.html @@ -1,13 +1,12 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Change Password" %}{% endblock %} - +{% block title %} + {% trans "Change Password" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "User" %}
  • {% trans "Change Password" %}
    • {% endblock %} - {% block content %}

    {% trans "Change Password" %}

    {% include 'babybuddy/form.html' %} diff --git a/babybuddy/templates/babybuddy/user_settings_form.html b/babybuddy/templates/babybuddy/user_settings_form.html index 79eb0ed5..b8f25ae7 100644 --- a/babybuddy/templates/babybuddy/user_settings_form.html +++ b/babybuddy/templates/babybuddy/user_settings_form.html @@ -1,13 +1,12 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks babybuddy %} - -{% block title %}{% trans "User Settings" %}{% endblock %} - +{% block title %} + {% trans "User Settings" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "User" %}
  • {% trans "Settings" %}
    • {% endblock %} - {% block content %}

    {% trans "User Settings" %}

    @@ -81,12 +80,18 @@
    {{ user.settings.api_key }} - +
    - +
    {% endblock %} diff --git a/babybuddy/templates/babybuddy/welcome.html b/babybuddy/templates/babybuddy/welcome.html index b5de1523..2d652254 100644 --- a/babybuddy/templates/babybuddy/welcome.html +++ b/babybuddy/templates/babybuddy/welcome.html @@ -1,18 +1,17 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Welcome!" %}{% endblock %} - +{% block title %} + {% trans "Welcome!" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Welcome!" %}
    • {% endblock %} - {% block content %}

    {% trans "Welcome to Baby Buddy!" %}

    - {% blocktrans trimmed%} + {% blocktrans trimmed %} Learn about and predict baby's needs without (as much) guess work by using Baby Buddy to track — {% endblocktrans %} @@ -80,4 +79,4 @@

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/dbsettings/site_settings.html b/babybuddy/templates/dbsettings/site_settings.html index 95c86403..3c484605 100644 --- a/babybuddy/templates/dbsettings/site_settings.html +++ b/babybuddy/templates/dbsettings/site_settings.html @@ -1,13 +1,12 @@ {% extends 'babybuddy/page.html' %} {% load i18n %} - -{% block title %}{% trans "Site Settings" %}{% endblock %} - +{% block title %} + {% trans "Site Settings" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Site" %}
  • {% trans "Settings" %}
    • {% endblock %} - {% block content %}

    {% trans "Site Settings" %}

    {% include 'babybuddy/form.html' %} diff --git a/babybuddy/templates/error/400.html b/babybuddy/templates/error/400.html index 5c427449..691ea61a 100644 --- a/babybuddy/templates/error/400.html +++ b/babybuddy/templates/error/400.html @@ -1,8 +1,8 @@ {% extends 'error/base.html' %} {% load i18n %} - -{% block title %}400 {% trans "Bad Request" %}{% endblock %} - +{% block title %} + 400 {% trans "Bad Request" %} +{% endblock %} {% block content %}

    400 {% trans "Bad Request" %}

    {% endblock %} diff --git a/babybuddy/templates/error/403.html b/babybuddy/templates/error/403.html index a2ed8121..b8b65699 100644 --- a/babybuddy/templates/error/403.html +++ b/babybuddy/templates/error/403.html @@ -1,8 +1,8 @@ {% extends 'error/base.html' %} {% load i18n %} - -{% block title %}403 {% trans "Permission Denied" %}{% endblock %} - +{% block title %} + 403 {% trans "Permission Denied" %} +{% endblock %} {% block content %}

    403 {% trans "Permission Denied" %}

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/error/403_csrf_bad_origin.html b/babybuddy/templates/error/403_csrf_bad_origin.html index 1d0dace8..0e91956b 100644 --- a/babybuddy/templates/error/403_csrf_bad_origin.html +++ b/babybuddy/templates/error/403_csrf_bad_origin.html @@ -1,15 +1,10 @@ {% extends 'error/base.html' %} {% load i18n %} - {% block title %}403 {{ title }}{% endblock %} - {% block breadcrumb_nav %}{% endblock %} - {% block content %}

    403: {{ title }}

    - +

    {% trans "How to Fix" %}

    diff --git a/babybuddy/templates/error/404.html b/babybuddy/templates/error/404.html index 51793f57..ead1126e 100644 --- a/babybuddy/templates/error/404.html +++ b/babybuddy/templates/error/404.html @@ -1,8 +1,8 @@ {% extends 'error/base.html' %} {% load i18n %} - -{% block title %}404 {% trans "Page Not Found" %}{% endblock %} - +{% block title %} + 404 {% trans "Page Not Found" %} +{% endblock %} {% block content %}

    404 {% trans "Page Not Found" %}

    @@ -10,4 +10,4 @@ The path {{ request_path }} does not exist. {% endblocktrans %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/error/500.html b/babybuddy/templates/error/500.html index d279de55..6ce44d20 100644 --- a/babybuddy/templates/error/500.html +++ b/babybuddy/templates/error/500.html @@ -1,8 +1,8 @@ {% extends 'error/base.html' %} {% load i18n %} - -{% block title %}500 {% trans "Server Error" %}{% endblock %} - +{% block title %} + 500 {% trans "Server Error" %} +{% endblock %} {% block content %}

    500 {% trans "Server Error" %}

    {% endblock %} diff --git a/babybuddy/templates/error/base.html b/babybuddy/templates/error/base.html index 3b4b33c2..daa3068a 100644 --- a/babybuddy/templates/error/base.html +++ b/babybuddy/templates/error/base.html @@ -1,8 +1,6 @@ {% extends 'babybuddy/base.html' %} {% load i18n static %} - {% block breadcrumb_nav %}{% endblock %} - {% block page %}
    @@ -11,7 +9,8 @@
    {% block content %}{% endblock %} - {% trans "Return to Baby Buddy" %} + {% trans "Return to Baby Buddy" %}
    diff --git a/babybuddy/templates/error/lockout.html b/babybuddy/templates/error/lockout.html index ed3c1b16..f4d668d3 100644 --- a/babybuddy/templates/error/lockout.html +++ b/babybuddy/templates/error/lockout.html @@ -1,8 +1,8 @@ {% extends 'error/base.html' %} {% load babybuddy i18n %} - -{% block title %}403 {% trans "Too Many Login Attempts" %}{% endblock %} - +{% block title %} + 403 {% trans "Too Many Login Attempts" %} +{% endblock %} {% block content %}

    {% axes_lockout_message %}

    {% endblock %} diff --git a/babybuddy/templates/registration/base.html b/babybuddy/templates/registration/base.html index b117ee0a..0b388e23 100644 --- a/babybuddy/templates/registration/base.html +++ b/babybuddy/templates/registration/base.html @@ -1,8 +1,6 @@ {% extends "babybuddy/base.html" %} {% load static widget_tweaks %} - {% block breadcrumb_nav %}{% endblock %} - {% block page %}
    @@ -11,10 +9,10 @@ Baby Buddy -
    -
    - {% include 'babybuddy/messages.html' %} - {% block content %}{% endblock %} -
    +
    + {% include 'babybuddy/messages.html' %} + {% block content %}{% endblock %} +
    +
    {% endblock %} diff --git a/babybuddy/templates/registration/login.html b/babybuddy/templates/registration/login.html index ff043ee2..d13a0010 100644 --- a/babybuddy/templates/registration/login.html +++ b/babybuddy/templates/registration/login.html @@ -1,36 +1,23 @@ {% extends "registration/base.html" %} {% load i18n static widget_tweaks %} - {% block title %}Login{% endblock %} {% block content %} -
    - - {% trans "Forgot your password?" %} + {% trans "Forgot your password?" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/registration/password_reset_complete.html b/babybuddy/templates/registration/password_reset_complete.html index 0c1441f4..5b7fd02d 100644 --- a/babybuddy/templates/registration/password_reset_complete.html +++ b/babybuddy/templates/registration/password_reset_complete.html @@ -1,12 +1,13 @@ {% extends "registration/base.html" %} {% load i18n %} - -{% block title %}{% trans "Password Reset Successfully!" %}{% endblock %} +{% block title %} + {% trans "Password Reset Successfully!" %} +{% endblock %} {% block content %} -

    {% trans "Your password has been set. You may go ahead and log in now." %}

    -

    {% trans "Log in" %}

    +

    + {% trans "Log in" %} +

    - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/registration/password_reset_confirm.html b/babybuddy/templates/registration/password_reset_confirm.html index d45e0a00..3bb19814 100644 --- a/babybuddy/templates/registration/password_reset_confirm.html +++ b/babybuddy/templates/registration/password_reset_confirm.html @@ -1,46 +1,34 @@ {% extends "registration/base.html" %} {% load i18n static widget_tweaks %} - -{% block title %}{% trans "Password Reset" %}{% endblock %} +{% block title %} + {% trans "Password Reset" %} +{% endblock %} {% block content %} -
    {% csrf_token %} - {% if form.errors %}

    - {% blocktrans trimmed %} - Oh snap! The two passwords did not - match. Please try again. - {% endblocktrans %} + {% blocktrans trimmed %} + Oh snap! The two passwords did not + match. Please try again. + {% endblocktrans %}

    {% endif %} -

    {% trans "Enter your new password in each field below." %}

    - - +
    {% render_field form.new_password1 name='new_password1' class+='form-control' id='password1-input-group' %}
    - - +
    {% render_field form.new_password2 name='new_password2' class+='form-control' id='password2-input-group' %}
    - - +
    - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/registration/password_reset_done.html b/babybuddy/templates/registration/password_reset_done.html index c1efb5e2..db0d3145 100644 --- a/babybuddy/templates/registration/password_reset_done.html +++ b/babybuddy/templates/registration/password_reset_done.html @@ -1,22 +1,22 @@ {% extends "registration/base.html" %} {% load i18n %} - -{% block title %}{% trans "Reset Email Sent" %}{% endblock %} +{% block title %} + {% trans "Reset Email Sent" %} +{% endblock %} {% block content %} -

    - {% blocktrans trimmed %}We've emailed you instructions for setting your - password, if an account exists with the email you entered. You - should receive them shortly. - {% endblocktrans %} + {% blocktrans trimmed %} + We've emailed you instructions for setting your + password, if an account exists with the email you entered. You + should receive them shortly. + {% endblocktrans %}

    - {% blocktrans trimmed %} - If you don't receive an email, please make sure you've entered the - address you registered with, and check your spam folder. - {% endblocktrans %} + {% blocktrans trimmed %} + If you don't receive an email, please make sure you've entered the + address you registered with, and check your spam folder. + {% endblocktrans %}

    - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/babybuddy/templates/registration/password_reset_email.html b/babybuddy/templates/registration/password_reset_email.html index 63b6421d..6fa6b32d 100644 --- a/babybuddy/templates/registration/password_reset_email.html +++ b/babybuddy/templates/registration/password_reset_email.html @@ -1,12 +1,10 @@ -{% load i18n %}{% autoescape off %} -{% blocktranslate %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktranslate %} - -{% translate "Please go to the following page and choose a new password:" %} -{% block reset_link %} -{{ protocol }}://{{ domain }}{% url 'babybuddy:password_reset_confirm' uidb64=uid token=token %} -{% endblock %} -{% translate 'Your username, in case you’ve forgotten:' %} {{ user.get_username }} - -{% translate "Thanks for using Baby Buddy!" %} - +{% load i18n %} +{% autoescape off %} + {% blocktranslate %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktranslate %} + {% translate "Please go to the following page and choose a new password:" %} + {% block reset_link %} + {{ protocol }}://{{ domain }}{% url 'babybuddy:password_reset_confirm' uidb64=uid token=token %} + {% endblock %} + {% translate 'Your username, in case you’ve forgotten:' %} {{ user.get_username }} + {% translate "Thanks for using Baby Buddy!" %} {% endautoescape %} diff --git a/babybuddy/templates/registration/password_reset_form.html b/babybuddy/templates/registration/password_reset_form.html index e8991e80..69e26b8a 100644 --- a/babybuddy/templates/registration/password_reset_form.html +++ b/babybuddy/templates/registration/password_reset_form.html @@ -1,33 +1,25 @@ {% extends "registration/base.html" %} {% load i18n static widget_tweaks %} - -{% block title %}{% trans "Forgot Password" %}{% endblock %} +{% block title %} + {% trans "Forgot Password" %} +{% endblock %} {% block content %} -

    - {% blocktrans trimmed %} - Enter your account email address in the form below. If the address - is valid, you will receive instructions for resetting your - password. - {% endblocktrans %} + {% blocktrans trimmed %} + Enter your account email address in the form below. If the address + is valid, you will receive instructions for resetting your + password. + {% endblocktrans %}

    -
    {% csrf_token %} - - +
    {% render_field form.email name='email' class+='form-control' id='email-input-group' placeholder=form.email.label %}
    - - +
    - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/bmi_confirm_delete.html b/core/templates/core/bmi_confirm_delete.html index 4154013d..154eec71 100644 --- a/core/templates/core/bmi_confirm_delete.html +++ b/core/templates/core/bmi_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a BMI Entry" %}{% endblock %} - +{% block title %} + {% trans "Delete a BMI Entry" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "BMI" %}
    • +
  • + {% trans "BMI" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/bmi_form.html b/core/templates/core/bmi_form.html index e1eb3e6c..f8cc30f1 100644 --- a/core/templates/core/bmi_form.html +++ b/core/templates/core/bmi_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load i18n %} - {% block title %} {% if object %} {{ object }} @@ -8,20 +7,22 @@ {% trans "Add a BMI Entry" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "BMI" %}
    • +
  • + {% trans "BMI" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add a BMI Entry" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a BMI Entry" %}

    diff --git a/core/templates/core/bmi_list.html b/core/templates/core/bmi_list.html index a168aac1..467aff94 100644 --- a/core/templates/core/bmi_list.html +++ b/core/templates/core/bmi_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "BMI" %}{% endblock %} - +{% block title %} + {% trans "BMI" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "BMI" %}
    • {% endblock %} - {% block content %}

    {% trans "BMI" %} @@ -34,34 +33,35 @@ {% for bmi in object_list %} -
    - +
    {% if perms.core.change_bmi %} {% endif %} - {% if perms.core.delete_bmi %} {% endif %} -
    {{ bmi.date }} {% if not unique_child %} - {{ bmi.child }} + + {{ bmi.child }} + {% endif %} {{ bmi.bmi }} - - {% include "core/render_tag_list.html" with tags=bmi.tags.all %} - + {% include "core/render_tag_list.html" with tags=bmi.tags.all %} {% if bmi.notes %} - {{ bmi.notes }} + + {{ bmi.notes }} + {% endif %} {% empty %} @@ -73,4 +73,4 @@
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/child_confirm_delete.html b/core/templates/core/child_confirm_delete.html index 48f114a5..d19e251a 100644 --- a/core/templates/core/child_confirm_delete.html +++ b/core/templates/core/child_confirm_delete.html @@ -1,19 +1,24 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Child" %}{% endblock %} - +{% block title %} + {% trans "Delete a Child" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Children" %}
    • -
  • {{ object }}
    • +
  • + {% trans "Children" %} +
    • +
  • + {{ object }} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %}
    {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/child_detail.html b/core/templates/core/child_detail.html index 88cebe57..551d4b8e 100644 --- a/core/templates/core/child_detail.html +++ b/core/templates/core/child_detail.html @@ -1,37 +1,34 @@ {% extends 'babybuddy/page.html' %} {% load breadcrumb duration i18n imagekit static %} - {% block title %}{{ object }}{% endblock %} - {% block breadcrumbs %} -
  • {% trans "Children" %}
    • -
  • - {% child_quick_switch object 'core:child' %} +
  • + {% trans "Children" %}
    • +
  • {% child_quick_switch object 'core:child' %}
    • {% endblock %} - {% block content %}
    {% if object.picture %} {% thumbnail '150x150' object.picture as thumb %} - - {% else %} - - {% endif %} -
    {{ object }}
    -

    - {% trans "Born" %} {{ object.birth_datetime }}
    - {% trans "Age" %} {{ object.birth_datetime|child_age_string }} -

    - {% include 'dashboard/child_button_group.html' %} + + {% else %} + + {% endif %} +
    {{ object }}
    +

    + {% trans "Born" %} {{ object.birth_datetime }} +
    + {% trans "Age" %} {{ object.birth_datetime|child_age_string }} +

    + {% include 'dashboard/child_button_group.html' %} +
    -

    -
    -
    - {% include 'timeline/_timeline.html' %} +
    +
    {% include 'timeline/_timeline.html' %}
    -
    -{% endblock %} + {% endblock %} diff --git a/core/templates/core/child_form.html b/core/templates/core/child_form.html index 08ea6fea..f16ff462 100644 --- a/core/templates/core/child_form.html +++ b/core/templates/core/child_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load i18n %} - {% block title %} {% if object %} {{ object }} @@ -8,24 +7,28 @@ {% trans "Add a Child" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Children" %}
    • +
  • + {% trans "Children" %} +
    • {% if object %} -
  • {{ object }}
    • +
  • + {{ object }} +
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add a Child" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Child" %}

    {% endif %} {% include 'babybuddy/form.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/child_list.html b/core/templates/core/child_list.html index 6a529c07..14259a2b 100644 --- a/core/templates/core/child_list.html +++ b/core/templates/core/child_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load i18n imagekit static widget_tweaks %} - -{% block title %}{% trans "Children" %}{% endblock %} - +{% block title %} + {% trans "Children" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Children" %}
    • {% endblock %} - {% block content %}

    {% trans "Children" %} @@ -21,7 +20,9 @@ - + @@ -35,7 +36,10 @@ {% if child.picture %} {% include "core/child_thumbnail.html" %} {% else %} - + {% endif %} diff --git a/core/templates/core/child_quick_switch.html b/core/templates/core/child_quick_switch.html index 18b00289..a75a3e18 100644 --- a/core/templates/core/child_quick_switch.html +++ b/core/templates/core/child_quick_switch.html @@ -1,18 +1,27 @@ {% load i18n %} - {{ current_child }} {% if children.count > 0 %} -
    {% trans "Switch to…" %}
    {% for child in children %} - + {% include "core/child_thumbnail.html" %} {{ child }} diff --git a/core/templates/core/child_radio.html b/core/templates/core/child_radio.html index 32394840..ec0e3701 100644 --- a/core/templates/core/child_radio.html +++ b/core/templates/core/child_radio.html @@ -1,10 +1,13 @@ {% with id=widget.attrs.id %} - +
    {% for group, options, index in widget.optgroups %} {% for option in options %} {% if option.value != '' %} - {% include option.template_name with widget=option %} + {% include option.template_name with widget=option %} {% endif %} {% endfor %} {% endfor %} -
    {% endwith %} +
    +{% endwith %} diff --git a/core/templates/core/child_radio_option.html b/core/templates/core/child_radio_option.html index a14d5fe9..c199fcdf 100644 --- a/core/templates/core/child_radio_option.html +++ b/core/templates/core/child_radio_option.html @@ -1,7 +1,7 @@ {% load imagekit static %} - {% include "django/forms/widgets/input.html" %} - + diff --git a/core/templates/core/child_thumbnail.html b/core/templates/core/child_thumbnail.html index 6ffa9382..1fe2c994 100644 --- a/core/templates/core/child_thumbnail.html +++ b/core/templates/core/child_thumbnail.html @@ -1,9 +1,10 @@ {% load imagekit static %} - {% if child.picture %} {% thumbnail '40x40' child.picture as thumb %} - -{% else %} - -{% endif %} + + {% else %} + + {% endif %} diff --git a/core/templates/core/diaperchange_confirm_delete.html b/core/templates/core/diaperchange_confirm_delete.html index 058450a4..0561c24f 100644 --- a/core/templates/core/diaperchange_confirm_delete.html +++ b/core/templates/core/diaperchange_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Diaper Change" %}{% endblock %} - +{% block title %} + {% trans "Delete a Diaper Change" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Diaper Changes" %}
    • +
  • + {% trans "Diaper Changes" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/diaperchange_form.html b/core/templates/core/diaperchange_form.html index d46f30d8..9ad7d33d 100644 --- a/core/templates/core/diaperchange_form.html +++ b/core/templates/core/diaperchange_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n %} - {% block title %} {% if request.resolver_match.url_name == 'diaperchange-update' %} {% trans "Update a Diaper Change" %} @@ -8,20 +7,22 @@ {% trans "Add a Diaper Change" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Diaper Changes" %}
    • +
  • + {% trans "Diaper Changes" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Diaper Change" %}

    diff --git a/core/templates/core/diaperchange_list.html b/core/templates/core/diaperchange_list.html index 6e269641..dd909b5f 100644 --- a/core/templates/core/diaperchange_list.html +++ b/core/templates/core/diaperchange_list.html @@ -1,17 +1,17 @@ {% extends 'babybuddy/page.html' %} {% load bootstrap datetime i18n widget_tweaks %} - -{% block title %}{% trans "Diaper Changes" %}{% endblock %} - +{% block title %} + {% trans "Diaper Changes" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Diaper Changes" %}
    • {% endblock %} - {% block content %}

    {% trans "Diaper Changes" %} {% if perms.core.add_diaperchange %} - + {% trans "Add Diaper Change" %} {% endif %} @@ -36,39 +36,46 @@ {% for change in object_list %}

    {% if not unique_child %} - + {% endif %} - + {% if change.notes %} - + {% endif %} {% empty %} @@ -80,4 +87,4 @@
    + + {% trans "First Name" %} {% trans "Last Name" %} {% trans "Birth Date" %} @@ -44,20 +48,21 @@ {{ child.last_name }} {{ child.birth_datetime }} -
    - +
    {% if perms.core.change_child %} - + {% endif %} - {% if perms.core.delete_child %} - + {% endif %} -
    -
    - +
    {% if perms.core.change_diaperchange %} - + {% endif %} - {% if perms.core.delete_diaperchange %} - + {% endif %} -
    		{{ change.time|datetime_short }}{{ change.child }} + {{ change.child }} + - {% if change.wet %}💦{% endif %} - {% if change.solid %}💩{% endif %} + {% if change.wet %} + 💦 + {% endif %} + {% if change.solid %} + 💩 + {% endif %} {{ change.get_color_display }} {{ change.amount|default_if_none:"" }} - {% include "core/render_tag_list.html" with tags=change.tags.all %} - {% include "core/render_tag_list.html" with tags=change.tags.all %}
    {{ change.notes }} + {{ change.notes }} +

    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/feeding_confirm_delete.html b/core/templates/core/feeding_confirm_delete.html index 5ccfac54..46db2522 100644 --- a/core/templates/core/feeding_confirm_delete.html +++ b/core/templates/core/feeding_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Feeding" %}{% endblock %} - +{% block title %} + {% trans "Delete a Feeding" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Feedings" %}
    • +
  • + {% trans "Feedings" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/feeding_form.html b/core/templates/core/feeding_form.html index 3996f727..7c9fc7aa 100644 --- a/core/templates/core/feeding_form.html +++ b/core/templates/core/feeding_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n %} - {% block title %} {% if request.resolver_match.url_name == 'feeding-update' %} {% trans "Update a Feeding" %} @@ -10,20 +9,22 @@ {% trans "Add a Feeding" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Feedings" %}
    • +
  • + {% trans "Feedings" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% elif request.resolver_match.url_name == 'bottle-feeding-add' %}

    {% trans "Add a Bottle Feeding" %}

    diff --git a/core/templates/core/feeding_list.html b/core/templates/core/feeding_list.html index 9f64e936..281e280d 100644 --- a/core/templates/core/feeding_list.html +++ b/core/templates/core/feeding_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load datetime duration i18n widget_tweaks %} - -{% block title %}{% trans "Feedings" %}{% endblock %} - +{% block title %} + {% trans "Feedings" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Feedings" %}
    • {% endblock %} - {% block content %}

    {% trans "Feedings" %} @@ -38,41 +37,42 @@ {% for feeding in object_list %} -
    - +
    {% if perms.core.change_feeding %} - + {% endif %} - {% if perms.core.delete_feeding %} - + {% endif %} -
    {{ feeding.start|datetime_short }} {% if not unique_child %} - {{ feeding.child }} + + {{ feeding.child }} + {% endif %} {{ feeding.get_method_display }} {{ feeding.get_type_display }} - {% if feeding.amount %} - {{ feeding.amount }} - {% endif %} + {% if feeding.amount %}{{ feeding.amount }}{% endif %} {{ feeding.duration|duration_string }} - - {% include "core/render_tag_list.html" with tags=feeding.tags.all %} - + {% include "core/render_tag_list.html" with tags=feeding.tags.all %} {% if feeding.notes %} - {{ feeding.notes }} + + {{ feeding.notes }} + {% endif %} {% empty %} @@ -84,4 +84,4 @@
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/head_circumference_confirm_delete.html b/core/templates/core/head_circumference_confirm_delete.html index 4ae3a442..dc1b0e10 100644 --- a/core/templates/core/head_circumference_confirm_delete.html +++ b/core/templates/core/head_circumference_confirm_delete.html @@ -1,20 +1,24 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Head Circumference Entry" %}{% endblock %} - +{% block title %} + {% trans "Delete a Head Circumference Entry" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Head Circumference" %}
    • +
  • + {% trans "Head Circumference" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} - {% trans "Cancel" %} + {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/head_circumference_form.html b/core/templates/core/head_circumference_form.html index 89bccd42..70ce24a3 100644 --- a/core/templates/core/head_circumference_form.html +++ b/core/templates/core/head_circumference_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load i18n %} - {% block title %} {% if object %} {{ object }} @@ -8,20 +7,22 @@ {% trans "Add a Head Circumference Entry" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Head Circumference" %}
    • +
  • + {% trans "Head Circumference" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add a Head Circumference Entry" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Head Circumference Entry" %}

    diff --git a/core/templates/core/head_circumference_list.html b/core/templates/core/head_circumference_list.html index 0342168f..2f1003b7 100644 --- a/core/templates/core/head_circumference_list.html +++ b/core/templates/core/head_circumference_list.html @@ -1,17 +1,17 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Head Circumference" %}{% endblock %} - +{% block title %} + {% trans "Head Circumference" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Head Circumference" %}
    • {% endblock %} - {% block content %}

    {% trans "Head Circumference" %} {% if perms.core.add_head_circumference %} - + {% trans "Add Head Circumference" %} {% endif %} @@ -34,34 +34,37 @@ {% for head_circumference in object_list %} -
    - +
    {% if perms.core.change_head_circumference %} - + {% endif %} - {% if perms.core.delete_head_circumference %} - + {% endif %} -
    {{ head_circumference.date }} {% if not unique_child %} - {{ head_circumference.child }} + + {{ head_circumference.child }} + {% endif %} {{ head_circumference.head_circumference }} - - {% include "core/render_tag_list.html" with tags=head_circumference.tags.all %} - + {% include "core/render_tag_list.html" with tags=head_circumference.tags.all %} {% if head_circumference.notes %} - {{ head_circumference.notes }} + + {{ head_circumference.notes }} + {% endif %} {% empty %} @@ -73,4 +76,4 @@
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/height_confirm_delete.html b/core/templates/core/height_confirm_delete.html index 24a2cc4e..e2082f00 100644 --- a/core/templates/core/height_confirm_delete.html +++ b/core/templates/core/height_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Height Entry" %}{% endblock %} - +{% block title %} + {% trans "Delete a Height Entry" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Height" %}
    • +
  • + {% trans "Height" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/height_form.html b/core/templates/core/height_form.html index 77d08fa1..c4e3992d 100644 --- a/core/templates/core/height_form.html +++ b/core/templates/core/height_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load i18n %} - {% block title %} {% if object %} {{ object }} @@ -8,20 +7,22 @@ {% trans "Add a Height Entry" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Height" %}
    • +
  • + {% trans "Height" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add a Height Entry" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Height Entry" %}

    diff --git a/core/templates/core/height_list.html b/core/templates/core/height_list.html index 3ef6ad9e..f5ffe1a2 100644 --- a/core/templates/core/height_list.html +++ b/core/templates/core/height_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Height" %}{% endblock %} - +{% block title %} + {% trans "Height" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Height" %}
    • {% endblock %} - {% block content %}

    {% trans "Height" %} @@ -34,34 +33,37 @@ {% for height in object_list %} -
    - +
    {% if perms.core.change_height %} - + {% endif %} - {% if perms.core.delete_height %} - + {% endif %} -
    {{ height.date }} {% if not unique_child %} - {{ height.child }} + + {{ height.child }} + {% endif %} {{ height.height }} - - {% include "core/render_tag_list.html" with tags=height.tags.all %} - + {% include "core/render_tag_list.html" with tags=height.tags.all %} {% if height.notes %} - {{ height.notes }} + + {{ height.notes }} + {% endif %} {% empty %} @@ -73,4 +75,4 @@
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/note_confirm_delete.html b/core/templates/core/note_confirm_delete.html index ef3b1f06..0548ceb2 100644 --- a/core/templates/core/note_confirm_delete.html +++ b/core/templates/core/note_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Note" %}{% endblock %} - +{% block title %} + {% trans "Delete a Note" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Notes" %}
    • +
  • + {% trans "Notes" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/note_form.html b/core/templates/core/note_form.html index cbb29bca..3ce323b5 100644 --- a/core/templates/core/note_form.html +++ b/core/templates/core/note_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n %} - {% block title %} {% if request.resolver_match.url_name == 'note-update' %} {% trans "Update a Note" %} @@ -8,20 +7,22 @@ {% trans "Add a Note" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Notes" %}
    • +
  • + {% trans "Notes" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Note" %}

    diff --git a/core/templates/core/note_list.html b/core/templates/core/note_list.html index 7d67186c..b504e9ea 100644 --- a/core/templates/core/note_list.html +++ b/core/templates/core/note_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n imagekit widget_tweaks %} - -{% block title %}{% trans "Notes" %}{% endblock %} - +{% block title %} + {% trans "Notes" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Notes" %}
    • {% endblock %} - {% block content %}

    {% trans "Notes" %} @@ -35,44 +34,45 @@ {% for note in object_list %} -
    - +
    {% if perms.core.change_note %} {% endif %} - {% if perms.core.delete_note %} {% endif %} -
    {{ note.time|datetime_short }} {% if not unique_child %} - {{ note.child }} + + {{ note.child }} + {% endif %} {% if note.image %} {% thumbnail '40x40' note.image as thumb %} - - {% endif %} - - {{ note.note }} - - {% include "core/render_tag_list.html" with tags=note.tags.all %} - - - {% empty %} - - {% trans "No notes found." %} - - {% endfor %} - - -
    - {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file + + + + {% endif %} + + {{ note.note }} + {% include "core/render_tag_list.html" with tags=note.tags.all %} + + {% empty %} + + {% trans "No notes found." %} + + {% endfor %} + + +

    + {% include 'babybuddy/paginator.html' %} + {% endblock %} diff --git a/core/templates/core/pumping_confirm_delete.html b/core/templates/core/pumping_confirm_delete.html index 7be7d42c..2c3cdac0 100644 --- a/core/templates/core/pumping_confirm_delete.html +++ b/core/templates/core/pumping_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Pumping Entry" %}{% endblock %} - +{% block title %} + {% trans "Delete a Pumping Entry" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Pumping" %}
    • +
  • + {% trans "Pumping" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/pumping_form.html b/core/templates/core/pumping_form.html index e5ed7a64..274ac11f 100644 --- a/core/templates/core/pumping_form.html +++ b/core/templates/core/pumping_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n %} - {% block title %} {% if object %} {{ object }} @@ -8,20 +7,22 @@ {% trans "Add a Pumping Entry" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Pumping" %}
    • +
  • + {% trans "Pumping" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add a Pumping Entry" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Pumping Entry" %}

    diff --git a/core/templates/core/pumping_list.html b/core/templates/core/pumping_list.html index 3ba55aac..2155fcb2 100644 --- a/core/templates/core/pumping_list.html +++ b/core/templates/core/pumping_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load datetime duration i18n widget_tweaks %} - -{% block title %}{% trans "Pumping" %}{% endblock %} - +{% block title %} + {% trans "Pumping" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Pumping" %}
    • {% endblock %} - {% block content %}

    {% trans "Pumping" %} @@ -35,35 +34,38 @@ {% for pumping in object_list %} -
    - +
    {% if perms.core.change_pumping %} - + {% endif %} - {% if perms.core.delete_pumping %} - + {% endif %} -
    {{ pumping.start|datetime_short }} {% if not unique_child %} - {{ pumping.child }} + + {{ pumping.child }} + {% endif %} {{ pumping.amount }} {{ pumping.duration|duration_string }} - - {% include "core/render_tag_list.html" with tags=pumping.tags.all %} - + {% include "core/render_tag_list.html" with tags=pumping.tags.all %} {% if pumping.notes %} - {{ pumping.notes }} + + {{ pumping.notes }} + {% endif %} {% empty %} diff --git a/core/templates/core/quick_timer_nav.html b/core/templates/core/quick_timer_nav.html index 04e61fcb..d6a117f9 100644 --- a/core/templates/core/quick_timer_nav.html +++ b/core/templates/core/quick_timer_nav.html @@ -1,34 +1,38 @@ {% load i18n %} - - -
    + {% csrf_token %} {% if children.count > 1 %}
    - - -
    -
    {% trans "Quick Start Timer For…" %}
    - {% for child in children %} - - {% endfor %} -
    -
    - {% else %} - - - {% endif %} + +
    +
    {% trans "Quick Start Timer For…" %}
    + {% for child in children %} + + {% endfor %} +
    +
    +{% else %} + + +{% endif %} diff --git a/core/templates/core/render_tag.html b/core/templates/core/render_tag.html index f5938a0c..6fa6c71e 100644 --- a/core/templates/core/render_tag.html +++ b/core/templates/core/render_tag.html @@ -1,3 +1,3 @@ - - {{ tag.name|escape }} - +{{ tag.name|escape }} diff --git a/core/templates/core/render_tag_list.html b/core/templates/core/render_tag_list.html index 0fb41039..c024080c 100644 --- a/core/templates/core/render_tag_list.html +++ b/core/templates/core/render_tag_list.html @@ -1,5 +1,5 @@ {% for tag in tags %} {% include "core/render_tag.html" %} {% empty %} -- + - {% endfor %} diff --git a/core/templates/core/sleep_confirm_delete.html b/core/templates/core/sleep_confirm_delete.html index 6a2c5a45..87cf3a0a 100644 --- a/core/templates/core/sleep_confirm_delete.html +++ b/core/templates/core/sleep_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Sleep Entry" %}{% endblock %} - +{% block title %} + {% trans "Delete a Sleep Entry" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Sleep" %}
    • +
  • + {% trans "Sleep" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/sleep_form.html b/core/templates/core/sleep_form.html index ec40eaf3..b10bacc8 100644 --- a/core/templates/core/sleep_form.html +++ b/core/templates/core/sleep_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n %} - {% block title %} {% if request.resolver_match.url_name == 'sleep-update' %} {% trans "Update a Sleep Entry" %} @@ -8,20 +7,22 @@ {% trans "Add a Sleep Entry" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Sleep" %}
    • +
  • + {% trans "Sleep" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Sleep Entry" %}

    diff --git a/core/templates/core/sleep_list.html b/core/templates/core/sleep_list.html index 2266574e..58b9400f 100644 --- a/core/templates/core/sleep_list.html +++ b/core/templates/core/sleep_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load bootstrap datetime duration i18n widget_tweaks %} - -{% block title %}{% trans "Sleep" %}{% endblock %} - +{% block title %} + {% trans "Sleep" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Sleep" %}
    • {% endblock %} - {% block content %}

    {% trans "Sleep" %} @@ -36,36 +35,37 @@ {% for sleep in object_list %} -
    - +
    {% if perms.core.change_sleep %} {% endif %} - {% if perms.core.delete_sleep %} {% endif %} -
    {{ sleep.start|datetime_short }} {{ sleep.end|datetime_short }} {% if not unique_child %} - {{ sleep.child }} + + {{ sleep.child }} + {% endif %} {{ sleep.duration|duration_string }} {{ sleep.nap|bool_icon }} - - {% include "core/render_tag_list.html" with tags=sleep.tags.all %} - + {% include "core/render_tag_list.html" with tags=sleep.tags.all %} {% if sleep.notes %} - {{ sleep.notes }} + + {{ sleep.notes }} + {% endif %} {% empty %} @@ -77,4 +77,4 @@
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/temperature_confirm_delete.html b/core/templates/core/temperature_confirm_delete.html index d03b7115..50ac6af2 100644 --- a/core/templates/core/temperature_confirm_delete.html +++ b/core/templates/core/temperature_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Temperature Reading" %}{% endblock %} - +{% block title %} + {% trans "Delete a Temperature Reading" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Temperature" %}
    • +
  • + {% trans "Temperature" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/temperature_form.html b/core/templates/core/temperature_form.html index d27f6ff0..4d7b557a 100644 --- a/core/templates/core/temperature_form.html +++ b/core/templates/core/temperature_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n %} - {% block title %} {% if object %} {{ object }} @@ -8,20 +7,22 @@ {% trans "Add a Temperature Reading" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Temperature" %}
    • +
  • + {% trans "Temperature" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add a Temperature Reading" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Temperature Entry" %}

    diff --git a/core/templates/core/temperature_list.html b/core/templates/core/temperature_list.html index 75fec0b8..40d53302 100644 --- a/core/templates/core/temperature_list.html +++ b/core/templates/core/temperature_list.html @@ -1,17 +1,17 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n widget_tweaks %} - -{% block title %}{% trans "Temperature" %}{% endblock %} - +{% block title %} + {% trans "Temperature" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Temperature" %}
    • {% endblock %} - {% block content %}

    {% trans "Temperature" %} {% if perms.core.add_temperature %} - + {% trans "Add Temperature Reading" %} {% endif %} @@ -34,34 +34,37 @@ {% for temperature in object_list %} -
    - +
    {% if perms.core.change_temperature %} - + {% endif %} - {% if perms.core.delete_temperature %} - + {% endif %} -
    {{ temperature.time|datetime_short }} {% if not unique_child %} - {{ temperature.child }} + + {{ temperature.child }} + {% endif %} {{ temperature.temperature }} - - {% include "core/render_tag_list.html" with tags=temperature.tags.all %} - + {% include "core/render_tag_list.html" with tags=temperature.tags.all %} {% if temperature.notes %} - {{ temperature.notes }} + + {{ temperature.notes }} + {% endif %} {% empty %} @@ -73,4 +76,4 @@
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/timer_confirm_delete.html b/core/templates/core/timer_confirm_delete.html index 50fd342e..b7c9eb7c 100644 --- a/core/templates/core/timer_confirm_delete.html +++ b/core/templates/core/timer_confirm_delete.html @@ -1,23 +1,27 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - {% block title %} {% blocktrans %}Delete {{ object }}{% endblocktrans %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Timers" %}
    • -
  • {{ object }}
    • +
  • + {% trans "Timers" %} +
    • +
  • + {{ object }} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} - {% trans "Cancel" %} + {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/timer_detail.html b/core/templates/core/timer_detail.html index 23dbc3df..674e0fac 100644 --- a/core/templates/core/timer_detail.html +++ b/core/templates/core/timer_detail.html @@ -1,98 +1,85 @@ {% extends 'babybuddy/page.html' %} {% load babybuddy duration i18n timers %} {% get_child_count as CHILD_COUNT %} - {% block title %}{{ object }}{% endblock %} - {% block breadcrumbs %} -
  • {% trans "Timers" %}
    • +
  • + {% trans "Timers" %} +
  • {{ object }}
    • {% endblock %} - {% block content %}
    -

    +

    {{ object.duration|hours }}h {{ object.duration|minutes }}m {{ object.duration|seconds }}s

    - - {% if timer.child and CHILD_COUNT > 1 %} -

    - {{ timer.child }} -

    - {% endif %} - -

    - {% trans "Started" %} {{ object.start }} -

    + {% if timer.child and CHILD_COUNT > 1 %}

    {{ timer.child }}

    {% endif %} +

    {% trans "Started" %} {{ object.start }}

    {% blocktrans trimmed with user=object.user_username %} {{ timer }} created by {{ user }} {% endblocktrans %}

    -
    {% if perms.core.add_feeding %} - - {% trans "Feeding" %} - - {% endif %} - - {% if perms.core.add_pumping %} - - {% trans "Pumping" %} - - {% endif %} - - {% if perms.core.add_sleep %} - - {% trans "Sleep" %} - - {% endif %} - - {% if perms.core.add_tummytime %} - - {% trans "Tummy Time" %} - - {% endif %} -
    - -
    - {% if perms.core.delete_timer %} - - {% endif %} - - {% if perms.core.change_timer %} - - -
    - {% csrf_token %} - - -
    - {% endif %} -
    -
    -
    + + {% trans "Feeding" %} + + {% endif %} + {% if perms.core.add_pumping %} + + {% trans "Pumping" %} + +{% endif %} +{% if perms.core.add_sleep %} + +{% trans "Sleep" %} + +{% endif %} +{% if perms.core.add_tummytime %} + +{% trans "Tummy Time" %} + +{% endif %} +

    +
    + {% if perms.core.delete_timer %} + + {% endif %} + {% if perms.core.change_timer %} + +
    + {% csrf_token %} + + +
    + {% endif %} +
    + + {% endblock %} - {% block javascript %} - -{% endblock %} \ No newline at end of file + +{% endblock %} diff --git a/core/templates/core/timer_form.html b/core/templates/core/timer_form.html index 8c287e6d..1cb3971e 100644 --- a/core/templates/core/timer_form.html +++ b/core/templates/core/timer_form.html @@ -1,22 +1,27 @@ {% extends 'babybuddy/page.html' %} {% load datetime duration i18n %} - -{% block title %}{% trans "Timer" %}{% endblock %} - +{% block title %} + {% trans "Timer" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Timers" %}
    • +
  • + {% trans "Timers" %} +
    • {% if object %} -
  • {{ object }}
    • +
  • + {{ object }} +
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Start" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Start Timer" %}

    diff --git a/core/templates/core/timer_list.html b/core/templates/core/timer_list.html index d15ce517..0d9281e1 100644 --- a/core/templates/core/timer_list.html +++ b/core/templates/core/timer_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load bootstrap datetime duration i18n widget_tweaks %} - -{% block title %}{% trans "Timers" %}{% endblock %} - +{% block title %} + {% trans "Timers" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Timers" %}
    • {% endblock %} - {% block content %}

    {% trans "Timers" %} @@ -20,36 +19,38 @@
    - - - - {% if not unique_child %} - - {% endif %} - - + + + + {% if not unique_child %} + + {% endif %} + + - {% for timer in object_list %} - - - - {% if not unique_child %} + {% for timer in object_list %} + + - {% endif %} - - - {% empty %} - - - - {% endfor %} + {% if not unique_child %} + + {% endif %} + + + {% empty %} + + + + {% endfor %}
    {% trans "Start" %}{% trans "Name" %}{% trans "Child" %}{% trans "User" %}
    {% trans "Start" %}{% trans "Name" %}{% trans "Child" %}{% trans "User" %}
    {{ timer.start|datetime_short }}{{ timer }}
    {{ timer.start|datetime_short }} - {% if timer.child %} - {{ timer.child }} - {% endif %} + {{ timer }} {{ timer.user_username }}
    {% trans "No timer entries found." %}
    + {% if timer.child %} + {{ timer.child }} + {% endif %} + {{ timer.user_username }}
    {% trans "No timer entries found." %}
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/timer_nav.html b/core/templates/core/timer_nav.html index 41efa7af..f9cca97e 100644 --- a/core/templates/core/timer_nav.html +++ b/core/templates/core/timer_nav.html @@ -1,54 +1,57 @@ {% load i18n %} -
  • - -
    - {% if perms.core.add_timer %} - - {% trans "Start Timer" %} - - {% endif %} - {% if perms.core.view_timer %} - - {% trans "View Timers" %} - - {% endif %} - {% if perms.core.add_timer %} -
    - {% csrf_token %} - {% if children.count > 1 %} -
    -
    {% trans "Quick Start Timer For…" %}
    - {% for child in children %} - - {% endfor %} - {% else %} - - {% endif %} -
    - {% endif %} - {% if timers %} -
    -
    {% trans "Timers" %}
    - {% for timer in timers %} - - {{ timer.title_with_child }} - - {% empty %} - {% trans "None" %} - {% endfor %} - {% endif %} -
    + {% endfor %} + {% else %} + + {% endif %} + + {% endif %} + {% if timers %} +
    +
    {% trans "Timers" %}
    + {% for timer in timers %} + {{ timer.title_with_child }} + {% empty %} + {% trans "None" %} + {% endfor %} + {% endif %} +
    • diff --git a/core/templates/core/tummytime_confirm_delete.html b/core/templates/core/tummytime_confirm_delete.html index 757b718f..6a66b51e 100644 --- a/core/templates/core/tummytime_confirm_delete.html +++ b/core/templates/core/tummytime_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Tummy Time Entry" %}{% endblock %} - +{% block title %} + {% trans "Delete a Tummy Time Entry" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Tummy Time" %}
    • +
  • + {% trans "Tummy Time" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/tummytime_form.html b/core/templates/core/tummytime_form.html index 99b98c1d..810cf962 100644 --- a/core/templates/core/tummytime_form.html +++ b/core/templates/core/tummytime_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load datetime i18n %} - {% block title %} {% if request.resolver_match.url_name == 'tummytime-update' %} {% trans "Update a Tummy Time Entry" %} @@ -8,20 +7,22 @@ {% trans "Add a Tummy Time Entry" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Tummy Time" %}
    • +
  • + {% trans "Tummy Time" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Tummy Time Entry" %}

    diff --git a/core/templates/core/tummytime_list.html b/core/templates/core/tummytime_list.html index b8ee2449..3d27e9a9 100644 --- a/core/templates/core/tummytime_list.html +++ b/core/templates/core/tummytime_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load datetime duration i18n widget_tweaks %} - -{% block title %}{% trans "Tummy Time" %}{% endblock %} - +{% block title %} + {% trans "Tummy Time" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Tummy Time" %}
    • {% endblock %} - {% block content %}

    {% trans "Tummy Time" %} @@ -35,32 +34,33 @@ {% for tummytime in object_list %} -
    - +
    {% if perms.core.change_tummytime %} - + {% endif %} - {% if perms.core.delete_tummytime %} - + {% endif %} -
    {{ tummytime.start|datetime_short }} {{ tummytime.end|datetime_short }} {% if not unique_child %} - {{ tummytime.child }} + + {{ tummytime.child }} + {% endif %} {{ tummytime.duration|duration_string }} {{ tummytime.milestone }} - - {% include "core/render_tag_list.html" with tags=tummytime.tags.all %} - + {% include "core/render_tag_list.html" with tags=tummytime.tags.all %} {% empty %} @@ -71,4 +71,4 @@
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/weight_confirm_delete.html b/core/templates/core/weight_confirm_delete.html index 41ae0d7d..87e83e55 100644 --- a/core/templates/core/weight_confirm_delete.html +++ b/core/templates/core/weight_confirm_delete.html @@ -1,20 +1,23 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Delete a Weight Entry" %}{% endblock %} - +{% block title %} + {% trans "Delete a Weight Entry" %} +{% endblock %} {% block breadcrumbs %} -
  • {% trans "Weight" %}
    • +
  • + {% trans "Weight" %} +
  • {% trans "Delete" %}
    • {% endblock %} - {% block content %}
    {% csrf_token %} {% blocktrans trimmed %} -

    Are you sure you want to delete {{ object }}?

    +

    + Are you sure you want to delete {{ object }}? +

    {% endblocktrans %} {% trans "Cancel" %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/weight_form.html b/core/templates/core/weight_form.html index 80aef980..64ac3f6d 100644 --- a/core/templates/core/weight_form.html +++ b/core/templates/core/weight_form.html @@ -1,6 +1,5 @@ {% extends 'babybuddy/page.html' %} {% load i18n %} - {% block title %} {% if object %} {{ object }} @@ -8,20 +7,22 @@ {% trans "Add a Weight Entry" %} {% endif %} {% endblock %} - {% block breadcrumbs %} -
  • {% trans "Weight" %}
    • +
  • + {% trans "Weight" %} +
    • {% if object %}
  • {% trans "Update" %}
    • {% else %}
  • {% trans "Add a Weight Entry" %}
    • {% endif %} {% endblock %} - {% block content %} {% if object %} {% blocktrans trimmed %} -

    Update {{ object }}

    +

    + Update {{ object }} +

    {% endblocktrans %} {% else %}

    {% trans "Add a Weight Entry" %}

    diff --git a/core/templates/core/weight_list.html b/core/templates/core/weight_list.html index 11eec769..433d051c 100644 --- a/core/templates/core/weight_list.html +++ b/core/templates/core/weight_list.html @@ -1,12 +1,11 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} - -{% block title %}{% trans "Weight" %}{% endblock %} - +{% block title %} + {% trans "Weight" %} +{% endblock %} {% block breadcrumbs %}
  • {% trans "Weight" %}
    • {% endblock %} - {% block content %}

    {% trans "Weight" %} @@ -34,34 +33,37 @@ {% for weight in object_list %} -
    - +
    {% if perms.core.change_weight %} - + {% endif %} - {% if perms.core.delete_weight %} - + {% endif %} -
    {{ weight.date }} {% if not unique_child %} - {{ weight.child }} + + {{ weight.child }} + {% endif %} {{ weight.weight }} - - {% include "core/render_tag_list.html" with tags=weight.tags.all %} - + {% include "core/render_tag_list.html" with tags=weight.tags.all %} {% if weight.notes %} - {{ weight.notes }} + + {{ weight.notes }} + {% endif %} {% empty %} @@ -73,4 +75,4 @@
    {% include 'babybuddy/paginator.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/templates/core/widget_tag_editor.html b/core/templates/core/widget_tag_editor.html index de40daaa..4ce24ec1 100644 --- a/core/templates/core/widget_tag_editor.html +++ b/core/templates/core/widget_tag_editor.html @@ -1,43 +1,46 @@ {% load i18n %} - -
    +
    {% csrf_token %} -
    - {% block title %}{% endblock %} -
    {% block content %}{% endblock %}
    + + {% block title %}{% endblock %} + +
    + {% block content %}{% endblock %} +
    {% block listgroup %}{% endblock %}
    diff --git a/dashboard/templates/cards/diaperchange_last.html b/dashboard/templates/cards/diaperchange_last.html index 059527df..e99633e5 100644 --- a/dashboard/templates/cards/diaperchange_last.html +++ b/dashboard/templates/cards/diaperchange_last.html @@ -1,12 +1,8 @@ {% extends 'cards/base.html' %} {% load duration i18n %} - {% block header %} - - {% trans "Last Diaper Change" %} - + {% trans "Last Diaper Change" %} {% endblock %} - {% block title %} {% if change %} {% blocktrans trimmed with since=change.time|deltasince|duration_string:'m' time=change.time|time %} @@ -17,7 +13,6 @@ {% trans "None" %} {% endif %} {% endblock %} - {% block content %} {% if change %}{{ change.attributes|join:', ' }}{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dashboard/templates/cards/diaperchange_types.html b/dashboard/templates/cards/diaperchange_types.html index 85839ca3..aeb9d33a 100644 --- a/dashboard/templates/cards/diaperchange_types.html +++ b/dashboard/templates/cards/diaperchange_types.html @@ -1,12 +1,8 @@ {% extends 'cards/base.html' %} {% load i18n %} - {% block header %} - - {% trans "Diaper Changes" %} - + {% trans "Diaper Changes" %} {% endblock %} - {% block title %} {% if total == 0 %} {% trans "None" %} @@ -14,35 +10,29 @@ {% trans "Past Week" %} {% endif %} {% endblock %} - {% block content %} {% for key, info in stats.items %} {% if info.wet > 0 or info.solid > 0 or info.empty > 0 %}
    - {% if info.wet_pct > 0 %}
    + style="width: {{ info.wet_pct|safe }}%"> {{ info.wet|floatformat:'0' }} {% trans "wet" %}
    {% endif %} - {% if info.solid_pct > 0 %}
    + style="width: {{ info.solid_pct|safe }}%"> {{ info.solid|floatformat:'0' }} {% trans "solid" %}
    {% endif %} - {% if info.empty_pct > 0 %}
    - {{ info.empty|floatformat:'0' }} -
    + style="width: {{ info.empty_pct|safe }}%">{{ info.empty|floatformat:'0' }}
    {% endif %}
    - {% if key == 0 %} + {% if key == 0 %} {% trans "today" %} {% elif key == 1 %} {% trans "yesterday" %} @@ -55,4 +45,4 @@
    {% endif %} {% endfor %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dashboard/templates/cards/feeding_last.html b/dashboard/templates/cards/feeding_last.html index a97ec858..f32a2eb1 100644 --- a/dashboard/templates/cards/feeding_last.html +++ b/dashboard/templates/cards/feeding_last.html @@ -1,12 +1,8 @@ {% extends 'cards/base.html' %} {% load duration i18n %} - {% block header %} - - {% trans "Last Feeding" %} - + {% trans "Last Feeding" %} {% endblock %} - {% block title %} {% if feeding %} {% blocktrans trimmed with since=feeding.start|deltasince|duration_string:'m' time=feeding.start|time %} @@ -17,12 +13,9 @@ {% trans "None" %} {% endif %} {% endblock %} - {% block content %} {% if feeding %} {{ feeding.get_type_display }}, {{ feeding.get_method_display }} - {% if feeding.amount %} - ({{ feeding.amount }}) - {% endif %} + {% if feeding.amount %}({{ feeding.amount }}){% endif %} {% endif %} {% endblock %} diff --git a/dashboard/templates/cards/feeding_last_method.html b/dashboard/templates/cards/feeding_last_method.html index 4a95eef7..4040a5eb 100644 --- a/dashboard/templates/cards/feeding_last_method.html +++ b/dashboard/templates/cards/feeding_last_method.html @@ -1,32 +1,30 @@ {% extends 'cards/base.html' %} {% load i18n %} - {% block header %} - - {% trans "Last Feeding Method" %} - + {% trans "Last Feeding Method" %} {% endblock %} - {% block title %} {% if feedings|length > 0 %} -