From 52855c873e30ec7e6a00622bab35663ce05a6a99 Mon Sep 17 00:00:00 2001
From: Fulvio Sciarretta <zydio@users.sf.net>
Date: Thu, 1 Mar 2012 17:11:06 +0100
Subject: [PATCH] [#1788] fix for IE 6/7/8 conditional comments which prevented
 execution of Python code in Genshi, and caused html5 support script not being
 loaded/executed.

This required the addition of a pure Python function, and call of that function inside layout_base.html to resolve h.url_for_static() calls.
---
 ckan/templates/_util.html       | 19 +++++++++++++++++++
 ckan/templates/layout_base.html |  8 ++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ckan/templates/_util.html b/ckan/templates/_util.html
index 31a741b3799..8aab26807ba 100644
--- a/ckan/templates/_util.html
+++ b/ckan/templates/_util.html
@@ -480,4 +480,23 @@
     </span>
   </div>
 
+  <!--! jsConditionalForIe(ieVersion, tagContent, matchOperator): takes a
+        IE version number, a tag or other HTML code that will be wrapped inside
+        a IE conditional comment, and the comparison operator (lt, lte, etc..
+        see http://msdn.microsoft.com/en-us/library/ms537512%28v=vs.85%29.aspx)
+        returning Genshi stream ready to be shown in a template.
+        
+        NOTE:
+        Internet Explorer Conditional Import are confused as Genshi comments 
+        and python variables and method calls are not executed if inside them.
+        This function helps to output tags with Python code inside conditional
+        comments, eg ${h.url_for_static()} -->
+  <?python
+    from genshi import HTML
+    def jsConditionalForIe(ieVersion, tagContent, matchOperator = 'lt'):
+      html = HTML('<!--[if ' + matchOperator +  ' IE ' + str(ieVersion) + ''']>
+                     ''' + tagContent + '''
+                   <![endif]-->''')
+      return html
+  ?>
 </html>
diff --git a/ckan/templates/layout_base.html b/ckan/templates/layout_base.html
index 18dd8646a21..6ced02a0588 100644
--- a/ckan/templates/layout_base.html
+++ b/ckan/templates/layout_base.html
@@ -34,13 +34,9 @@
   <link rel="stylesheet" href="${h.url_for_static('/css/chosen.css')}" type="text/css" />
   <link rel="stylesheet" href="${h.url_for_static('/css/blueprint/screen.css')}" type="text/css" media="screen, projection" />
   <link rel="stylesheet" href="${h.url_for_static('/css/blueprint/print.css')}" type="text/css" media="print" />
-  <!--[if lt IE 8]>
-    <link rel="stylesheet" href="${h.url_for_static('/css/blueprint/ie.css')}" type="text/css" media="screen, projection">
-  <![endif]-->
-  <!--[if lt IE 9]>
-    <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/html5shiv/html5.js')}"></script>
-  <![endif]-->
+  ${jsConditionalForIe(8, '&lt;link rel="stylesheet" href="' + h.url_for_static('/css/blueprint/ie.css') + '" type="text/css" media="screen, projection"&gt;')}
   <link rel="stylesheet" href="${h.url_for_static('/css/style.css?v=2')}" />
+  ${jsConditionalForIe(9, '&lt;script type="text/javascript" src=" + h.url_for_static('/scripts/vendor/html5shiv/html5.js') + "&gt;&lt;/script&gt;')}
 
   <py:if test="defined('optional_head')">
     ${optional_head()}