From d80a7da7c1566f40a50411b826cc7db4e547ee48 Mon Sep 17 00:00:00 2001
From: Mary Evans <lazydaisy@visible-expression.co.uk>
Date: Sat, 22 Jun 2013 20:34:44 +0100
Subject: [PATCH] MDL-40255 theme_boxxie/theme_formfactor: Added block-region
 class to layout files to enable dnd file uploader to work.

---
 theme/boxxie/layout/frontpage.php     |  6 ++--
 theme/boxxie/layout/general.php       |  4 +--
 theme/formfactor/layout/frontpage.php | 26 ++++++++---------
 theme/formfactor/layout/general.php   | 42 +++++++++++++--------------
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/theme/boxxie/layout/frontpage.php b/theme/boxxie/layout/frontpage.php
index e12091ff630..2cde03ac14f 100644
--- a/theme/boxxie/layout/frontpage.php
+++ b/theme/boxxie/layout/frontpage.php
@@ -70,7 +70,7 @@ echo $OUTPUT->doctype() ?>
                 </div>
 
                 <?php if ($hassidepre) { ?>
-                <div id="region-pre">
+                <div id="region-pre" class="block-region">
                     <div class="region-content">
                         <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
                     </div>
@@ -78,7 +78,7 @@ echo $OUTPUT->doctype() ?>
                 <?php } ?>
 
                 <?php if ($hassidepost) { ?>
-                <div id="region-post">
+                <div id="region-post" class="block-region">
                     <div class="region-content">
                         <?php echo $OUTPUT->blocks_for_region('side-post') ?>
                     </div>
@@ -102,7 +102,7 @@ echo $OUTPUT->doctype() ?>
 
 if ($hasheading || $hasnavbar) { ?>
 
- 	<div class="myclear"></div>
+    <div class="myclear"></div>
   </div> <!-- END #page -->
 
 </div> <!-- END #page-wrapper -->
diff --git a/theme/boxxie/layout/general.php b/theme/boxxie/layout/general.php
index 7d6369473c4..8abc8fc94ca 100644
--- a/theme/boxxie/layout/general.php
+++ b/theme/boxxie/layout/general.php
@@ -79,7 +79,7 @@ echo $OUTPUT->doctype() ?>
                 </div>
 
                 <?php if ($hassidepre) { ?>
-                <div id="region-pre">
+                <div id="region-pre" class="block-region">
                     <div class="region-content">
                         <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
                     </div>
@@ -87,7 +87,7 @@ echo $OUTPUT->doctype() ?>
                 <?php } ?>
 
                 <?php if ($hassidepost) { ?>
-                <div id="region-post">
+                <div id="region-post" class="block-region">
                     <div class="region-content">
                         <?php echo $OUTPUT->blocks_for_region('side-post') ?>
                     </div>
diff --git a/theme/formfactor/layout/frontpage.php b/theme/formfactor/layout/frontpage.php
index 76d88ae11ab..ca4db095354 100644
--- a/theme/formfactor/layout/frontpage.php
+++ b/theme/formfactor/layout/frontpage.php
@@ -31,16 +31,16 @@ echo $OUTPUT->doctype() ?>
 <!-- START OF HEADER -->
 
     <div id="page-header" class="clearfix">
-		<div id="page-header-wrapper">
-	        <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
-    	    <div class="headermenu">
-        		<?php
-	        	    echo $OUTPUT->login_info();
-    	        	echo $OUTPUT->lang_menu();
-	        	    echo $PAGE->headingmenu;
-		        ?>
-	    	</div>
-	    </div>
+        <div id="page-header-wrapper">
+            <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+            <div class="headermenu">
+                <?php
+                    echo $OUTPUT->login_info();
+                    echo $OUTPUT->lang_menu();
+                    echo $PAGE->headingmenu;
+                ?>
+            </div>
+        </div>
     </div>
 
     <?php if ($hascustommenu) { ?>
@@ -49,7 +49,7 @@ echo $OUTPUT->doctype() ?>
       <ul id="page-navigation" class="clearfix">
         <li>&nbsp;</li>
       </ul>
-  	<?php } ?>
+    <?php } ?>
 
 <!-- END OF HEADER -->
 
@@ -69,7 +69,7 @@ echo $OUTPUT->doctype() ?>
                 </div>
 
                 <?php if ($hassidepre) { ?>
-                <div id="region-pre">
+                <div id="region-pre" class="block-region">
                     <div class="region-content">
                         <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
                     </div>
@@ -77,7 +77,7 @@ echo $OUTPUT->doctype() ?>
                 <?php } ?>
 
                 <?php if ($hassidepost) { ?>
-                <div id="region-post">
+                <div id="region-post" class="block-region">
                     <div class="region-content">
                         <?php echo $OUTPUT->blocks_for_region('side-post') ?>
                     </div>
diff --git a/theme/formfactor/layout/general.php b/theme/formfactor/layout/general.php
index 7d4b5196354..5910315e897 100644
--- a/theme/formfactor/layout/general.php
+++ b/theme/formfactor/layout/general.php
@@ -33,22 +33,22 @@ echo $OUTPUT->doctype() ?>
 <?php if ($hasheading || $hasnavbar) { ?>
 
     <div id="page-header" class="clearfix">
-		<div id="page-header-wrapper">
-
-	        <?php if ($hasheading) { ?>
-		    	<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
-    		    <div class="headermenu">
-        			<?php
-            			echo $OUTPUT->login_info();
-		           		if (!empty($PAGE->layout_options['langmenu'])) {
-		        	       	echo $OUTPUT->lang_menu();
-			    	    }
-    			       	echo $PAGE->headingmenu
-        			?>
-	        	</div>
-	        <?php } ?>
-
-	    </div>
+        <div id="page-header-wrapper">
+
+            <?php if ($hasheading) { ?>
+                <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+                <div class="headermenu">
+                    <?php
+                        echo $OUTPUT->login_info();
+                        if (!empty($PAGE->layout_options['langmenu'])) {
+                            echo $OUTPUT->lang_menu();
+                        }
+                        echo $PAGE->headingmenu
+                    ?>
+                </div>
+            <?php } ?>
+
+        </div>
     </div>
 
     <?php if ($hasheading) { ?>
@@ -59,11 +59,11 @@ echo $OUTPUT->doctype() ?>
           <li>&nbsp;</li>
         </ul>
       <?php } ?>
-	<?php } ?>
+    <?php } ?>
 
     <?php if ($hasnavbar) { ?>
-	    <div class="navbar clearfix">
-    	    <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
+        <div class="navbar clearfix">
+            <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
             <div class="navbutton"> <?php echo $PAGE->button; ?></div>
         </div>
     <?php } ?>
@@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
                 </div>
 
                 <?php if ($hassidepre) { ?>
-                <div id="region-pre">
+                <div id="region-pre" class="block-region">
                     <div class="region-content">
                         <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
                     </div>
@@ -93,7 +93,7 @@ echo $OUTPUT->doctype() ?>
                 <?php } ?>
 
                 <?php if ($hassidepost) { ?>
-                <div id="region-post">
+                <div id="region-post" class="block-region">
                     <div class="region-content">
                         <?php echo $OUTPUT->blocks_for_region('side-post') ?>
                     </div>
-- 
2.17.1