cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Kaibu 2019-11-19 20:21:37 +01:00
commit 6209586419
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cookbook/templates/base.html
View File

@ -59,7 +59,7 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
{% trans 'Tags' %}
<i class="fas fa-tags"></i> {% trans 'Tags' %}
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="{% url 'list_keyword' %}"><i
@ -70,8 +70,7 @@
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
{% trans 'Storage Data' %}
aria-haspopup="true" aria-expanded="false"><i class="fas fa-database"></i> {% trans 'Storage Data' %}
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="{% url 'list_storage' %}"><i
@ -90,7 +89,7 @@
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>
<a class="nav-link" href="{% url 'admin:index' %}"><i class="fas fa-user-shield"></i> {% trans 'Admin' %}</a>
</li>
<li class="nav-item">
{% if user.is_authenticated %}

2
cookbook/templates/generic/list_template.html
View File

@ -11,7 +11,7 @@
<div class="table-container">
<h3>{{ title }} {% trans 'List' %}
{% if create_url %}
<a href="{% url create_url %}"> <i class="fal fa-plus-circle"></i>
<a href="{% url create_url %}"> <i class="fas fa-plus-circle"></i>
</a>
{% endif %}
</h3>

6
cookbook/templates/index.html
View File

@ -21,10 +21,10 @@
<div class="card-body">
<form action="" method="get" id="search_form">
{{ filter.form|crispy }}
<input class="btn btn-primary" type="submit" value="{% trans 'Search' %}"/>
<button class="btn btn-primary" value="1"><i class="fas fa-search"></i> {% trans 'Search' %}</button>
<a href="#" onclick="window.location = window.location.pathname;"
class="btn btn-warning">{% trans 'Reset' %}</a>
<a href="{% url 'new_recipe' %}" class="btn btn-success">{% trans 'New' %}</a>
class="btn btn-warning"><i class="fas fa-backspace"></i> {% trans 'Reset' %}</a>
<a href="{% url 'new_recipe' %}" class="btn btn-success"><i class="fas fa-plus-circle"></i> {% trans 'New' %}</a>
</form>
</div>