steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Remove deprecated `icon` base class usage

This commit is contained in:
Christopher C. Wells 2021-08-29 18:58:25 -07:00 committed by Christopher Charbonneau Wells
parent d2decc03b6
commit c850998b64
24 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
babybuddy/templates/babybuddy/nav-dropdown.html
View File

@ -12,7 +12,7 @@
<div> <div>
<a class="text-success" <a class="text-success"
href="{% url 'core:timeline' %}" href="{% url 'core:timeline' %}"
aria-expanded="false"><i class="icon icon-2x icon-timeline" aria-hidden="true"></i> aria-expanded="false"><i class="icon-2x icon-timeline" aria-hidden="true"></i>
</a> </a>
&nbsp; &nbsp;
</div> </div>
@ -20,7 +20,7 @@
{% csrf_token %} {% csrf_token %}
<label class="sr-only">{% trans "Quick Start Timer" %}</label> <label class="sr-only">{% trans "Quick Start Timer" %}</label>
<button class="btn m-0 p-0 text-success"> <button class="btn m-0 p-0 text-success">
<i class="icon icon-2x icon-timer" aria-hidden="true"></i> <i class="icon-2x icon-timer" aria-hidden="true"></i>
</button> </button>
</form> </form>
<div class="dropdown show"> <div class="dropdown show">
@ -30,49 +30,49 @@
id="nav-quick-add-link" id="nav-quick-add-link"
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false"><i class="icon icon-2x icon-add" aria-hidden="true"></i> aria-expanded="false"><i class="icon-2x icon-add" aria-hidden="true"></i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-quick-add-link"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-quick-add-link">
{% if perms.core.add_diaperchange %} {% if perms.core.add_diaperchange %}
<a class="dropdown-item p-2" href="{% url 'core:diaperchange-add' %}"> <a class="dropdown-item p-2" href="{% url 'core:diaperchange-add' %}">
<i class="icon icon-diaperchange" aria-hidden="true"></i> <i class="icon-diaperchange" aria-hidden="true"></i>
{% trans "Diaper Change" %} {% trans "Diaper Change" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_feeding %} {% if perms.core.add_feeding %}
<a class="dropdown-item p-2" href="{% url 'core:feeding-add' %}"> <a class="dropdown-item p-2" href="{% url 'core:feeding-add' %}">
<i class="icon icon-feeding" aria-hidden="true"></i> <i class="icon-feeding" aria-hidden="true"></i>
{% trans "Feeding" %} {% trans "Feeding" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_note %} {% if perms.core.add_note %}
<a class="dropdown-item p-2" href="{% url 'core:note-add' %}"> <a class="dropdown-item p-2" href="{% url 'core:note-add' %}">
<i class="icon icon-note" aria-hidden="true"></i> <i class="icon-note" aria-hidden="true"></i>
{% trans "Note" %} {% trans "Note" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_sleep %} {% if perms.core.add_sleep %}
<a class="dropdown-item p-2" href="{% url 'core:sleep-add' %}"> <a class="dropdown-item p-2" href="{% url 'core:sleep-add' %}">
<i class="icon icon-sleep" aria-hidden="true"></i> <i class="icon-sleep" aria-hidden="true"></i>
{% trans "Sleep" %} {% trans "Sleep" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_temperature %} {% if perms.core.add_temperature %}
<a class="dropdown-item p-2" href="{% url 'core:temperature-add' %}"> <a class="dropdown-item p-2" href="{% url 'core:temperature-add' %}">
<i class="icon icon-temperature" aria-hidden="true"></i> <i class="icon-temperature" aria-hidden="true"></i>
{% trans "Temperature" %} {% trans "Temperature" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_tummytime %} {% if perms.core.add_tummytime %}
<a class="dropdown-item p-2" href="{% url 'core:tummytime-add' %}"> <a class="dropdown-item p-2" href="{% url 'core:tummytime-add' %}">
<i class="icon icon-tummytime" aria-hidden="true"></i> <i class="icon-tummytime" aria-hidden="true"></i>
{% trans "Tummy Time" %} {% trans "Tummy Time" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_weight %} {% if perms.core.add_weight %}
<a class="dropdown-item p-2" href="{% url 'core:weight-add' %}"> <a class="dropdown-item p-2" href="{% url 'core:weight-add' %}">
<i class="icon icon-weight" aria-hidden="true"></i> <i class="icon-weight" aria-hidden="true"></i>
{% trans "Weight" %} {% trans "Weight" %}
</a> </a>
{% endif %} {% endif %}
@ -91,14 +91,14 @@
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item{% if request.path == '/' %} active{% endif %}"> <li class="nav-item{% if request.path == '/' %} active{% endif %}">
<a class="nav-link" href="{% url 'dashboard:dashboard' %}"> <a class="nav-link" href="{% url 'dashboard:dashboard' %}">
<i class="icon icon-dashboard" aria-hidden="true"></i> <i class="icon-dashboard" aria-hidden="true"></i>
{% trans "Dashboard" %} {% trans "Dashboard" %}
</a> </a>
</li> </li>
<li class="nav-item{% if request.path == '/timeline' %} active{% endif %}"> <li class="nav-item{% if request.path == '/timeline' %} active{% endif %}">
<a class="nav-link" href="{% url 'core:timeline' %}"> <a class="nav-link" href="{% url 'core:timeline' %}">
<i class="icon icon-timeline" aria-hidden="true"></i> <i class="icon-timeline" aria-hidden="true"></i>
{% trans "Timeline" %} {% trans "Timeline" %}
</a> </a>
</li> </li>
@ -109,7 +109,7 @@
href="#" href="#"
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false"><i class="icon icon-child" aria-hidden="true"></i> aria-expanded="false"><i class="icon-child" aria-hidden="true"></i>
{% trans "Children" %} {% trans "Children" %}
</a> </a>
<div class="dropdown-menu" aria-labelledby="nav-children-menu-link"> <div class="dropdown-menu" aria-labelledby="nav-children-menu-link">
@ -117,13 +117,13 @@
{% if perms.core.view_child %} {% if perms.core.view_child %}
<a class="dropdown-item{% if request.path == '/children/' %} active{% endif %}" <a class="dropdown-item{% if request.path == '/children/' %} active{% endif %}"
href="{% url 'core:child-list' %}"> href="{% url 'core:child-list' %}">
<i class="icon icon-child" aria-hidden="true"></i> <i class="icon-child" aria-hidden="true"></i>
{% trans "Children" %} {% trans "Children" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_child %} {% if perms.core.add_child %}
<a class="dropdown-item pl-5{% if request.path == '/children/add/' %} active{% endif %}" <a class="dropdown-item pl-5{% if request.path == '/children/add/' %} active{% endif %}"
href="{% url 'core:child-add' %}"><i class="icon icon-add" aria-hidden="true"></i> href="{% url 'core:child-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Child" %} {% trans "Child" %}
</a> </a>
{% endif %} {% endif %}
@ -131,13 +131,13 @@
{% if perms.core.view_note %} {% if perms.core.view_note %}
<a class="dropdown-item{% if request.path == '/notes/' %} active{% endif %}" <a class="dropdown-item{% if request.path == '/notes/' %} active{% endif %}"
href="{% url 'core:note-list' %}"> href="{% url 'core:note-list' %}">
<i class="icon icon-note" aria-hidden="true"></i> <i class="icon-note" aria-hidden="true"></i>
{% trans "Notes" %} {% trans "Notes" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_note %} {% if perms.core.add_note %}
<a class="dropdown-item pl-5{% if request.path == '/notes/add/' %} active{% endif %}" <a class="dropdown-item pl-5{% if request.path == '/notes/add/' %} active{% endif %}"
href="{% url 'core:note-add' %}"><i class="icon icon-add" aria-hidden="true"></i> href="{% url 'core:note-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Note" %} {% trans "Note" %}
</a> </a>
{% endif %} {% endif %}
@ -145,13 +145,13 @@
{% if perms.core.view_temperature %} {% if perms.core.view_temperature %}
<a class="dropdown-item{% if request.path == '/temperature/' %} active{% endif %}" <a class="dropdown-item{% if request.path == '/temperature/' %} active{% endif %}"
href="{% url 'core:temperature-list' %}"> href="{% url 'core:temperature-list' %}">
<i class="icon icon-temperature" aria-hidden="true"></i> <i class="icon-temperature" aria-hidden="true"></i>
{% trans "Temperature" %} {% trans "Temperature" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_temperature %} {% if perms.core.add_temperature %}
<a class="dropdown-item pl-5{% if request.path == '/temperature/add/' %} active{% endif %}" <a class="dropdown-item pl-5{% if request.path == '/temperature/add/' %} active{% endif %}"
href="{% url 'core:temperature-add' %}"><i class="icon icon-add" aria-hidden="true"></i> href="{% url 'core:temperature-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Temperature reading" %} {% trans "Temperature reading" %}
</a> </a>
{% endif %} {% endif %}
@ -159,13 +159,13 @@
{% if perms.core.view_weight %} {% if perms.core.view_weight %}
<a class="dropdown-item{% if request.path == '/weight/' %} active{% endif %}" <a class="dropdown-item{% if request.path == '/weight/' %} active{% endif %}"
href="{% url 'core:weight-list' %}"> href="{% url 'core:weight-list' %}">
<i class="icon icon-weight" aria-hidden="true"></i> <i class="icon-weight" aria-hidden="true"></i>
{% trans "Weight" %} {% trans "Weight" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_weight %} {% if perms.core.add_weight %}
<a class="dropdown-item pl-5{% if request.path == '/weight/add/' %} active{% endif %}" <a class="dropdown-item pl-5{% if request.path == '/weight/add/' %} active{% endif %}"
href="{% url 'core:weight-add' %}"><i class="icon icon-add" aria-hidden="true"></i> href="{% url 'core:weight-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Weight entry" %} {% trans "Weight entry" %}
</a> </a>
{% endif %} {% endif %}
@ -179,59 +179,59 @@
href="#" href="#"
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false"><i class="icon icon-activities" aria-hidden="true"></i> aria-expanded="false"><i class="icon-activities" aria-hidden="true"></i>
{% trans "Activities" %} {% trans "Activities" %}
</a> </a>
<div class="dropdown-menu" aria-labelledby="nav-activity-menu-link"> <div class="dropdown-menu" aria-labelledby="nav-activity-menu-link">
{% if perms.core.view_diaperchange %} {% if perms.core.view_diaperchange %}
<a class="dropdown-item{% if request.path == '/changes/' %} active{% endif %}" <a class="dropdown-item{% if request.path == '/changes/' %} active{% endif %}"
href="{% url 'core:diaperchange-list' %}"><i class="icon icon-diaperchange" aria-hidden="true"></i> href="{% url 'core:diaperchange-list' %}"><i class="icon-diaperchange" aria-hidden="true"></i>
{% trans "Changes" %} {% trans "Changes" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_diaperchange %} {% if perms.core.add_diaperchange %}
<a class="dropdown-item pl-5{% if request.path == '/changes/add/' %} active{% endif %}" <a class="dropdown-item pl-5{% if request.path == '/changes/add/' %} active{% endif %}"
href="{% url 'core:diaperchange-add' %}"><i class="icon icon-add" aria-hidden="true"></i> href="{% url 'core:diaperchange-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Change" %} {% trans "Change" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.view_feeding %} {% if perms.core.view_feeding %}
<a class="dropdown-item{% if request.path == '/feedings/' %} active{% endif %}" <a class="dropdown-item{% if request.path == '/feedings/' %} active{% endif %}"
href="{% url 'core:feeding-list' %}"><i class="icon icon-feeding" aria-hidden="true"></i> href="{% url 'core:feeding-list' %}"><i class="icon-feeding" aria-hidden="true"></i>
{% trans "Feedings" %} {% trans "Feedings" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_diaperchange %} {% if perms.core.add_diaperchange %}
<a class="dropdown-item pl-5{% if request.path == '/feedings/add/' %} active{% endif %}" <a class="dropdown-item pl-5{% if request.path == '/feedings/add/' %} active{% endif %}"
href="{% url 'core:feeding-add' %}"><i class="icon icon-add" aria-hidden="true"></i> href="{% url 'core:feeding-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Feeding" %} {% trans "Feeding" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.view_sleep %} {% if perms.core.view_sleep %}
<a class="dropdown-item{% if request.path == '/sleep/' %} active{% endif %}" <a class="dropdown-item{% if request.path == '/sleep/' %} active{% endif %}"
href="{% url 'core:sleep-list' %}"><i class="icon icon-sleep" aria-hidden="true"></i> href="{% url 'core:sleep-list' %}"><i class="icon-sleep" aria-hidden="true"></i>
{% trans "Sleep" %} {% trans "Sleep" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_sleep %} {% if perms.core.add_sleep %}
<a class="dropdown-item pl-5{% if request.path == '/sleep/add/' %} active{% endif %}" <a class="dropdown-item pl-5{% if request.path == '/sleep/add/' %} active{% endif %}"
href="{% url 'core:sleep-add' %}"><i class="icon icon-add" aria-hidden="true"></i> href="{% url 'core:sleep-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Sleep entry" %} {% trans "Sleep entry" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.view_tummytime %} {% if perms.core.view_tummytime %}
<a class="dropdown-item{% if request.path == '/tummy-time/' %} active{% endif %}" <a class="dropdown-item{% if request.path == '/tummy-time/' %} active{% endif %}"
href="{% url 'core:tummytime-list' %}"><i class="icon icon-tummytime" aria-hidden="true"></i> href="{% url 'core:tummytime-list' %}"><i class="icon-tummytime" aria-hidden="true"></i>
{% trans "Tummy Time" %} {% trans "Tummy Time" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.add_tummytime %} {% if perms.core.add_tummytime %}
<a class="dropdown-item pl-5{% if request.path == '/tummy-time/add/' %} active{% endif %}" <a class="dropdown-item pl-5{% if request.path == '/tummy-time/add/' %} active{% endif %}"
href="{% url 'core:tummytime-add' %}"><i class="icon icon-add" aria-hidden="true"></i> href="{% url 'core:tummytime-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Tummy Time entry" %} {% trans "Tummy Time entry" %}
</a> </a>
{% endif %} {% endif %}
@ -253,7 +253,7 @@
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false"> aria-expanded="false">
<i class="icon icon-user" aria-hidden="true"></i> <i class="icon-user" aria-hidden="true"></i>
{% firstof user.get_full_name user.get_username %} {% firstof user.get_full_name user.get_username %}
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-user-menu-link"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-user-menu-link">
@ -273,11 +273,11 @@
<a href="https://github.com/babybuddy/babybuddy" <a href="https://github.com/babybuddy/babybuddy"
class="dropdown-item" class="dropdown-item"
target="_blank"> target="_blank">
<i class="icon icon-source" aria-hidden="true"></i> {% trans "Source Code" %}</a> <i class="icon-source" aria-hidden="true"></i> {% trans "Source Code" %}</a>
<a href="https://gitter.im/babybuddy/Lobby" <a href="https://gitter.im/babybuddy/Lobby"
class="dropdown-item" class="dropdown-item"
target="_blank"> target="_blank">
<i class="icon icon-chat" aria-hidden="true"></i> {% trans "Chat / Support" %}</a> <i class="icon-chat" aria-hidden="true"></i> {% trans "Chat / Support" %}</a>
<h6 class="dropdown-header">v{% version_string %}</h6> <h6 class="dropdown-header">v{% version_string %}</h6>
</div> </div>
</li> </li>

