Merge branch 'dev' into ckan-2.11.0

ckanext/odsh/plugin.py

@@ -325,7 +325,7 @@ class OdshPlugin(p.SingletonPlugin, DefaultTranslation, tk.DefaultDatasetForm):
           'odsh_load_mdk_sample_dataset': helpers_odsh.odsh_load_mdk_sample_dataset,
           'odsh_load_raw_mdk_sample_dataset': helpers_odsh.odsh_load_raw_mdk_sample_dataset,
           'format_resource_format': helpers_odsh.format_resource_format,
-          'odsh_matomo_enabled': helpers_odsh.odsh_show_testbanner,
+          'odsh_matomo_enabled': helpers_odsh.odsh_matomo_enabled,
           'odsh_matomo_base_uri': helpers_odsh.odsh_matomo_base_uri,
           'odsh_matomo_site_id': helpers_odsh.odsh_matomo_site_id,
          }

ckanext/odsh/templates/base.html

@@ -2,14 +2,6 @@
 
 {% block scripts %}
   {% asset 'ckanext-odsh/odsh_base_script' %}
-{% endblock scripts %}
-{% block styles %}
-  {{ super() }}
-  {% asset 'ckanext-odsh/odsh_base_style' %}
-{% endblock styles %}
-
-{% block head_extras %}
-  {{ super() }}
   {% if h.odsh_matomo_enabled() %}
     <!-- Matomo -->
     <script>
@@ -36,6 +28,14 @@
     </noscript>
     <!-- End Matomo Code -->
   {% endif %}
+{% endblock scripts %}
+{% block styles %}
+  {{ super() }}
+  {% asset 'ckanext-odsh/odsh_base_style' %}
+{% endblock styles %}
+
+{% block head_extras %}
+  {{ super() }}
 {% endblock %}
 
 {% block bodytag %} data-site-root="{{ h.odsh_public_url() }}" data-locale-root="{{ h.odsh_public_url() }}" {% endblock %}

ckanext/odsh/templates/header.html

@@ -111,7 +111,6 @@
               </li>
               {% endblock %} {% endblock %}
             </ul>
-            </a>
           </li>
           {% else %}
           <li class='{{clazz}}'>

ckanext/odsh/templates/package/search.html

@@ -18,6 +18,7 @@ method="get" data-module="select-switch">
     <div class='btn show-filters'><i class="fa fa-filter"></i> {{ _("Filter") }}</div>
     {% snippet "snippets/search_box.html", query=q %}
   </div>
+</form>
 {% endblock %}
 
 {% block primary_content %}
@@ -25,7 +26,7 @@ method="get" data-module="select-switch">
     <div class="module-content">
       {% block page_primary_action %}
       {% endblock %}
-      <div class="search-form">
+      <div>
         {% block form %}
           {{ super() }}
         {% endblock %}
@@ -116,7 +117,6 @@ method="get" data-module="select-switch">
 {% endblock %}
 
 {% block pre_wrap %}
-</form>
 {% endblock %}
 
 {% block scripts %}