From e4cc8f0c38f29c00ba431b1ab1a6aaef6867f352 Mon Sep 17 00:00:00 2001
From: nbm <nbm@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 1 Dec 2005 19:48:45 +0000
Subject: [PATCH] Use the requireJS* and requireCSS* API to add JS and CSS.

---
 templates/ktcore/manage_help_item.smarty                 |  7 ++++---
 templates/ktcore/metadata/conditional/editcomplex.smarty | 28 ++++++++++++++--------------
 templates/ktcore/widget_fieldset_conditional.smarty      | 19 ++++++++-----------
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/templates/ktcore/manage_help_item.smarty b/templates/ktcore/manage_help_item.smarty
index bc6d1c0..963e1b8 100644
--- a/templates/ktcore/manage_help_item.smarty
+++ b/templates/ktcore/manage_help_item.smarty
@@ -1,12 +1,13 @@
-<script language="javascript" type="text/javascript" src="{$config->get("KnowledgeTree/rootUrl")}/thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript">
+{$context->oPage->requireJSResource("thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js")}
+{capture assign=sJS}
 {literal}
 tinyMCE.init({
 		mode : "textareas",
 		theme : "simple",
 });
 {/literal}
-</script>
+{/capture}
+{$context->oPage->requireJSStandalone($sJS)}
 
 <form method="POST" action="{$smarty.server.PHP_SELF}">
 <input type="hidden" name="id" value="{$help->iId}">
diff --git a/templates/ktcore/metadata/conditional/editcomplex.smarty b/templates/ktcore/metadata/conditional/editcomplex.smarty
index 348267b..cbc96b9 100644
--- a/templates/ktcore/metadata/conditional/editcomplex.smarty
+++ b/templates/ktcore/metadata/conditional/editcomplex.smarty
@@ -1,5 +1,5 @@
+{capture assign=sCSS}
 {literal}
-<style type="text/css">
 /* inactivity */
 .active .inactivity_message { display: none; }
 
@@ -16,24 +16,24 @@
 { display: none; }
 
 .helpText { color: #666; }
-
-</style>
+{/literal}
+{/capture}
+{$context->oPage->requireCSSStandalone($sCSS)}
 
 <!-- include the mochikit js -->
-<script language="javascript" src="/thirdpartyjs/MochiKit/Base.js"> </script>
-<script language="javascript" src="/thirdpartyjs/MochiKit/Iter.js"> </script>
-<script language="javascript" src="/thirdpartyjs/MochiKit/DateTime.js"> </script>
-<script language="javascript" src="/thirdpartyjs/MochiKit/Async.js"> </script>
-<script language="javascript" src="/thirdpartyjs/MochiKit/DOM.js"> </script>
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Base.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Iter.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DateTime.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Async.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DOM.js")}
 
-<script language="javascript" src="/presentation/lookAndFeel/knowledgeTree/js/taillog.js"> </script>
-<script language="javascript" src="/presentation/lookAndFeel/knowledgeTree/js/conditional_complex_edit.js"> </script>
+{$context->oPage->requireJSResource("presentation/lookAndFeel/knowledgeTree/js/taillog.js")}
+{$context->oPage->requireJSResource("presentation/lookAndFeel/knowledgeTree/js/conditional_complex_edit.js")}
 
-<script language="javascript"> 
+{capture assign=sJS}
 addLoadEvent(updateActiveFields);
-</script>
-
-{/literal}
+{/capture}
+{$context->oPage->requireJSStandalone($sJS)}
 
 <h2>Edit Complex Conditional Metadata</h2>
 <form>
diff --git a/templates/ktcore/widget_fieldset_conditional.smarty b/templates/ktcore/widget_fieldset_conditional.smarty
index 2847655..76a8419 100644
--- a/templates/ktcore/widget_fieldset_conditional.smarty
+++ b/templates/ktcore/widget_fieldset_conditional.smarty
@@ -1,12 +1,10 @@
-<!-- we REALLY NEED that new ui component. -->
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Base.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Iter.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DOM.js")}
+{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Async.js")}
 
-<script language="javascript" src="/thirdpartyjs/MochiKit/Base.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>
+{capture assign=sJS}
 {literal}
-<script language="javascript"> 
-
 var baseUrl = "/presentation/lookAndFeel/knowledgeTree/ajaxConditional.php";
 var undoStack = Array();
 
@@ -116,11 +114,10 @@ function triggerUpdate(formname) {
    req.addCallback(formHandler);
    req.addErrback(errorForm);
 }
-
-
-
-</script>
 {/literal}
+{/capture}
+{$context->oPage->requireJSStandalone($sJS)}
+
 <!-- do we need to have more than one set of these on a page? -->
 <form >
 <input type="hidden" name="action" value="submitConditionalSet" />
--
libgit2 0.21.4