From: vyshane <vyshane>
Date: Wed, 18 Oct 2006 07:05:21 +0000 (+0000)
Subject: Merged from 1.7
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8b8a8779dc74146ab2e9ba8a2f87463dfe6ee9e1;p=moodle.git

Merged from 1.7
---

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 1017d93faa..8006bf66cb 100644
--- 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 86b5eea003..88594db454 100644
--- 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 85064de410..f863b847b8 100644
--- 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 a7e9a50bbd..86f90240d3 100755
--- a/lib/yui/logger/assets/logger.css
+++ b/lib/yui/logger/assets/logger.css
@@ -1,20 +1 @@
-/* logger default styles */

-/* font size is controlled here: default 77% */

-#yui-log {position:absolute;top:1em;right:1em;font-size:77%;text-align:left;}

-/* width is controlled here: default 31em */

-.yui-log {padding:1em;width:31em;background-color:#AAA;border:1px solid black;font-family:monospace;z-index:9000;}

-.yui-log p {margin:1px;padding:.1em;}

-.yui-log button {font-family:monospace;}

-.yui-log .yui-log-hd {margin-top:1em;padding:.5em;background-color:#575757;color:#FFF;}

-/* height is controlled here: default 20em*/

-.yui-log .yui-log-bd {width:100%;height:20em;background-color:#FFF;border:1px solid gray;overflow:auto;}

-.yui-log .yui-log-ft {margin-top:.5em;margin-bottom:1em;}

-.yui-log .yui-log-ft .yui-log-categoryfilters {}

-.yui-log .yui-log-ft .yui-log-sourcefilters {width:100%;border-top:1px solid #575757;margin-top:.75em;padding-top:.75em;}

-.yui-log .yui-log-btns {position:relative;float:right;bottom:.25em;}

-.yui-log .yui-log-filtergrp {margin-right:.5em;}

-.yui-log .info {background-color:#A7CC25;} /* A7CC25 green */

-.yui-log .warn {background-color:#F58516;} /* F58516 orange */

-.yui-log .error {background-color:#E32F0B;} /* E32F0B red */

-.yui-log .time {background-color:#A6C9D7;} /* A6C9D7 blue */

-.yui-log .window {background-color:#F2E886;} /* F2E886 tan */

+/* logger default styles */

/* font size is controlled here: default 77% */

#yui-log {position:absolute;top:1em;right:1em;font-size:77%;text-align:left;}

/* width is controlled here: default 31em */

.yui-log {padding:1em;width:31em;background-color:#AAA;border:1px solid black;font-family:monospace;z-index:9000;}

.yui-log p {margin:1px;padding:.1em;}

.yui-log button {font-family:monospace;}

.yui-log .yui-log-hd {margin-top:1em;padding:.5em;background-color:#575757;color:#FFF;}

/* height is controlled here: default 20em*/

.yui-log .yui-log-bd {width:100%;height:20em;background-color:#FFF;border:1px solid gray;overflow:auto;}

.yui-log .yui-log-ft {margin-top:.5em;margin-bottom:1em;}

.yui-log .yui-log-ft .yui-log-categoryfilters {}

.yui-log .yui-log-ft .yui-log-sourcefilters {width:100%;border-top:1px solid #575757;margin-top:.75em;padding-top:.75em;}

.yui-log .yui-log-btns {position:relative;float:right;bottom:.25em;}

.yui-log .yui-log-filtergrp {margin-right:.5em;}

.yui-log .info {background-color:#A7CC25;} /* A7CC25 green */

.yui-log .warn {background-color:#F58516;} /* F58516 orange */

.yui-log .error {background-color:#E32F0B;color:black;} /* E32F0B red */

.yui-log .time {background-color:#A6C9D7;} /* A6C9D7 blue */

.yui-log .window {background-color:#F2E886;} /* F2E886 tan */

\ No newline at end of file