Peter M. Groen / knowledgetree

Commit 5163b8e6d28456e92bf7cd50f7892afdbc716363

Authored by nbm
1 parent 69b4a0a7

Use requireJS* and requireCSS* API to add JS and CSS. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4303 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 16 additions and 18 deletions
templates/ktcore/boolean_search.smarty
  View file @5163b8e
1 -<!-- NBM: FIX THE TEMPLATING SYSTEM -->  
2 -  
3 -<script language="javascript" src="/thirdpartyjs/MochiKit/Base.js"> </script>  
4 -<script language="javascript" src="/thirdpartyjs/MochiKit/DateTime.js"> </script>  
5 -<script language="javascript" src="/thirdpartyjs/MochiKit/Iter.js"> </script>  
6 -<script language="javascript" src="/thirdpartyjs/MochiKit/DOM.js"> </script>  
7 -<script language="javascript" src="/thirdpartyjs/MochiKit/Async.js"> </script>  
8 -<script language="javascript" src="/presentation/lookAndFeel/knowledgeTree/js/taillog.js"> </script>  
9 -<script language="javascript" src="/presentation/lookAndFeel/knowledgeTree/js/constructed_search.js"> </script>  
10 - 1 +{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Base.js")}
  2 +{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DateTime.js")}
  3 +{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Iter.js")}
  4 +{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DOM.js")}
  5 +{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Async.js")}
  6 +{$context->oPage->requireJSResource("presentation/lookAndFeel/knowledgeTree/js/taillog.js")}
  7 +{$context->oPage->requireJSResource("presentation/lookAndFeel/knowledgeTree/js/constructed_search.js")}
  8 +
  9 +{capture assign=sJS}
11 {literal} 10 {literal}
12 -  
13 -<script type="text/javascript">  
14 function testStartup() { 11 function testStartup() {
15 simpleLog('INFO','Log initialised.'); 12 simpleLog('INFO','Log initialised.');
16 } 13 }
17 14
18 addLoadEvent(testStartup); 15 addLoadEvent(testStartup);
19 -</script>  
20 -  
21 -<style> 16 +{/literal}
  17 +{/capture}
  18 +{$context->oPage->requireJSStandalone($sJS)}
22 19
  20 +{capture assign=sCSS}
  21 +{literal}
23 fieldset { border: 1px dotted #999; } 22 fieldset { border: 1px dotted #999; }
24 legend { border: 1px dotted #999;} 23 legend { border: 1px dotted #999;}
25 24
@@ -32,10 +31,9 @@ legend { border: 1px dotted #999;} @@ -32,10 +31,9 @@ legend { border: 1px dotted #999;}
32 #brad-log .severity-DEBUG { color: green; font-weight: bold; } 31 #brad-log .severity-DEBUG { color: green; font-weight: bold; }
33 #brad-log .severity-ERROR { color: red; font-weight: bold; } 32 #brad-log .severity-ERROR { color: red; font-weight: bold; }
34 #brad-log .explanation { font-family: monospace; white-space: pre; } 33 #brad-log .explanation { font-family: monospace; white-space: pre; }
35 -  
36 -</style>  
37 -  
38 {/literal} 34 {/literal}
  35 +{/capture}
  36 +{$context->oPage->requireCSSStandalone($sCSS)}
39 37
40 <!-- this is bad, but we really don't need a roundtrip --> 38 <!-- this is bad, but we really don't need a roundtrip -->
41 <div style="display: none" id="search-criteria-container"> 39 <div style="display: none" id="search-criteria-container">