updated links to import recipes
This commit is contained in:
parent
de60e12073
commit
6a2c27749f
@ -330,6 +330,9 @@ def parse_image(image):
|
|||||||
image = pic
|
image = pic
|
||||||
elif 'url' in pic:
|
elif 'url' in pic:
|
||||||
image = pic['url']
|
image = pic['url']
|
||||||
|
elif type(image) == dict:
|
||||||
|
if 'url' in image:
|
||||||
|
image = image['url']
|
||||||
|
|
||||||
# ignore relative image paths
|
# ignore relative image paths
|
||||||
if image[:4] != 'http':
|
if image[:4] != 'http':
|
||||||
|
@ -121,7 +121,7 @@
|
|||||||
class="fas fa-chart-line fa-fw"></i> {% trans 'Statistics' %}</a>
|
class="fas fa-chart-line fa-fw"></i> {% trans 'Statistics' %}</a>
|
||||||
<a class="dropdown-item" href="{% url 'edit_food' %}"><i
|
<a class="dropdown-item" href="{% url 'edit_food' %}"><i
|
||||||
class="fas fa-balance-scale fa-fw"></i> {% trans 'Units & Ingredients' %}</a>
|
class="fas fa-balance-scale fa-fw"></i> {% trans 'Units & Ingredients' %}</a>
|
||||||
<a class="dropdown-item" href="{% url 'view_import' %}"><i
|
<a class="dropdown-item" href="{% url 'data_import_url' %}"><i
|
||||||
class="fas fa-file-import"></i> {% trans 'Import Recipe' %}</a>
|
class="fas fa-file-import"></i> {% trans 'Import Recipe' %}</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
class="fas fa-plus-circle fa-fw"></i> {% trans 'New Recipe' %}</button>
|
class="fas fa-plus-circle fa-fw"></i> {% trans 'New Recipe' %}</button>
|
||||||
<button class="dropdown-item" type="button"
|
<button class="dropdown-item" type="button"
|
||||||
onclick="location.href='{% url 'data_import_url' %}'"><i
|
onclick="location.href='{% url 'data_import_url' %}'"><i
|
||||||
class="fas fa-cloud-download-alt fa-fw"></i> {% trans 'Website Import' %}
|
class="fas fa-cloud-download-alt fa-fw"></i> {% trans 'Import Recipe' %}
|
||||||
</button>
|
</button>
|
||||||
<button data-toggle="collapse" href="#collapse_adv_search"
|
<button data-toggle="collapse" href="#collapse_adv_search"
|
||||||
role="button" class="dropdown-item"
|
role="button" class="dropdown-item"
|
||||||
|
@ -291,20 +291,26 @@
|
|||||||
<input type="radio" autocomplete="off"> images
|
<input type="radio" autocomplete="off"> images
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
<i :class="[show_blank ? 'fa-chevron-up' : 'fa-chevron-down', 'fas']"
|
||||||
|
style="cursor:pointer;"
|
||||||
|
@click="show_blank=!show_blank"
|
||||||
|
title="{% trans 'Show Blank Field' %}"></i>
|
||||||
<div class="card-body p-1">
|
<div class="card-body p-1">
|
||||||
<div class="card card-border-primary" v-if="show_blank">
|
<div class="card card-border-primary" v-if="show_blank">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<div class="row px-3" style="justify-content:space-between;">
|
<div class="row px-3" style="justify-content:space-between;">
|
||||||
{% trans 'Blank Field' %}
|
{% trans 'Blank Field' %}
|
||||||
<i class="fas fa-eraser" style="cursor:pointer;" @click="blank_field=''" title="{% trans 'Clear Contents'%}"></i>
|
<i class="fas fa-eraser justify-content-end" style="cursor:pointer;" @click="blank_field=''" title="{% trans 'Clear Contents'%}"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="small text-muted">{% trans 'Items dragged to Blank Field will be appended.'%}</div>
|
<div class="small text-muted">{% trans 'Items dragged to Blank Field will be appended.'%}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body drop-zone"
|
<div class="card-body drop-zone"
|
||||||
v-model: blank_field
|
@drop="replacePreview('blank', $event)"
|
||||||
@drop="replacePreview()"
|
|
||||||
@dragover.prevent
|
@dragover.prevent
|
||||||
@dragenter.prevent>
|
@dragenter.prevent
|
||||||
|
draggable
|
||||||
|
@dragstart="htmlDragStart($event)">
|
||||||
|
[[blank_field]]
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- start of json data -->
|
<!-- start of json data -->
|
||||||
|
Loading…
Reference in New Issue
Block a user