Readded super and worked on webasset preloads

ckanext/odsh/fanstatic/webassets.yaml → ckanext/odsh/fanstatic/webassets.yml

@@ -2,6 +2,7 @@ odsh_base_script:
   filters: rjsmin # preprocessor
   output: ckanext-odsh/odsh_base.js
   contents:
+    - vendor/jquery-ui-autocomplete/jquery-ui.js
     - autocomplete.js
     - odsh.js
 
@@ -15,6 +16,9 @@ odsh_base_style:
 odsh_datepicker_script:
   filters: rjsmin # preprocessor
   output: ckanext-odsh/odsh_datepicker.js
+  extra:
+          preload:
+                  - vendor/jquery
   contents:
     - moment.js
     - bootstrap-datepicker.js
@@ -50,6 +54,9 @@ odsh_popover_script:
 tpsh_toggle_menu:
   filters: rjsmin # preprocessor
   output: ckanext-odsh/tpsh_toggle_menu.js
+  extra:
+          preload:
+                  - base/main
   contents:
     - tpsh_toggle_menu.js
 

ckanext/odsh/plugin.py

@@ -59,7 +59,7 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
     def update_config(self, config_):
         toolkit.add_template_directory(config_, 'templates')
         toolkit.add_public_directory(config_, 'public')
-        toolkit.add_resource('fanstatic', 'odsh')
+        toolkit.add_resource('fanstatic', 'ckanext-odsh')
 
 
     # IDatasetForm

ckanext/odsh/templates/base.html

@@ -4,6 +4,7 @@
   {% asset 'ckanext-odsh/odsh_base_script' %}
 {% endblock scripts %}
 {% block styles %}
+  {{ super() }}
   {% asset 'ckanext-odsh/odsh_base_style' %}
 {% endblock styles %}
 

ckanext/odsh/templates/package/search.html

 {% ckan_extends %}
 
 {% block styles %}
+  {{ super() }}
   {% asset 'ckanext-odsh/odsh_datepicker_style' %}
 {% endblock styles %}