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

Fix list view classes and colspans and re-sort menu items (#481) 

* Standardize list class and fix colspans

Fixes #469

* Alpha organize new recent menu item additions
This commit is contained in:
Christopher Charbonneau Wells 2022-06-12 19:24:00 -07:00 committed by GitHub
parent 9d3c32fec1
commit f5ae1a55a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 72 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,31 +69,12 @@
{% trans "Sleep" %}
</a>
{% endif %}
{% if perms.core.add_temperature %}
<a class="dropdown-item p-2" href="{% url 'core:temperature-add' %}">
<i class="icon-temperature" aria-hidden="true"></i>
{% trans "Temperature" %}
</a>
{% endif %}
{% if perms.core.add_tummytime %}
<a class="dropdown-item p-2" href="{% url 'core:tummytime-add' %}">
<i class="icon-tummytime" aria-hidden="true"></i>
{% trans "Tummy Time" %}
</a>
{% endif %}
{% if perms.core.add_weight %}
<a class="dropdown-item p-2" href="{% url 'core:weight-add' %}">
<i class="icon-weight" aria-hidden="true"></i>
{% trans "Weight" %}
</a>
{% endif %}
{% if perms.core.add_pumping %}
<a class="dropdown-item p-2" href="{% url 'core:pumping-add' %}">
<i class="icon-pumping" aria-hidden="true"></i>
{% trans "Pumping" %}
</a>
{% endif %}
</div>
</div>
</div>
@ -172,6 +153,48 @@
</a>
<div class="dropdown-menu" aria-labelledby="nav-measurements-menu-link">
{% if perms.core.view_bmi %}
<a class="dropdown-item{% if request.path == '/bmi/' %} active{% endif %}"
href="{% url 'core:bmi-list' %}">
<i class="icon-bmi" aria-hidden="true"></i>
{% trans "BMI" %}
</a>
{% endif %}
{% if perms.core.add_bmi %}
<a class="dropdown-item pl-5{% if request.path == '/bmi/add/' %} active{% endif %}"
href="{% url 'core:bmi-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "BMI entry" %}
</a>
{% endif %}
{% if perms.core.view_head_circumference %}
<a class="dropdown-item{% if request.path == '/head-circumference/' %} active{% endif %}"
href="{% url 'core:head-circumference-list' %}">
<i class="icon-head-circumference aria-hidden="true"></i>
{% trans "Head Circumference" %}
</a>
{% endif %}
{% if perms.core.add_head_circumference %}
<a class="dropdown-item pl-5{% if request.path == '/head-circumference/add/' %} active{% endif %}"
href="{% url 'core:head-circumference-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Head Circumference entry" %}
</a>
{% endif %}
{% if perms.core.view_height %}
<a class="dropdown-item{% if request.path == '/height/' %} active{% endif %}"
href="{% url 'core:height-list' %}">
<i class="icon-height" aria-hidden="true"></i>
{% trans "Height" %}
</a>
{% endif %}
{% if perms.core.add_height %}
<a class="dropdown-item pl-5{% if request.path == '/height/add/' %} active{% endif %}"
href="{% url 'core:height-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Height entry" %}
</a>
{% endif %}
{% if perms.core.view_temperature %}
<a class="dropdown-item{% if request.path == '/temperature/' %} active{% endif %}"
href="{% url 'core:temperature-list' %}">
@ -200,48 +223,6 @@
</a>
{% endif %}
{% if perms.core.view_height %}
<a class="dropdown-item{% if request.path == '/height/' %} active{% endif %}"
href="{% url 'core:height-list' %}">
<i class="icon-height" aria-hidden="true"></i>
{% trans "Height" %}
</a>
{% endif %}
{% if perms.core.add_height %}
<a class="dropdown-item pl-5{% if request.path == '/height/add/' %} active{% endif %}"
href="{% url 'core:height-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Height entry" %}
</a>
{% endif %}
{% if perms.core.view_head_circumference %}
<a class="dropdown-item{% if request.path == '/head-circumference/' %} active{% endif %}"
href="{% url 'core:head-circumference-list' %}">
<i class="icon-head-circumference aria-hidden="true"></i>
{% trans "Head Circumference" %}
</a>
{% endif %}
{% if perms.core.add_head_circumference %}
<a class="dropdown-item pl-5{% if request.path == '/head-circumference/add/' %} active{% endif %}"
href="{% url 'core:head-circumference-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Head Circumference entry" %}
</a>
{% endif %}
{% if perms.core.view_bmi %}
<a class="dropdown-item{% if request.path == '/bmi/' %} active{% endif %}"
href="{% url 'core:bmi-list' %}">
<i class="icon-bmi" aria-hidden="true"></i>
{% trans "BMI" %}
</a>
{% endif %}
{% if perms.core.add_bmi %}
<a class="dropdown-item pl-5{% if request.path == '/bmi/add/' %} active{% endif %}"
href="{% url 'core:bmi-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "BMI entry" %}
</a>
{% endif %}
</div>
</li>
@ -275,13 +256,27 @@
{% trans "Feedings" %}
</a>
{% endif %}
{% if perms.core.add_diaperchange %}
{% if perms.core.add_feeding %}
<a class="dropdown-item pl-5{% if request.path == '/feedings/add/' %} active{% endif %}"
href="{% url 'core:feeding-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Feeding" %}
</a>
{% endif %}
{% if perms.core.view_pumping %}
<a class="dropdown-item{% if request.path == '/pumping/' %} active{% endif %}"
href="{% url 'core:pumping-list' %}">
<i class="icon-pumping" aria-hidden="true"></i>
{% trans "Pumping" %}
</a>
{% endif %}
{% if perms.core.add_pumping %}
<a class="dropdown-item pl-5{% if request.path == '/pumping/add/' %} active{% endif %}"
href="{% url 'core:pumping-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Pumping entry" %}
</a>
{% endif %}
{% if perms.core.view_sleep %}
<a class="dropdown-item{% if request.path == '/sleep/' %} active{% endif %}"
href="{% url 'core:sleep-list' %}"><i class="icon-sleep" aria-hidden="true"></i>
@ -307,21 +302,6 @@
{% trans "Tummy Time entry" %}
</a>
{% endif %}
{% if perms.core.view_pumping %}
<a class="dropdown-item{% if request.path == '/pumping/' %} active{% endif %}"
href="{% url 'core:pumping-list' %}">
<i class="icon-pumping" aria-hidden="true"></i>
{% trans "Pumping" %}
</a>
{% endif %}
{% if perms.core.add_pumping %}
<a class="dropdown-item pl-5{% if request.path == '/pumping/add/' %} active{% endif %}"
href="{% url 'core:pumping-add' %}"><i class="icon-add" aria-hidden="true"></i>
{% trans "Pumping entry" %}
</a>
{% endif %}
</div>
</li>

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

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>
@ -67,7 +67,7 @@
{% endif %}
{% empty %}
<tr>
<th colspan="5">{% trans "No bmi entries found." %}</th>
<th colspan="5">{% trans "No BMI entries found." %}</th>
</tr>
{% endfor %}
</tbody>

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

@ -64,7 +64,7 @@
</tr>
{% empty %}
<tr>
<th colspan="4">{% trans "No children found." %}</th>
<th colspan="5">{% trans "No children found." %}</th>
</tr>
{% endfor %}
</tbody>

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

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>

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

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>

2
core/templates/core/head_circumference_list.html
View File

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>

2
core/templates/core/height_list.html
View File

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>

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

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-striped table-hover">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>
@ -61,7 +61,7 @@
</tr>
{% empty %}
<tr>
<th colspan="4">{% trans "No notes found." %}</th>
<th colspan="5">{% trans "No notes found." %}</th>
</tr>
{% endfor %}
</tbody>

2
core/templates/core/pumping_list.html
View File

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>

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

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>

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

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>

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

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-striped table-hover">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Start" %}</th>

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

@ -17,7 +17,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-striped table-hover">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>

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

@ -18,7 +18,7 @@
</h1>
{% include 'babybuddy/filter.html' %}
<div class="table-responsive">
<table class="table table-instances">
<table class="table table-instances table-striped table-hover">
<thead class="thead-inverse">
<tr>
<th>{% trans "Actions" %}</th>