Upgrade templates for CRX 1.0 final release

vsalvino · vsalvino · commit d7c7050bf588 · 2022-08-25T10:45:39.000-04:00
diff --git a/coderedcms_bootstrap4/templates/coderedcms/blocks/google_map.html b/coderedcms_bootstrap4/templates/coderedcms/blocks/google_map.html
@@ -1,7 +1,7 @@
 <div class="embed-responsive embed-responsive-16by9 {{self.settings.custom_css_class}}"
 {% if self.settings.custom_id %}id="{{self.settings.custom_id}}"{% endif %}>
   {% if self.place_id %}
-  <iframe class="embed-responsive-item" width="100%" style="border:0" src="https://www.google.com/maps/embed/v1/place?q=place_id:{{ self.place_id }}&zoom={{ self.map_zoom_level }}&key={{ settings.coderedcms.GoogleApiSettings.google_maps_api_key}}" title="{{self.map_title}}" allowfullscreen></iframe>
+  <iframe class="embed-responsive-item" width="100%" style="border:0" src="https://www.google.com/maps/embed/v1/place?q=place_id:{{ self.place_id }}&zoom={{ self.map_zoom_level }}&key={{ settings.coderedcms.LayoutSettings.google_maps_api_key}}" title="{{self.map_title}}" allowfullscreen></iframe>
   {% else %}
   <iframe class="embed-responsive-item" width="100%" style="border:0" src="https://maps.google.com/maps?q={{ self.search|urlencode }}&output=embed" title="{{self.map_title}}" allowfullscreen></iframe>
   {% endif %}
diff --git a/coderedcms_bootstrap4/templates/coderedcms/includes/codered_banner.html b/coderedcms_bootstrap4/templates/coderedcms/includes/codered_banner.html
diff --git a/coderedcms_bootstrap4/templates/coderedcms/pages/base.html b/coderedcms_bootstrap4/templates/coderedcms/pages/base.html
@@ -47,7 +47,7 @@
         {# Pass in CMS variables to JavaScript #}
         <script>
             cr_site_url = "{{site.root_url}}";
-            cr_external_new_tab = {{settings.coderedcms.GeneralSettings.external_new_tab|yesno:"true,false"}};
+            cr_external_new_tab = {{settings.coderedcms.LayoutSettings.external_new_tab|yesno:"true,false"}};
             cr_version = "{% coderedcms_version %}";
         </script>
 
@@ -99,7 +99,7 @@
 
     <body class="coderedcms-{{page.content_type.model}} {% if page.get_parent %}parent-page-{{page.get_parent.id}}{% endif %} {% block body_class %}{% endblock %}" id="page-{{page.id}}">
 
-        {% include "coderedcms/includes/codered_banner.html" %}
+        {% include "coderedcms/includes/crx_banner.html" %}
 
         {% wagtailuserbar %}
 
diff --git a/coderedcms_bootstrap4/templates/coderedcms/pages/search.html b/coderedcms_bootstrap4/templates/coderedcms/pages/search.html
@@ -22,7 +22,7 @@ <h1>{% trans 'Search for' %} “{{form.s.value}}”</h1>
 <div class="container">
   {% block search_form %}
   {% if not settings.coderedcms.LayoutSettings.navbar_search %}
-  <form class="mt-5" action="{% url 'codered_search' %}" method="GET">
+  <form class="mt-5" action="{% url 'crx_search' %}" method="GET">
     <div class="row">
       <div class="col-sm-9">
         {% bootstrap_form form size='large' layout='inline' %}
diff --git a/coderedcms_bootstrap4/templates/coderedcms/snippets/navbar.html b/coderedcms_bootstrap4/templates/coderedcms/snippets/navbar.html
@@ -31,7 +31,7 @@
       {% endfor %}
       {% endif %}
       {% if settings.coderedcms.LayoutSettings.navbar_search %}
-      <form class="form-inline ml-auto" action="{% url 'codered_search' %}" method="GET">
+      <form class="form-inline ml-auto" action="{% url 'crx_search' %}" method="GET">
           {% load bootstrap4 %}
           {% get_searchform request as form %}
           {% bootstrap_form form layout='inline' %}
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="coderedcms-bootstrap4",
-    version="1.0.0",
+    version="1.0.1",
     author="CodeRed LLC",
     author_email="info@coderedcorp.com",
     url="https://github.com/coderedcorp/coderedcms-bootstrap4",
