mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 13:19:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into recipe-serving-count

Browse Source
This commit is contained in:
vabene1111
2020-12-28 10:19:52 +01:00
committed by GitHub
parent 6f3068a28c 95461316a5
commit c4273a4c3f
59 changed files with 12191 additions and 5803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/templates/base.html
View File

@@ -84,7 +84,7 @@
<li class="nav-item dropdown {% if request.resolver_match.url_name in 'list_keyword,data_batch_edit' %}active{% endif %}">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<i class="fas fa-tags"></i> {% trans 'Tags' %}
<i class="fas fa-tags"></i> {% trans 'Keywords' %}
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="{% url 'list_keyword' %}"><i
@@ -139,7 +139,7 @@
{% endif %}
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{% url 'docs_markdown' %}"><i
class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Help' %}</a>
class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Guide' %}</a>
<a class="dropdown-item" href="https://github.com/vabene1111/recipes"><i
class="fab fa-github fa-fw"></i> {% trans 'GitHub' %}</a>
<a class="dropdown-item" href="{% url 'docs_api' %}"><i

4
cookbook/templates/batch/monitor.html
View File

@@ -11,9 +11,9 @@
<div class="card border-info">
<div class="card-body text-info">
<p class="card-text">
{% trans 'On this Page you can manage all storage folder locations that should be monitored and synced' %}
{% trans 'On this Page you can manage all storage folder locations that should be monitored and synced.' %}
<br/>
{% trans 'The path must be in the following format' %} <code>/Folder/RecipesFolder</code>
{% trans 'The path must be in the following format' %}: <code>/Folder/RecipesFolder</code>
</p>
<form method="POST" class="post-form">{% csrf_token %}
{{ form|crispy }}

4
cookbook/templates/forms/ingredients.html
View File

@@ -23,7 +23,7 @@
<h4>{% trans 'Units' %}</h4>
<form action="{% url 'edit_food' %}" method="post"
onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two units ?' %}')">
onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two units?' %}')">
{% csrf_token %}
{{ units_form|crispy }}
<button class="btn btn-danger" type="submit"
@@ -33,7 +33,7 @@
<h4>{% trans 'Ingredients' %}</h4>
<form action="{% url 'edit_food' %}" method="post"
onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two ingredients ?' %}')">
onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two ingredients?' %}')">
{% csrf_token %}
{{ food_form|crispy }}
<button class="btn btn-danger" type="submit">

2
cookbook/templates/index.html
View File

@@ -62,7 +62,7 @@
</div>
<div class="row">
<div class="collapse col-md-12" id="collapse_adv_search">
<div class="collapse col-md-12{% if filter.data.keywords or filter.data.foods or filter.data.internal and not filter.data.internal == "unknown" %} show{% endif %}" id="collapse_adv_search">
<div style="margin-top: 1vh">
{{ filter.form.keywords | as_crispy_field }}
</div>

4
cookbook/templates/url_import.html
View File

@@ -194,9 +194,9 @@
</div>
<div class="form-group">
<label for="id_all_keywords">{% trans 'All Keywords' %}</label><br/>
{% trans 'All Keywords' %}<br/>
<input id="id_all_keywords" type="checkbox"
v-model="all_keywords"> {% trans 'Import all Keywords not only the ones already existing.' %}
v-model="all_keywords"> <label for="id_all_keywords">{% trans 'Import all Keywords not only the ones already existing.' %}</label>
</div>
<div class="form-group">