From 7d31f7976dc6239890aa6bb8951a93793d1df944 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 13 Dec 2010 17:32:59 +0000
Subject: [PATCH] NIHVIVO-560:  Organizing js files and adding selectivizr.js
 back

---
 themes/wilma/templates/footer.ftl |  9 ---------
 themes/wilma/templates/head.ftl   | 10 ++++++++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl
index ccb6f0b9..9191dc3f 100644
--- a/themes/wilma/templates/footer.ftl
+++ b/themes/wilma/templates/footer.ftl
@@ -27,13 +27,4 @@
     </nav>
 </footer>
 
-<!--[if lt IE 7]>
-<script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
-<script type="text/javascript" src="${urls.base}/js/utils.js"></script>
-<![endif]-->
-
-<!--[if (gte IE 6)&(lte IE 8)]>
-<script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
-<![endif]-->
-
 <#include "scripts.ftl">
\ No newline at end of file
diff --git a/themes/wilma/templates/head.ftl b/themes/wilma/templates/head.ftl
index eafef476..c4c5b84d 100644
--- a/themes/wilma/templates/head.ftl
+++ b/themes/wilma/templates/head.ftl
@@ -14,9 +14,15 @@
     <#include "headScripts.ftl">
     
     <!--[if lt IE 7]>
-    <link rel="stylesheet" href="css/ie6.css" />
+    <link rel="stylesheet" href="${urls.theme}/css/ie6.css" />
+    <script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
+    <script type="text/javascript" src="${urls.theme}/js/utils.js"></script>
     <![endif]-->
 
     <!--[if IE 7]>
-    <link rel="stylesheet" href="css/ie7.css" />
+    <link rel="stylesheet" href="${urls.theme}/css/ie7.css" />
+    <![endif]-->
+    
+    <!--[if (gte IE 6)&(lte IE 8)]>
+    <script type="text/javascript" src="${urls.home}/js/selectivizr.js"></script>
     <![endif]-->
\ No newline at end of file