4
babybuddy/templates/babybuddy/paginator.html
View File

@ -7,7 +7,7 @@
{% if page_obj.has_previous %} {% if page_obj.has_previous %}
<li class="page-item"> <li class="page-item">
<a class="page-link" href="{% relative_url 'page' page_obj.previous_page_number %}" aria-label="Previous"> <a class="page-link" href="{% relative_url 'page' page_obj.previous_page_number %}" aria-label="Previous">
<i class="icon icon-chevron-left" aria-hidden="true"></i> <i class="icon-chevron-left" aria-hidden="true"></i>
<span class="sr-only">{% trans "Previous" %}</span> <span class="sr-only">{% trans "Previous" %}</span>
</a> </a>
</li> </li>
@ -24,7 +24,7 @@
{% if page_obj.has_next %} {% if page_obj.has_next %}
<li class="page-item"> <li class="page-item">
<a class="page-link" href="{% relative_url 'page' page_obj.next_page_number %}" aria-label="Next"> <a class="page-link" href="{% relative_url 'page' page_obj.next_page_number %}" aria-label="Next">
<i class="icon icon-chevron-right" aria-hidden="true"></i> <i class="icon-chevron-right" aria-hidden="true"></i>
<span class="sr-only">{% trans "Next" %}</span> <span class="sr-only">{% trans "Next" %}</span>
</a> </a>
</li> </li>

