MDL-40255 theme_boxxie/theme_formfactor: Added block-region class to layout files...
authorMary Evans <lazydaisy@visible-expression.co.uk>
Sat, 22 Jun 2013 19:34:44 +0000 (20:34 +0100)
committerMary Evans <lazydaisy@visible-expression.co.uk>
Sat, 22 Jun 2013 20:27:55 +0000 (21:27 +0100)
theme/boxxie/layout/frontpage.php
theme/boxxie/layout/general.php
theme/formfactor/layout/frontpage.php
theme/formfactor/layout/general.php

index e12091f..2cde03a 100644 (file)
@@ -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 -->
index 7d63694..8abc8fc 100644 (file)
@@ -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>
index 76d88ae..ca4db09 100644 (file)
@@ -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>
index 7d4b519..5910315 100644 (file)
@@ -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>