MDL-19010: In developer debug mode, print information about this page in the footer.

diff --git a/lib/outputlib.php b/lib/outputlib.php
index 30626b8ed19de76e4ba6c4d4396dd87a40a4c2ec..eb6c04977188ea203250358feff6f63eb5c1cf78 100644 (file)
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -1718,6 +1718,9 @@ class moodle_core_renderer extends moodle_renderer_base {
         // but some of the content won't be known until later, so we return a placeholder
         // for now. This will be replaced with the real content in {@link footer()}.
         $output = self::PERFORMANCE_INFO_TOKEN;
+        if (debugging('', DEBUG_DEVELOPER)) {
+            $output .= '<div class="performanceinfo">This page is: ' . $this->page->debug_summary() . '</div>';
+        }
         if (debugging()) {
             $output .= '<div class="validators"><ul>
               <li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=' . urlencode(qualified_me()) . '">Validate HTML</a></li>

diff --git a/lib/pagelib.php b/lib/pagelib.php
index 4e001861610050982585669f89c2fddc61a3d37f..1d63fee10e04c8deb32c4c63d759fd57dfabe959 100644 (file)
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -482,6 +482,18 @@ class moodle_page {
         return has_any_capability($this->all_editing_caps(), $this->context);
     }
 
+    /**
+     * @return string a description of this page (context, page-type and sub-page.
+     */
+    public function debug_summary() {
+        $summary = 'Context ' . print_context_name($this->context) . ' (context id ' . $this->context->id . '). ';
+        $summary .= 'Page type ' . $this->pagetype .  '. ';
+        if ($this->subpage) {
+            'Sub-page ' . $this->subpage .  '. ';
+        }
+        return $summary;
+    }
+
 /// Setter methods =============================================================
 
     /**

diff --git a/theme/anomaly/footer.html b/theme/anomaly/footer.html
index c3a1a6b97b024936aba776b5db00fb60713680d7..94b10ed34efa2ab93fd723fe0b5df642b0b59958 100644 (file)
--- a/theme/anomaly/footer.html
+++ b/theme/anomaly/footer.html
@@ -7,60 +7,50 @@
 ?>
 
 <div id="footer-b" class="clearfix">
-       <div id="footer-l">
-               <div id="footer-r">
-                       <div id="footer-m" class="clearfix">
-       
-                               <div id="footer-logo">
-                                       <a href="http://moodle.org" target="_blank"><img src="<?php echo $CFG->themewww .'/'. current_theme() ?>/images/logo.jpg" title="Moodle <?php echo $CFG->release ?>" /></a>
-                               </div>
+    <div id="footer-l">
+        <div id="footer-r">
+            <div id="footer-m" class="clearfix">
+    
+                <div id="footer-logo">
+                    <a href="http://moodle.org" target="_blank"><img src="<?php echo $CFG->themewww .'/'. current_theme() ?>/images/logo.jpg" title="Moodle <?php echo $CFG->release ?>" /></a>
+                </div>
 
-                               <div id="footer-helplink">
-                                       <?php echo page_doc_link(get_string('moodledocslink')); ?>
-                               </div>
+                <div id="footer-helplink">
+                    <?php echo page_doc_link(get_string('moodledocslink')); ?>
+                </div>
 
-                               <div id="footer-loggedinas">
-                                       <?php echo $loggedinas; ?>
-                               </div>
-                       
-                       </div>
-               </div>
-       </div>
+                <div id="footer-loggedinas">
+                    <?php echo $loggedinas; ?>
+                </div>
+            
+            </div>
+        </div>
+    </div>
 </div>
-
-<?php
-
-    if ($navigation and false) { ?>
-    <div class="navbar clearfix">
-        <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
-        <div class="menu"><?php echo $menu; ?></div>
+<?php print_container_end(); ?>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
-               }
-
-
-    if (!empty($performanceinfo)) {
+</div> <!-- end #page -->
+<?php if (!empty($performanceinfo)) {
         echo $performanceinfo;
     }
 
+    if (debugging()) {
+        echo '<div class="performanceinfo">This page is: ' . $this->page->debug_summary() . '</div>';
+    }
     if (debugging()) { ?>
-        <div class="validators"><ul>
+            <div class="validators"><ul>
           <li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li>
           <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li>
           <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li>
         </ul></div>
-<?php }
-
-    print_container_end();
-?>                                                     
-                                                               </div>
-                                                       </div>
-                                               </div>
-                                       </div>
-                               </div>
-                       </div>
-               </div>
-       </div>
-</div> <!-- end #page -->
+<?php } ?>
 
 <script type="text/javascript" charset="utf-8">
 /* <![CDATA[ */