6
babybuddy/templates/babybuddy/user_list.html
View File

@ -37,13 +37,13 @@
{% if perms.admin.change_user %} {% if perms.admin.change_user %}
<a href="{% url 'babybuddy:user-update' object.id %}" class="btn btn-warning"> <a href="{% url 'babybuddy:user-update' object.id %}" class="btn btn-warning">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.admin.delete_user %} {% if perms.admin.delete_user %}
<a href="{% url 'babybuddy:user-delete' object.id %}" class="btn btn-danger"> <a href="{% url 'babybuddy:user-delete' object.id %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
@ -62,7 +62,7 @@
{% if perms.admin.add_user %} {% if perms.admin.add_user %}
<a href="{% url 'babybuddy:user-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'babybuddy:user-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-add" aria-hidden="true"></i> {% trans "Create User" %} <i class="icon-add" aria-hidden="true"></i> {% trans "Create User" %}
</a> </a>
{% endif %} {% endif %}

10
babybuddy/templates/babybuddy/welcome.html
View File

@ -20,7 +20,7 @@
<div class="card-deck"> <div class="card-deck">
<div class="card card-diaperchange"> <div class="card card-diaperchange">
<div class="card-header text-center"> <div class="card-header text-center">
<i class="icon icon-2x icon-diaperchange" aria-hidden="true"></i> <i class="icon-2x icon-diaperchange" aria-hidden="true"></i>
</div> </div>
<div class="card-body"> <div class="card-body">
<h3 class="card-title text-center">{% trans "Diaper Changes" %}</h3> <h3 class="card-title text-center">{% trans "Diaper Changes" %}</h3>
@ -28,7 +28,7 @@
</div> </div>
<div class="card card-feeding"> <div class="card card-feeding">
<div class="card-header text-center"> <div class="card-header text-center">
<i class="icon icon-2x icon-feeding" aria-hidden="true"></i> <i class="icon-2x icon-feeding" aria-hidden="true"></i>
</div> </div>
<div class="card-body"> <div class="card-body">
<h3 class="card-title text-center">{% trans "Feedings" %}</h3> <h3 class="card-title text-center">{% trans "Feedings" %}</h3>
@ -36,7 +36,7 @@
</div> </div>
<div class="card card-sleep"> <div class="card card-sleep">
<div class="card-header text-center"> <div class="card-header text-center">
<i class="icon icon-2x icon-sleep" aria-hidden="true"></i> <i class="icon-2x icon-sleep" aria-hidden="true"></i>
</div> </div>
<div class="card-body"> <div class="card-body">
<h3 class="card-title text-center">{% trans "Sleep" %}</h3> <h3 class="card-title text-center">{% trans "Sleep" %}</h3>
@ -44,7 +44,7 @@
</div> </div>
<div class="card card-tummytime"> <div class="card card-tummytime">
<div class="card-header text-center"> <div class="card-header text-center">
<i class="icon icon-2x icon-tummytime" aria-hidden="true"></i> <i class="icon-2x icon-tummytime" aria-hidden="true"></i>
</div> </div>
<div class="card-body"> <div class="card-body">
<h3 class="card-title text-center">{% trans "Tummy Time" %}</h3> <h3 class="card-title text-center">{% trans "Tummy Time" %}</h3>
@ -65,7 +65,7 @@
<p class="text-center"> <p class="text-center">
{% if perms.core.add_child %} {% if perms.core.add_child %}
<a href="{% url 'core:child-add' %}" class="btn btn-lg btn-success"> <a href="{% url 'core:child-add' %}" class="btn btn-lg btn-success">
<i class="icon icon-child" aria-hidden="true"></i> {% trans "Add a Child" %} <i class="icon-child" aria-hidden="true"></i> {% trans "Add a Child" %}
</a> </a>
{% endif %} {% endif %}
</p> </p>

