Minor layout corrections

main/template/default/layout/head.tpl

@@ -122,8 +122,7 @@ $(document).ready(function() {
                 'marginLeft':'50px'
             },200);
         }
-    );
-    
+    );    
     /*
     $(".td_actions").hide();    
     

main/template/default/layout/layout_1_col.tpl

@@ -7,7 +7,7 @@
 {/block}
 {* 1 column *}
 {block name=body}
-    {* Content top *}
+    {* Plugin top *}
 
     {if !empty($plugin_content_top)}         
         <div id="plugin_content_top" class="span12">
@@ -15,11 +15,15 @@
         </div>
     {/if}
     
+    
     <div class="span12">        
-        {include file="default/layout/page_body.tpl"}    
-    </div>
+        <section id="main_content">
+            {include file="default/layout/page_body.tpl"}
+            {$content}
+        </section>
+    </div>    
     
-    {* Content bottom *}
+    {* Plugin bottom *}
 
     {if !empty($plugin_content_bottom)}               
         <div id="plugin_content_bottom" class="span12">

main/template/default/layout/layout_2_col.tpl

@@ -13,10 +13,10 @@
 	{if $show_sniff == 1 }
 	 	{include file="default/layout/sniff.tpl"}
 	{/if}
-    	
-	<div class="span9">		
-        {* Content bottom *}
-
+   
+	<div class="span9">
+        
+        {* Plugin bottom *}
         {if !empty($plugin_content_top)}         
             <div id="plugin_content_top">
                 {$plugin_content_top}
@@ -32,8 +32,11 @@
 		
 		{* ?? *}
 		{$sniff_notification}
-		
-        {include file="default/layout/page_body.tpl"}	
+        
+		<section id="main_content">
+        {include file="default/layout/page_body.tpl"}	        
+        {$content}
+        </section>
 		
 		{* Announcements *}
         {if !empty($announcements_page_block)}

main/template/default/layout/main_header.tpl

@@ -85,6 +85,7 @@
 
         {* breadcrumb *}
         {$breadcrumb}
+        
         <div class="row">
             {if !empty($show_course_shortcut) }
                 <div class="span12">

main/template/default/layout/page_body.tpl

@@ -17,10 +17,4 @@
     <section id="messages">
         {$message}
     </section>
-{/if}
-
-{* Main content*}
-<section id="main_content">
-    {$content}
-    &nbsp;
-</section>
+{/if}

main/template/default/layout/show_footer.tpl

@@ -1,12 +1,13 @@
 {*
     show_header and show_footer templates are only called when using the Display::display_header and Display::display_footer
-    for backward compatibility we suppose that the default layout is one column which means ausing a div with class span12
+    for backward compatibility we suppose that the default layout is one column which means using a div with class span12
 *}
 {if $show_header}
 </div>
+</section>
 {/if}
-{* Content bottom *}
 
+{* Plugin bottom *}
 {if !empty($plugin_content_bottom)}       
     <div id="plugin_content_bottom" class="span12">
         {$plugin_content_bottom}

main/template/default/layout/show_header.tpl

@@ -1,6 +1,6 @@
 {*
     show_header and show_footer templates are only called when using the Display::display_header and Display::display_footer
-    for backward compatibility we suppose that the default layout is one column which means ausing a div with class span12
+    for backward compatibility we suppose that the default layout is one column which means using a div with class span12
 *}
 {include file="default/layout/main_header.tpl"}
 {if $show_header}
@@ -8,7 +8,8 @@
             <div id="plugin_content_top" class="span12">
                 {$plugin_content_top}
             </div>
-        {/if}
+        {/if}        
         <div class="span12">
-        {include file="default/layout/page_body.tpl"}
+            <section id="main_content">
+                {include file="default/layout/page_body.tpl"}
 {/if}