[#2618] Look at html shim and other vender stuff

ckan · Aug 14, 2012 · 987dde5 · 987dde5
1 parent 4e8195a
commit 987dde5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py
@@ -69,7 +69,7 @@ def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     #app = QueueLogMiddleware(app)
 
     # Fanstatic
-    if asbool(config.get('debug', False)):
+    if not asbool(config.get('debug', False)):
         fanstatic_config = {
             'versioning' : True,
             'recompute_hashes' : True,

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
@@ -288,6 +288,7 @@ def create_resource(path, lib_name, count):
         resource = Resource(library, filename, **kw)
         # add the resource to this module
         fanstatic_name = '%s/%s' % (lib_name, filename)
+        print 'create resource %s' % fanstatic_name
         setattr(module, fanstatic_name, resource)
         return resource
 
@@ -365,6 +366,8 @@ def create_resource(path, lib_name, count):
 base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'javascript'))
 create_library('base', base_path)
 
+base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'vendor'))
+create_library('vendor', base_path)
 
 ### create our libraries here from any subdirectories
 ##for dirname, dirnames, filenames in os.walk(os.path.dirname(__file__)):

diff --git a/ckan/templates/base.html b/ckan/templates/base.html
@@ -55,7 +55,8 @@
     #}
     {%- block html5shim -%}
       {# Temporary link until we get resource helper working #}
-      <!--[if lte IE 8]><script src="{% url_for_static '/base/vendor/html5.js' %}"></script><![endif]-->
+      {#      <!--[if lte IE 8]><script src="{% url_for_static '/base/vendor/html5.js' %}"></script><![endif]--> #}
+      {% resource 'vendor/html5.js' %}
     {%- endblock -%}
 
     {#