4
babybuddy/templates/registration/login.html
View File

@ -13,7 +13,7 @@
</label> </label>
<div class="input-group mb-3 fade-in"> <div class="input-group mb-3 fade-in">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="icon icon-user" aria-hidden="true"></i></span> <span class="input-group-text"><i class="icon-user" aria-hidden="true"></i></span>
</div> </div>
{% render_field form.username name='username' class+='form-control' id='username-input-group' placeholder=form.username.label %} {% render_field form.username name='username' class+='form-control' id='username-input-group' placeholder=form.username.label %}
</div> </div>
@ -23,7 +23,7 @@
</label> </label>
<div class="input-group mb-3 fade-in"> <div class="input-group mb-3 fade-in">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="icon icon-lock" aria-hidden="true"></i></span> <span class="input-group-text"><i class="icon-lock" aria-hidden="true"></i></span>
</div> </div>
{% render_field form.password name='password' class+='form-control' id='password-input-group' placeholder=form.password.label %} {% render_field form.password name='password' class+='form-control' id='password-input-group' placeholder=form.password.label %}
</div> </div>

4
babybuddy/templates/registration/password_reset_confirm.html
View File

@ -27,7 +27,7 @@
</label> </label>
<div class="input-group mb-3 fade-in"> <div class="input-group mb-3 fade-in">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="icon icon-lock" aria-hidden="true"></i></span> <span class="input-group-text"><i class="icon-lock" aria-hidden="true"></i></span>
</div> </div>
{% render_field form.new_password1 name='new_password1' class+='form-control' id='password1-input-group' %} {% render_field form.new_password1 name='new_password1' class+='form-control' id='password1-input-group' %}
</div> </div>
@ -37,7 +37,7 @@
</label> </label>
<div class="input-group mb-3 fade-in"> <div class="input-group mb-3 fade-in">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="icon icon-lock" aria-hidden="true"></i></span> <span class="input-group-text"><i class="icon-lock" aria-hidden="true"></i></span>
</div> </div>
{% render_field form.new_password2 name='new_password2' class+='form-control' id='password2-input-group' %} {% render_field form.new_password2 name='new_password2' class+='form-control' id='password2-input-group' %}
</div> </div>

2
babybuddy/templates/registration/password_reset_form.html
View File

@ -22,7 +22,7 @@
</label> </label>
<div class="input-group mb-3 fade-in"> <div class="input-group mb-3 fade-in">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="icon icon-envelope" aria-hidden="true"></i></span> <span class="input-group-text"><i class="icon-envelope" aria-hidden="true"></i></span>
</div> </div>
{% render_field form.email name='email' class+='form-control' id='email-input-group' placeholder=form.email.label %} {% render_field form.email name='email' class+='form-control' id='email-input-group' placeholder=form.email.label %}
</div> </div>

8
core/templates/core/child_list.html
View File

@ -12,7 +12,7 @@
{% trans "Children" %} {% trans "Children" %}
{% if perms.core.add_child %} {% if perms.core.add_child %}
<a href="{% url 'core:child-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:child-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-child" aria-hidden="true"></i> {% trans "Add Child" %} <i class="icon-child" aria-hidden="true"></i> {% trans "Add Child" %}
</a> </a>
{% endif %} {% endif %}
</h1> </h1>
@ -21,7 +21,7 @@
<table class="table table-striped table-hover child-list"> <table class="table table-striped table-hover child-list">
<thead class="thead-inverse"> <thead class="thead-inverse">
<tr> <tr>
<th class="picture-column"><i class="icon icon-camera" aria-hidden="true"></i></th> <th class="picture-column"><i class="icon-camera" aria-hidden="true"></i></th>
<th>{% trans "First Name" %}</th> <th>{% trans "First Name" %}</th>
<th>{% trans "Last Name" %}</th> <th>{% trans "Last Name" %}</th>
<th>{% trans "Birth Date" %}</th> <th>{% trans "Birth Date" %}</th>
@ -49,13 +49,13 @@
{% if perms.core.change_child %} {% if perms.core.change_child %}
<a href="{% url 'core:child-update' child.slug %}" class="btn btn-warning"> <a href="{% url 'core:child-update' child.slug %}" class="btn btn-warning">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.core.delete_child %} {% if perms.core.delete_child %}
<a href="{% url 'core:child-delete' child.slug %}" class="btn btn-danger"> <a href="{% url 'core:child-delete' child.slug %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}

8
core/templates/core/diaperchange_list.html
View File

