From 6a2c27749f511956c4d0a6da283e6207acf3313b Mon Sep 17 00:00:00 2001
From: smilerz <smilerz@gmail.com>
Date: Tue, 23 Mar 2021 13:58:16 -0500
Subject: [PATCH] updated links to import recipes

---
 cookbook/helper/recipe_url_import.py |  3 +++
 cookbook/templates/base.html         |  2 +-
 cookbook/templates/index.html        |  2 +-
 cookbook/templates/url_import.html   | 16 +++++++++++-----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cookbook/helper/recipe_url_import.py b/cookbook/helper/recipe_url_import.py
index 495c2220..1b0828d4 100644
--- a/cookbook/helper/recipe_url_import.py
+++ b/cookbook/helper/recipe_url_import.py
@@ -330,6 +330,9 @@ def parse_image(image):
                 image = pic
             elif 'url' in pic:
                 image = pic['url']
+    elif type(image) == dict:
+        if 'url' in image:
+            image = image['url']
 
     # ignore relative image paths
     if image[:4] != 'http':
diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index 3304a675..b0b49cfb 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -121,7 +121,7 @@
                             class="fas fa-chart-line fa-fw"></i> {% trans 'Statistics' %}</a>
                     <a class="dropdown-item" href="{% url 'edit_food' %}"><i
                             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>
 
                 </div>
diff --git a/cookbook/templates/index.html b/cookbook/templates/index.html
index 069b27bf..47997e7d 100644
--- a/cookbook/templates/index.html
+++ b/cookbook/templates/index.html
@@ -44,7 +44,7 @@
                                                 class="fas fa-plus-circle fa-fw"></i> {% trans 'New Recipe' %}</button>
                                         <button class="dropdown-item" type="button"
                                                 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 data-toggle="collapse" href="#collapse_adv_search"
                                                 role="button" class="dropdown-item"
diff --git a/cookbook/templates/url_import.html b/cookbook/templates/url_import.html
index ec0bf99b..e51c8cd0 100644
--- a/cookbook/templates/url_import.html
+++ b/cookbook/templates/url_import.html
@@ -274,7 +274,7 @@
                 <!-- start of source data -->
                 <div class="col" style="max-width:50%">
                     <div class="card card-border-primary">
-                        <div class="card-header"> 
+                        <div class="card-header">
                             <h3>{% trans 'Discovered Attributes' %}</h3>
                             <div class='small text-muted'>
                                 {% trans 'Drag recipe attributes from below into the appropriate box on the left. Click any node to display its full properties.' %} 
@@ -291,20 +291,26 @@
                             <input type="radio" autocomplete="off"> images
                             </label>
                         </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 card-border-primary" v-if="show_blank">
                                 <div class="card-header">
                                     <div class="row px-3" style="justify-content:space-between;">
                                         {% 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 class="small text-muted">{% trans 'Items dragged to Blank Field will be appended.'%}</div>
                                 </div>
                                 <div class="card-body drop-zone"  
-                                    v-model: blank_field
-                                    @drop="replacePreview()" 
+                                    @drop="replacePreview('blank', $event)" 
                                     @dragover.prevent 
-                                    @dragenter.prevent>
+                                    @dragenter.prevent
+                                    draggable
+                                    @dragstart="htmlDragStart($event)">
+                                    [[blank_field]]
                                 </div>
                             </div>
                             <!-- start of json data -->