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

Reorganize non-activites under a new Children menu.

This commit is contained in:
Christopher Charbonneau Wells 2017-11-09 19:39:50 -05:00
parent 00d3cf65f5
commit 942c426a43
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
babybuddy/static_src/scss/icons.scss
View File

@ -8,6 +8,10 @@
@extend .fa-2x; @extend .fa-2x;
} }
.icon-activities {
@extend .fa-cubes;
}
.icon-add { .icon-add {
@extend .fa-plus; @extend .fa-plus;
} }

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

@ -62,13 +62,45 @@
</a> </a>
</li> </li>
<li class="nav-item dropdown">
<a id="nav-children-menu-link"
class="nav-link dropdown-toggle"
href="#"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"><i class="icon icon-child" aria-hidden="true"></i> Children</a>
<div class="dropdown-menu" aria-labelledby="nav-children-menu-link">
{% if perms.core.view_child %}
<a class="dropdown-item{% if request.path == '/children/' %} active{% endif %}" href="{% url 'child-list' %}">
<i class="icon icon-child" aria-hidden="true"></i> Children
</a>
{% endif %}
{% if perms.core.add_child %}
<a class="dropdown-item pl-5{% if request.path == '/children/add/' %} active{% endif %}"
href="{% url 'child-add' %}"><i class="icon icon-add" aria-hidden="true"></i> Child</a>
{% endif %}
{% if perms.core.view_note %}
<a class="dropdown-item{% if request.path == '/notes/' %} active{% endif %}" href="{% url 'note-list' %}">
<i class="icon icon-note" aria-hidden="true"></i> Notes
</a>
{% endif %}
{% if perms.core.add_note %}
<a class="dropdown-item pl-5{% if request.path == '/notes/add/' %} active{% endif %}"
href="{% url 'note-add' %}"><i class="icon icon-add" aria-hidden="true"></i> Note</a>
{% endif %}
</div>
</li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a id="nav-activity-menu-link" <a id="nav-activity-menu-link"
class="nav-link dropdown-toggle" class="nav-link dropdown-toggle"
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> Activities</a> aria-expanded="false"><i class="icon icon-activities" aria-hidden="true"></i> Activities</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 %}
@ -107,20 +139,6 @@
href="{% url 'tummytime-add' %}"><i class="icon icon-add" aria-hidden="true"></i> Tummy Time entry</a> href="{% url 'tummytime-add' %}"><i class="icon icon-add" aria-hidden="true"></i> Tummy Time entry</a>
{% endif %} {% endif %}
<div class="dropdown-divider"></div>
{% if perms.core.view_child %}
<a class="dropdown-item{% if request.path == '/children/' %} active{% endif %}" href="{% url 'child-list' %}">
<i class="icon icon-child" aria-hidden="true"></i> Children
</a>
{% endif %}
{% if perms.core.view_note %}
<a class="dropdown-item{% if request.path == '/notes/' %} active{% endif %}" href="{% url 'note-list' %}">
<i class="icon icon-note" aria-hidden="true"></i> Notes
</a>
{% endif %}
</div> </div>
</li> </li>