@ -12,7 +12,7 @@
{% trans "Diaper Changes" %} {% trans "Diaper Changes" %}
{% if perms.core.add_diaperchange %} {% if perms.core.add_diaperchange %}
<a href="{% url 'core:diaperchange-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:diaperchange-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-diaperchange" aria-hidden="true"></i> {% trans "Add Diaper Change" %} <i class="icon-diaperchange" aria-hidden="true"></i> {% trans "Add Diaper Change" %}
</a> </a>
{% endif %} {% endif %}
</h1> </h1>
@ -40,13 +40,13 @@
{% if perms.core.change_diaperchange %} {% if perms.core.change_diaperchange %}
<a href="{% url 'core:diaperchange-update' change.id %}" class="btn btn-primary"> <a href="{% url 'core:diaperchange-update' change.id %}" class="btn btn-primary">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.core.delete_diaperchange %} {% if perms.core.delete_diaperchange %}
<a href="{% url 'core:diaperchange-delete' change.id %}" class="btn btn-danger"> <a href="{% url 'core:diaperchange-delete' change.id %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
@ -65,7 +65,7 @@
</tr> </tr>
{% if change.notes %} {% if change.notes %}
<tr class="{{ row_class }} row-details"> <tr class="{{ row_class }} row-details">
<td colspan="7"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ change.notes }}</td> <td colspan="7"><i class="icon-note mr-2" aria-hidden="true"></i>{{ change.notes }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% empty %} {% empty %}

8
core/templates/core/feeding_list.html
View File

@ -12,7 +12,7 @@
{% trans "Feedings" %} {% trans "Feedings" %}
{% if perms.core.add_feeding %} {% if perms.core.add_feeding %}
<a href="{% url 'core:feeding-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:feeding-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-feeding" aria-hidden="true"></i> {% trans "Add Feeding" %} <i class="icon-feeding" aria-hidden="true"></i> {% trans "Add Feeding" %}
</a> </a>
{% endif %} {% endif %}
</h1> </h1>
@ -42,13 +42,13 @@
{% if perms.core.change_feeding %} {% if perms.core.change_feeding %}
<a href="{% url 'core:feeding-update' feeding.id %}" class="btn btn-primary"> <a href="{% url 'core:feeding-update' feeding.id %}" class="btn btn-primary">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.core.delete_feeding %} {% if perms.core.delete_feeding %}
<a href="{% url 'core:feeding-delete' feeding.id %}" class="btn btn-danger"> <a href="{% url 'core:feeding-delete' feeding.id %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
@ -69,7 +69,7 @@
</tr> </tr>
{% if feeding.notes %} {% if feeding.notes %}
<tr class="{{ row_class }} row-details"> <tr class="{{ row_class }} row-details">
<td colspan="7"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ feeding.notes }}</td> <td colspan="7"><i class="icon-note mr-2" aria-hidden="true"></i>{{ feeding.notes }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% empty %} {% empty %}

6
core/templates/core/note_list.html
View File

@ -12,7 +12,7 @@
{% trans "Notes" %} {% trans "Notes" %}
{% if perms.core.add_note %} {% if perms.core.add_note %}
<a href="{% url 'core:note-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:note-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-note" aria-hidden="true"></i> {% trans "Add Note" %} <i class="icon-note" aria-hidden="true"></i> {% trans "Add Note" %}
</a> </a>
{% endif %} {% endif %}
</h1> </h1>
@ -37,13 +37,13 @@
{% if perms.core.change_note %} {% if perms.core.change_note %}
<a href="{% url 'core:note-update' note.id %}" class="btn btn-primary"> <a href="{% url 'core:note-update' note.id %}" class="btn btn-primary">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.core.delete_note %} {% if perms.core.delete_note %}
<a href="{% url 'core:note-delete' note.id %}" class="btn btn-danger"> <a href="{% url 'core:note-delete' note.id %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}

8
core/templates/core/sleep_list.html
View File

@ -12,7 +12,7 @@
{% trans "Sleep" %} {% trans "Sleep" %}
{% if perms.core.add_sleep %} {% if perms.core.add_sleep %}
<a href="{% url 'core:sleep-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:sleep-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-sleep" aria-hidden="true"></i> {% trans "Add Sleep" %} <i class="icon-sleep" aria-hidden="true"></i> {% trans "Add Sleep" %}
</a> </a>
{% endif %} {% endif %}
</h1> </h1>
@ -40,13 +40,13 @@
{% if perms.core.change_sleep %} {% if perms.core.change_sleep %}
<a href="{% url 'core:sleep-update' sleep.id %}" class="btn btn-primary"> <a href="{% url 'core:sleep-update' sleep.id %}" class="btn btn-primary">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.core.delete_sleep %} {% if perms.core.delete_sleep %}
<a href="{% url 'core:sleep-delete' sleep.id %}" class="btn btn-danger"> <a href="{% url 'core:sleep-delete' sleep.id %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
@ -62,7 +62,7 @@
</tr> </tr>
{% if sleep.notes %} {% if sleep.notes %}
<tr class="{{ row_class }} row-details"> <tr class="{{ row_class }} row-details">
<td colspan="6"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ sleep.notes }}</td> <td colspan="6"><i class="icon-note mr-2" aria-hidden="true"></i>{{ sleep.notes }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% empty %} {% empty %}

8
core/templates/core/temperature_list.html
View File

@ -12,7 +12,7 @@
{% trans "Temperature" %} {% trans "Temperature" %}
{% if perms.core.add_temperature %} {% if perms.core.add_temperature %}
<a href="{% url 'core:temperature-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:temperature-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-temperature" aria-hidden="true"></i> {% trans "Add Temperature Reading" %} <i class="icon-temperature" aria-hidden="true"></i> {% trans "Add Temperature Reading" %}
</a> </a>
{% endif %} {% endif %}
</h1> </h1>
@ -38,13 +38,13 @@
{% if perms.core.change_temperature %} {% if perms.core.change_temperature %}
<a href="{% url 'core:temperature-update' temperature.id %}" class="btn btn-primary"> <a href="{% url 'core:temperature-update' temperature.id %}" class="btn btn-primary">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.core.delete_temperature %} {% if perms.core.delete_temperature %}
<a href="{% url 'core:temperature-delete' temperature.id %}" class="btn btn-danger"> <a href="{% url 'core:temperature-delete' temperature.id %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
@ -58,7 +58,7 @@
</tr> </tr>
{% if temperature.notes %} {% if temperature.notes %}
<tr class="{{ row_class }} row-details"> <tr class="{{ row_class }} row-details">
<td colspan="4"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ temperature.notes }}</td> <td colspan="4"><i class="icon-note mr-2" aria-hidden="true"></i>{{ temperature.notes }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% empty %} {% empty %}

