Merged from 1.7

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 1017d93faa6472730f617e0042869d77ef3d04a5..8006bf66cb7ef8a73ed5fc861d4c5d59e92940f8 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -71,11 +71,6 @@
 
             print_require_js(array('yui_yahoo','yui_dom','yui_event','yui_dragdrop', 'yui_connection',
                                    'ajaxcourse_blocks','ajaxcourse_sections','ajaxcourse'));
-            
-            //javascript logging facilities
-            if (debugging())  {
-                print_require_js(Array('yui_logger'));
-            }
         }
     }
 

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 86b5eea00377fa25daf2b5fa45687d3999503998..88594db4549a066356b4ff0a4da226cfd7fbcfc2 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -56,11 +56,6 @@
 
             print_require_js(array('yui_yahoo','yui_dom','yui_event','yui_dragdrop', 'yui_connection',
                                    'ajaxcourse_blocks','ajaxcourse_sections','ajaxcourse'));
-
-            //javascript logging facilities
-            if (debugging())  {
-                print_require_js(Array('yui_logger'));
-            }
         }
     }
 

diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index 85064de410a77a0960e639f11ae5f8941a77502d..f863b847b8037f1735fc6b0b74616e3fd6589e68 100644 (file)
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -1,8 +1,9 @@
 <?php // Library functions for using AJAX with Moodle
 
 /**
- * Print require statements for javascript libraries
- * Takes in an array of either full paths or shortnames and it will translate them to full paths
+ * Print require statements for javascript libraries.
+ * Takes in an array of either full paths or shortnames and it will translate
+ * them to full paths.
  **/
 function print_require_js($list) {
     global $CFG;
@@ -33,6 +34,34 @@ function print_require_js($list) {
             echo "<script type='text/javascript' src='".$CFG->wwwroot.''.$list[$i]."'></script>\n";
         }
     }
+
+    if (debugging('', DEBUG_DEVELOPER)) {
+        echo "<script type='text/javascript' src='".$CFG->wwwroot.''.$translatelist['yui_logger']."'></script>\n";
+        
+        // Dependencies for the logger.
+        echo "<link type='text/css' rel='stylesheet' href='{$CFG->wwwroot}/lib/yui/logger/assets/logger.css'>";
+        
+        // FIXME: Below might get included more than once.
+        echo "<script type='text/javascript' src='".$CFG->wwwroot.''.$translatelist['yui_yahoo']."'></script>\n";
+        echo "<script type='text/javascript' src='".$CFG->wwwroot.''.$translatelist['yui_dom']."'></script>\n";
+        echo "<script type='text/javascript' src='".$CFG->wwwroot.''.$translatelist['yui_event']."'></script>\n";
+        echo "<script type='text/javascript' src='".$CFG->wwwroot.''.$translatelist['yui_dragdrop']."'></script>\n";
+        ?>
+        <script type="text/javascript">
+            
+            var logcontainer = null;
+
+            var logconfig = {
+                left: "60%",
+                top: "40px",
+            }
+            var logreader = new YAHOO.widget.LogReader(logcontainer, logconfig);
+            logreader.newestOnTop = false;
+            logreader.setTitle('Moodle Debug: YUI Log Console');
+
+        </script>
+        <?php
+    }
 }
 
 

diff --git a/lib/yui/logger/assets/logger.css b/lib/yui/logger/assets/logger.css
index a7e9a50bbde17e982214889a997bdb8d1249336e..86f90240d3cbd98beef21658bd4b1a9894427802 100755 (executable)
--- a/lib/yui/logger/assets/logger.css
+++ b/lib/yui/logger/assets/logger.css
@@ -1,20 +1 @@
-/* logger default styles */\r\r
-/* font size is controlled here: default 77% */\r\r
-#yui-log {position:absolute;top:1em;right:1em;font-size:77%;text-align:left;}\r\r
-/* width is controlled here: default 31em */\r\r
-.yui-log {padding:1em;width:31em;background-color:#AAA;border:1px solid black;font-family:monospace;z-index:9000;}\r\r
-.yui-log p {margin:1px;padding:.1em;}\r\r
-.yui-log button {font-family:monospace;}\r\r
-.yui-log .yui-log-hd {margin-top:1em;padding:.5em;background-color:#575757;color:#FFF;}\r\r
-/* height is controlled here: default 20em*/\r\r
-.yui-log .yui-log-bd {width:100%;height:20em;background-color:#FFF;border:1px solid gray;overflow:auto;}\r\r
-.yui-log .yui-log-ft {margin-top:.5em;margin-bottom:1em;}\r\r
-.yui-log .yui-log-ft .yui-log-categoryfilters {}\r\r
-.yui-log .yui-log-ft .yui-log-sourcefilters {width:100%;border-top:1px solid #575757;margin-top:.75em;padding-top:.75em;}\r\r
-.yui-log .yui-log-btns {position:relative;float:right;bottom:.25em;}\r\r
-.yui-log .yui-log-filtergrp {margin-right:.5em;}\r\r
-.yui-log .info {background-color:#A7CC25;} /* A7CC25 green */\r\r
-.yui-log .warn {background-color:#F58516;} /* F58516 orange */\r\r
-.yui-log .error {background-color:#E32F0B;} /* E32F0B red */\r\r
-.yui-log .time {background-color:#A6C9D7;} /* A6C9D7 blue */\r\r
-.yui-log .window {background-color:#F2E886;} /* F2E886 tan */\r\r
+/* logger default styles */\r\r/* font size is controlled here: default 77% */\r\r#yui-log {position:absolute;top:1em;right:1em;font-size:77%;text-align:left;}\r\r/* width is controlled here: default 31em */\r\r.yui-log {padding:1em;width:31em;background-color:#AAA;border:1px solid black;font-family:monospace;z-index:9000;}\r\r.yui-log p {margin:1px;padding:.1em;}\r\r.yui-log button {font-family:monospace;}\r\r.yui-log .yui-log-hd {margin-top:1em;padding:.5em;background-color:#575757;color:#FFF;}\r\r/* height is controlled here: default 20em*/\r\r.yui-log .yui-log-bd {width:100%;height:20em;background-color:#FFF;border:1px solid gray;overflow:auto;}\r\r.yui-log .yui-log-ft {margin-top:.5em;margin-bottom:1em;}\r\r.yui-log .yui-log-ft .yui-log-categoryfilters {}\r\r.yui-log .yui-log-ft .yui-log-sourcefilters {width:100%;border-top:1px solid #575757;margin-top:.75em;padding-top:.75em;}\r\r.yui-log .yui-log-btns {position:relative;float:right;bottom:.25em;}\r\r.yui-log .yui-log-filtergrp {margin-right:.5em;}\r\r.yui-log .info {background-color:#A7CC25;} /* A7CC25 green */\r\r.yui-log .warn {background-color:#F58516;} /* F58516 orange */\r\r.yui-log .error {background-color:#E32F0B;color:black;} /* E32F0B red */\r\r.yui-log .time {background-color:#A6C9D7;} /* A6C9D7 blue */\r\r.yui-log .window {background-color:#F2E886;} /* F2E886 tan */\r\r
\ No newline at end of file