From 124b1091fa58fd4e7881f39618ede0c704a71b90 Mon Sep 17 00:00:00 2001
From: mark-nielsen <mark-nielsen>
Date: Tue, 24 Jul 2007 07:13:14 +0000
Subject: [PATCH] Moved some printing out of the center column (keeps blocks
 and center column content aligned) and cleaned some white space

---
 mod/lesson/view.php       | 10 ++++++++++
 mod/lesson/viewstart.html | 23 ++++++-----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 347b73852f..5f43117b56 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -510,6 +510,16 @@
 
     /// Print the page header, heading and tabs
         $PAGE->print_header();
+
+        if ($attemptflag) {
+            print_heading(get_string('attempt', 'lesson', $retries + 1));
+        }
+
+        /// This calculates and prints the ongoing score
+        if ($lesson->ongoing and !empty($pageid)) {
+            lesson_print_ongoing_score($lesson);
+        }
+
         require($CFG->dirroot.'/mod/lesson/viewstart.html');
 
         // now starting to print the page's contents   
diff --git a/mod/lesson/viewstart.html b/mod/lesson/viewstart.html
index 15f17dbe94..d9286e96ae 100644
--- a/mod/lesson/viewstart.html
+++ b/mod/lesson/viewstart.html
@@ -26,27 +26,16 @@
         <?php } ?>
         <!-- Start main column -->
         <td id="middle-column" align="center">
-            
+
             <?php if ($lesson->displayleft) { ?>
-            
+
             <a name="maincontent" id="maincontent" title="<?php print_string('anchortitle', 'lesson') ?>"></a>
-            
+
             <?php } ?>
 
-<?php if($lesson->slideshow && $page->qtype == LESSON_BRANCHTABLE) { // Starts the slideshow div ?>
-    
-            <div class="slideshow" style="background-color: <?php echo $lesson->bgcolor?>; height: <?php echo $lesson->height ?>px; width: <?php echo $lesson->width?>px;">
-                
-<?php } ?>
+<?php if ($lesson->slideshow && $page->qtype == LESSON_BRANCHTABLE) { // Starts the slideshow div ?>
 
-<?php 
-    if ($attemptflag) {
-        print_heading(get_string('attempt', 'lesson', $retries + 1));
-    }
+            <div class="slideshow" style="background-color: <?php echo $lesson->bgcolor?>; height: <?php echo $lesson->height ?>px; width: <?php echo $lesson->width?>px;">
 
-    /// This calculates and prints the ongoing score
-    if ($lesson->ongoing and !empty($pageid)) {
-        lesson_print_ongoing_score($lesson);
-    }
-?>
+<?php } ?>
 <!-- End view start -->
\ No newline at end of file
-- 
2.39.5