14
core/templates/core/timer_detail.html
View File

@ -39,7 +39,7 @@
{% if perms.core.add_feeding %} {% if perms.core.add_feeding %}
<a class="btn btn-success btn-lg btn-block mb-3" <a class="btn btn-success btn-lg btn-block mb-3"
href="{% instance_add_url 'core:feeding-add' %}" href="{% instance_add_url 'core:feeding-add' %}"
role="button"><i class="icon icon-feeding" aria-hidden="true"></i> role="button"><i class="icon-feeding" aria-hidden="true"></i>
{% trans "Feeding" %} {% trans "Feeding" %}
</a> </a>
{% endif %} {% endif %}
@ -47,7 +47,7 @@
{% if perms.core.add_sleep %} {% if perms.core.add_sleep %}
<a class="btn btn-success btn-lg btn-block mb-3" <a class="btn btn-success btn-lg btn-block mb-3"
href="{% instance_add_url 'core:sleep-add' %}" href="{% instance_add_url 'core:sleep-add' %}"
role="button"><i class="icon icon-sleep" aria-hidden="true"></i> role="button"><i class="icon-sleep" aria-hidden="true"></i>
{% trans "Sleep" %} {% trans "Sleep" %}
</a> </a>
{% endif %} {% endif %}
@ -55,7 +55,7 @@
{% if perms.core.add_tummytime %} {% if perms.core.add_tummytime %}
<a class="btn btn-success btn-lg btn-block mb-3" <a class="btn btn-success btn-lg btn-block mb-3"
href="{% instance_add_url 'core:tummytime-add' %}" href="{% instance_add_url 'core:tummytime-add' %}"
role="button"><i class="icon icon-tummytime" aria-hidden="true"></i> role="button"><i class="icon-tummytime" aria-hidden="true"></i>
{% trans "Tummy Time" %} {% trans "Tummy Time" %}
</a> </a>
{% endif %} {% endif %}
@ -64,25 +64,25 @@
{% if perms.core.delete_timer %} {% if perms.core.delete_timer %}
<a class="btn btn-lg btn-danger" <a class="btn btn-lg btn-danger"
href="{% url 'core:timer-delete' timer.id %}" href="{% url 'core:timer-delete' timer.id %}"
role="button"><i class="icon icon-delete" aria-hidden="true"></i></a> role="button"><i class="icon-delete" aria-hidden="true"></i></a>
{% endif %} {% endif %}
{% if perms.core.change_timer %} {% if perms.core.change_timer %}
<a class="btn btn-lg btn-primary" <a class="btn btn-lg btn-primary"
href="{% url 'core:timer-update' timer.id %}" href="{% url 'core:timer-update' timer.id %}"
role="button"><i class="icon icon-update" aria-hidden="true"></i></a> role="button"><i class="icon-update" aria-hidden="true"></i></a>
<form action="{% url 'core:timer-restart' timer.id %}" role="form" method="post" class="d-inline"> <form action="{% url 'core:timer-restart' timer.id %}" role="form" method="post" class="d-inline">
{% csrf_token %} {% csrf_token %}
<label class="sr-only">{% trans "Restart timer" %}</label> <label class="sr-only">{% trans "Restart timer" %}</label>
<button type="submit" class="btn btn-lg btn-secondary"><i class="icon icon-refresh" aria-hidden="true"></i></button> <button type="submit" class="btn btn-lg btn-secondary"><i class="icon-refresh" aria-hidden="true"></i></button>
</form> </form>
{% if object.active %} {% if object.active %}
<form action="{% url 'core:timer-stop' timer.id %}" role="form" method="post" class="d-inline"> <form action="{% url 'core:timer-stop' timer.id %}" role="form" method="post" class="d-inline">
{% csrf_token %} {% csrf_token %}
<label class="sr-only">{% trans "Delete timer" %}</label> <label class="sr-only">{% trans "Delete timer" %}</label>
<button type="submit" class="btn btn-lg btn-warning"><i class="icon icon-stop" aria-hidden="true"></i></button> <button type="submit" class="btn btn-lg btn-warning"><i class="icon-stop" aria-hidden="true"></i></button>
</form> </form>
{% endif %} {% endif %}
{% endif %} {% endif %}

4
core/templates/core/timer_list.html
View File

@ -12,7 +12,7 @@
{% trans "Timers" %} {% trans "Timers" %}
{% if perms.core.add_timer %} {% if perms.core.add_timer %}
<a href="{% url 'core:timer-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:timer-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-timer" aria-hidden="true"></i> {% trans "Start Timer" %} <i class="icon-timer" aria-hidden="true"></i> {% trans "Start Timer" %}
</a> </a>
{% endif %} {% endif %}
</h1> </h1>
@ -65,7 +65,7 @@
{% if perms.core.delete_timer %} {% if perms.core.delete_timer %}
<a href="{% url 'core:timer-delete-inactive' %}" class="btn btn-sm btn-danger"> <a href="{% url 'core:timer-delete-inactive' %}" class="btn btn-sm btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> {% trans "Delete Inactive Timers" %} <i class="icon-delete" aria-hidden="true"></i> {% trans "Delete Inactive Timers" %}
</a> </a>
{% endif %} {% endif %}

8
core/templates/core/timer_nav.html
View File

@ -6,7 +6,7 @@
href="#" href="#"
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false"><i class="icon icon-timer" aria-hidden="true"></i> aria-expanded="false"><i class="icon-timer" aria-hidden="true"></i>
{% trans "Timers" %} {% trans "Timers" %}
</a> </a>
<div class="dropdown-menu" aria-labelledby="nav-timer-menu-link"> <div class="dropdown-menu" aria-labelledby="nav-timer-menu-link">
@ -15,17 +15,17 @@
<form action="{% url 'core:timer-add-quick' %}" role="form" method="post" class="d-inline"> <form action="{% url 'core:timer-add-quick' %}" role="form" method="post" class="d-inline">
{% csrf_token %} {% csrf_token %}
<button class="btn text-left p-0"> <button class="btn text-left p-0">
<i class="icon icon-timer" aria-hidden="true"></i> {% trans "Quick Start Timer" %} <i class="icon-timer" aria-hidden="true"></i> {% trans "Quick Start Timer" %}
</button> </button>
</form> </form>
</div> </div>
<a class="dropdown-item" href="{% url 'core:timer-add' %}"> <a class="dropdown-item" href="{% url 'core:timer-add' %}">
<i class="icon icon-add" aria-hidden="true"></i> {% trans "Start Timer" %} <i class="icon-add" aria-hidden="true"></i> {% trans "Start Timer" %}
</a> </a>
{% endif %} {% endif %}
{% if perms.core.view_timer %} {% if perms.core.view_timer %}
<a class="dropdown-item" href="{% url 'core:timer-list' %}"> <a class="dropdown-item" href="{% url 'core:timer-list' %}">
<i class="icon icon-list" aria-hidden="true"></i> {% trans "View Timers" %} <i class="icon-list" aria-hidden="true"></i> {% trans "View Timers" %}
</a> </a>
{% endif %} {% endif %}
{% if timers %} {% if timers %}

