generic modal refactored

cookbook/templates/base.html

@@ -336,6 +336,10 @@
     {% block content_fluid %}
     {% endblock %}
 
+    {% user_prefs request as prefs%}
+    {{ prefs|json_script:'user_preference' }}
+
+
 </div>
 
 {% block script %}

cookbook/templates/settings.html

@@ -28,10 +28,10 @@
                 {% trans 'Account' %}</a>
         </li>
         <li class="nav-item" role="presentation">
-            <a class="nav-link {% if active_tab == 'prefernces' %} active {% endif %}" id="preferences-tab"
+            <a class="nav-link {% if active_tab == 'preferences' %} active {% endif %}" id="preferences-tab"
                data-toggle="tab" href="#preferences" role="tab"
                aria-controls="preferences"
-               aria-selected="{% if active_tab == 'prefernces' %} 'true' {% else %} 'false' {% endif %}">
+               aria-selected="{% if active_tab == 'preferences' %} 'true' {% else %} 'false' {% endif %}">
                 {% trans 'Preferences' %}</a>
         </li>
         <li class="nav-item" role="presentation">
@@ -225,4 +225,4 @@
             window.location.hash = e.target.hash;
         })
     </script>
-{% endblock %}
+{% endblock %}

cookbook/templates/shopping_list.html

@@ -28,13 +28,6 @@
         <span class="col col-md-9">
             <h2>{% trans 'Shopping List' %}</h2>
         </span>
-        <span class="col-md-3">
-            <a href="{% url 'view_shopping_new' %}" class="float-right">
-                <button class="btn btn-outline-secondary shadow-none">
-                    <i class="fas fa-star"></i> {% trans 'Try the new shopping list' %}
-                </button>
-            </a>
-        </span>
         <div class="col col-mdd-3 text-right">
             <b-form-checkbox switch size="lg" v-model="edit_mode"
                              @change="$forceUpdate()">{% trans 'Edit' %}</b-form-checkbox>
@@ -977,4 +970,4 @@
         });
     </script>
 
-{% endblock %}
+{% endblock %}

cookbook/templates/url_import.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% comment %} TODO: refactor to be Vue app {% endcomment %}
 {% load i18n %}
 {% load static %}
 {% load custom_tags %}