From 2c9d3b2936e8bb21443f62caed38e2bc12151349 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Thu, 1 Dec 2005 19:47:54 +0000
Subject: [PATCH] Use requireJS* and requireCSS* API to add JS and CSS.

---
 templates/ktcore/boolean_search.smarty | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/templates/ktcore/boolean_search.smarty b/templates/ktcore/boolean_search.smarty
index d66fc64..f92e42a 100644
--- a/templates/ktcore/boolean_search.smarty
+++ b/templates/ktcore/boolean_search.smarty
@@ -1,25 +1,24 @@
-<!-- NBM: FIX THE TEMPLATING SYSTEM -->
-
-<script language="javascript" src="/thirdpartyjs/MochiKit/Base.js"> </script>
-<script language="javascript" src="/thirdpartyjs/MochiKit/DateTime.js"> </script>
-<script language="javascript" src="/thirdpartyjs/MochiKit/Iter.js"> </script>
-<script language="javascript" src="/thirdpartyjs/MochiKit/DOM.js"> </script>
-<script language="javascript" src="/thirdpartyjs/MochiKit/Async.js"> </script>
-<script language="javascript" src="/presentation/lookAndFeel/knowledgeTree/js/taillog.js"> </script>
-<script language="javascript" src="/presentation/lookAndFeel/knowledgeTree/js/constructed_search.js"> </script>
-
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Base.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DateTime.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Iter.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DOM.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Async.js")}
+{$context->oPage->requireJSResource("presentation/lookAndFeel/knowledgeTree/js/taillog.js")}
+{$context->oPage->requireJSResource("presentation/lookAndFeel/knowledgeTree/js/constructed_search.js")}
+
+{capture assign=sJS}
 {literal}
-
-<script type="text/javascript">
 function testStartup() {
     simpleLog('INFO','Log initialised.');
 }
 
 addLoadEvent(testStartup);
-</script>
-
-<style>
+{/literal}
+{/capture}
+{$context->oPage->requireJSStandalone($sJS)}
 
+{capture assign=sCSS}
+{literal}
 fieldset { border: 1px dotted #999; }
 legend { border: 1px dotted #999;}
 
@@ -32,10 +31,9 @@ legend { border: 1px dotted #999;}
 #brad-log .severity-DEBUG { color: green; font-weight: bold; }
 #brad-log .severity-ERROR { color: red; font-weight: bold; }
 #brad-log .explanation { font-family: monospace; white-space: pre; }
-
-</style>
-
 {/literal}
+{/capture}
+{$context->oPage->requireCSSStandalone($sCSS)}
 
 <!-- this is bad, but we really don't need a roundtrip -->
 <div style="display: none" id="search-criteria-container">
--
libgit2 0.21.4