6
core/templates/core/tummytime_list.html
View File

@ -12,7 +12,7 @@
{% trans "Tummy Time" %} {% trans "Tummy Time" %}
{% if perms.core.add_tummytime %} {% if perms.core.add_tummytime %}
<a href="{% url 'core:tummytime-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:tummytime-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-tummytime" aria-hidden="true"></i> {% trans "Add Tummy Time" %}</a> <i class="icon-tummytime" aria-hidden="true"></i> {% trans "Add Tummy Time" %}</a>
{% endif %} {% endif %}
</h1> </h1>
{% include 'babybuddy/filter.html' %} {% include 'babybuddy/filter.html' %}
@ -38,13 +38,13 @@
{% if perms.core.change_tummytime %} {% if perms.core.change_tummytime %}
<a href="{% url 'core:tummytime-update' tummytime.id %}" class="btn btn-primary"> <a href="{% url 'core:tummytime-update' tummytime.id %}" class="btn btn-primary">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.core.delete_tummytime %} {% if perms.core.delete_tummytime %}
<a href="{% url 'core:tummytime-delete' tummytime.id %}" class="btn btn-danger"> <a href="{% url 'core:tummytime-delete' tummytime.id %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}

8
core/templates/core/weight_list.html
View File

@ -12,7 +12,7 @@
{% trans "Weight" %} {% trans "Weight" %}
{% if perms.core.add_weight %} {% if perms.core.add_weight %}
<a href="{% url 'core:weight-add' %}" class="btn btn-sm btn-success"> <a href="{% url 'core:weight-add' %}" class="btn btn-sm btn-success">
<i class="icon icon-weight" aria-hidden="true"></i> {% trans "Add Weight" %} <i class="icon-weight" aria-hidden="true"></i> {% trans "Add Weight" %}
</a> </a>
{% endif %} {% endif %}
</h1> </h1>
@ -38,13 +38,13 @@
{% if perms.core.change_weight %} {% if perms.core.change_weight %}
<a href="{% url 'core:weight-update' weight.id %}" class="btn btn-primary"> <a href="{% url 'core:weight-update' weight.id %}" class="btn btn-primary">
<i class="icon icon-update" aria-hidden="true"></i> <i class="icon-update" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.core.delete_weight %} {% if perms.core.delete_weight %}
<a href="{% url 'core:weight-delete' weight.id %}" class="btn btn-danger"> <a href="{% url 'core:weight-delete' weight.id %}" class="btn btn-danger">
<i class="icon icon-delete" aria-hidden="true"></i> <i class="icon-delete" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
@ -58,7 +58,7 @@
</tr> </tr>
{% if weight.notes %} {% if weight.notes %}
<tr class="{{ row_class }} row-details"> <tr class="{{ row_class }} row-details">
<td colspan="4"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ weight.notes }}</td> <td colspan="4"><i class="icon-note mr-2" aria-hidden="true"></i>{{ weight.notes }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% empty %} {% empty %}

10
core/templates/timeline/_timeline.html
View File

@ -3,14 +3,14 @@
<h3 class="text-center"> <h3 class="text-center">
{% if date_previous %} {% if date_previous %}
<a class="btn btn-sm btn-default" href="?date={{ date_previous|date:"Y-m-d" }}" aria-label="{% trans "Previous" %}"> <a class="btn btn-sm btn-default" href="?date={{ date_previous|date:"Y-m-d" }}" aria-label="{% trans "Previous" %}">
<i class="icon icon-chevron-left" aria-hidden="true"></i> <i class="icon-chevron-left" aria-hidden="true"></i>
<span class="sr-only">{% trans "Previous" %}</span> <span class="sr-only">{% trans "Previous" %}</span>
</a> </a>
{% endif %} {% endif %}
{{ date|date }} {{ date|date }}
{% if date_next %} {% if date_next %}
<a class="btn btn-sm btn-default" href="?date={{ date_next|date:"Y-m-d" }}" aria-label="{% trans "Next" %}"> <a class="btn btn-sm btn-default" href="?date={{ date_next|date:"Y-m-d" }}" aria-label="{% trans "Next" %}">
<i class="icon icon-chevron-right" aria-hidden="true"></i> <i class="icon-chevron-right" aria-hidden="true"></i>
<span class="sr-only">{% trans "Next" %}</span> <span class="sr-only">{% trans "Next" %}</span>
</a> </a>
{% endif %} {% endif %}
@ -20,7 +20,7 @@
{% for object in timeline_objects %} {% for object in timeline_objects %}
<li{% cycle "" ' class="timeline-inverted"' %}> <li{% cycle "" ' class="timeline-inverted"' %}>
<div class="timeline-badge {% if object.type == "start" %}bg-success{% elif object.type == "end" %}bg-danger{% else %}bg-info{% endif %}"> <div class="timeline-badge {% if object.type == "start" %}bg-success{% elif object.type == "end" %}bg-danger{% else %}bg-info{% endif %}">
<i class="icon icon-{{ object.model_name }}"></i> <i class="icon-{{ object.model_name }}"></i>
</div> </div>
<div class="card text-right"> <div class="card text-right">
<div class="card-body"> <div class="card-body">
@ -56,14 +56,14 @@
<h3 class="text-center"> <h3 class="text-center">
{% if date_previous %} {% if date_previous %}
<a class="btn btn-sm btn-default" href="?date={{ date_previous|date:"Y-m-d" }}" aria-label="{% trans "Previous" %}"> <a class="btn btn-sm btn-default" href="?date={{ date_previous|date:"Y-m-d" }}" aria-label="{% trans "Previous" %}">
<i class="icon icon-chevron-left" aria-hidden="true"></i> <i class="icon-chevron-left" aria-hidden="true"></i>
<span class="sr-only">{% trans "Previous" %}</span> <span class="sr-only">{% trans "Previous" %}</span>
</a> </a>
{% endif %} {% endif %}
{{ date|date }} {{ date|date }}
{% if date_next %} {% if date_next %}
<a class="btn btn-sm btn-default" href="?date={{ date_next|date:"Y-m-d" }}" aria-label="{% trans "Next" %}"> <a class="btn btn-sm btn-default" href="?date={{ date_next|date:"Y-m-d" }}" aria-label="{% trans "Next" %}">
<i class="icon icon-chevron-right" aria-hidden="true"></i> <i class="icon-chevron-right" aria-hidden="true"></i>
<span class="sr-only">{% trans "Next" %}</span> <span class="sr-only">{% trans "Next" %}</span>
</a> </a>
{% endif %} {% endif %}

4
core/tests/tests_templatetags.py
View File

@ -11,10 +11,10 @@ class TemplateTagsTestCase(TestCase):
def test_bootstrap_bool_icon(self): def test_bootstrap_bool_icon(self):
self.assertEqual( self.assertEqual(
bootstrap.bool_icon(True), bootstrap.bool_icon(True),
'<i class="icon icon-true text-success" aria-hidden="true"></i>') '<i class="icon-true text-success" aria-hidden="true"></i>')
self.assertEqual( self.assertEqual(
bootstrap.bool_icon(False), bootstrap.bool_icon(False),
'<i class="icon icon-false text-danger" aria-hidden="true"></i>') '<i class="icon-false text-danger" aria-hidden="true"></i>')
def test_child_age_string(self): def test_child_age_string(self):
date = timezone.localdate() - timezone.timedelta(days=0, hours=6) date = timezone.localdate() - timezone.timedelta(days=0, hours=6)

2
dashboard/templates/cards/base.html
View File

@ -1,7 +1,7 @@
{% if not empty or not hide_empty %} {% if not empty or not hide_empty %}
<div class="card card-dashboard card-{{ type }}"> <div class="card card-dashboard card-{{ type }}">
<div class="card-header"> <div class="card-header">
<i class="icon icon-{{ type }} pull-left" aria-hidden="true"></i> <i class="icon-{{ type }} pull-left" aria-hidden="true"></i>
{% block header %}{% endblock %} {% block header %}{% endblock %}
</div> </div>
<div class="card-body"> <div class="card-body">

2
dashboard/templates/cards/statistics.html
View File

@ -3,7 +3,7 @@
{% if not empty or not hide_empty %} {% if not empty or not hide_empty %}
<div class="card card-dashboard card-statistics"> <div class="card card-dashboard card-statistics">
<div class="card-header"> <div class="card-header">
<i class="icon icon-graph pull-left" aria-hidden="true"></i> <i class="icon-graph pull-left" aria-hidden="true"></i>
{% trans "Statistics" %} {% trans "Statistics" %}
</div> </div>
<div class="card-body text-center"> <div class="card-body text-center">

10
dashboard/templates/dashboard/child_button_group.html
View File

@ -4,10 +4,10 @@
{% if perms.core.view_child %} {% if perms.core.view_child %}
<a href="{% url 'dashboard:dashboard-child' object.slug %}" class="btn" title="{% trans "Dashboard" %}"> <a href="{% url 'dashboard:dashboard-child' object.slug %}" class="btn" title="{% trans "Dashboard" %}">
<i class="icon icon-dashboard" aria-hidden="true"></i> <i class="icon-dashboard" aria-hidden="true"></i>
</a> </a>
<a href="{% url 'core:child' object.slug %}" class="btn" title="{% trans "Timeline" %}"> <a href="{% url 'core:child' object.slug %}" class="btn" title="{% trans "Timeline" %}">
<i class="icon icon-timeline" aria-hidden="true"></i> <i class="icon-timeline" aria-hidden="true"></i>
</a> </a>
{% endif %} {% endif %}
@ -18,7 +18,7 @@
type="button" type="button"
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false"><i class="icon icon-graph" aria-hidden="true"></i></button> aria-expanded="false"><i class="icon-graph" aria-hidden="true"></i></button>
<div class="dropdown-menu" aria-labelledby="reports-dropdown"> <div class="dropdown-menu" aria-labelledby="reports-dropdown">
<a class="dropdown-item" href="{% url 'reports:report-diaperchange-amounts-child' object.slug %}">{% trans "Diaper Change Amounts" %}</a> <a class="dropdown-item" href="{% url 'reports:report-diaperchange-amounts-child' object.slug %}">{% trans "Diaper Change Amounts" %}</a>
<a class="dropdown-item" href="{% url 'reports:report-diaperchange-types-child' object.slug %}">{% trans "Diaper Change Types" %}</a> <a class="dropdown-item" href="{% url 'reports:report-diaperchange-types-child' object.slug %}">{% trans "Diaper Change Types" %}</a>
@ -35,14 +35,14 @@
<a class="btn" <a class="btn"
href="{% url 'core:child-update' object.slug %}" href="{% url 'core:child-update' object.slug %}"
title="{% trans "Edit" %}" title="{% trans "Edit" %}"
role="button"><i class="icon icon-update" aria-hidden="true"></i></a> role="button"><i class="icon-update" aria-hidden="true"></i></a>
{% endif %} {% endif %}
{% if perms.core.delete_child %} {% if perms.core.delete_child %}
<a class="btn" <a class="btn"
href="{% url 'core:child-delete' object.slug %}" href="{% url 'core:child-delete' object.slug %}"
title="{% trans "Delete" %}" title="{% trans "Delete" %}"
role="button"><i class="icon icon-delete" aria-hidden="true"></i></a> role="button"><i class="icon-delete" aria-hidden="true"></i></a>
{% endif %} {% endif %}
</div> </div>

4
reports/templates/reports/report_base.html
View File

@ -15,9 +15,9 @@
{{ html|safe }} {{ html|safe }}
{% else %} {% else %}
<div class="jumbotron text-center"> <div class="jumbotron text-center">
<i class="icon icon-sad" aria-hidden="true"></i> <i class="icon-sad" aria-hidden="true"></i>
{% trans "There is not enough data to generate this report." %} {% trans "There is not enough data to generate this report." %}
<i class="icon icon-sad" aria-hidden="true"></i> <i class="icon-sad" aria-hidden="true"></i>
</div> </div>
{% endif %} {% endif %}
</div> </div>