Skip to content
Browse files

MDL-40255 theme_boxxie/theme_formfactor: Added block-region class to …

…layout files to enable dnd file uploader to work.
  • Loading branch information...
1 parent 8be321e commit 98159ddec27bff033d714fb65f5240ae885a1ed6 @lazydaisy lazydaisy committed Jun 22, 2013
View
6 theme/boxxie/layout/frontpage.php
@@ -70,15 +70,15 @@
</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>
</div>
<?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 @@
if ($hasheading || $hasnavbar) { ?>
- <div class="myclear"></div>
+ <div class="myclear"></div>
</div> <!-- END #page -->
</div> <!-- END #page-wrapper -->
View
4 theme/boxxie/layout/general.php
@@ -95,15 +95,15 @@
</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>
</div>
<?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>
View
26 theme/formfactor/layout/frontpage.php
@@ -31,16 +31,16 @@
<!-- 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 @@
<ul id="page-navigation" class="clearfix">
<li>&nbsp;</li>
</ul>
- <?php } ?>
+ <?php } ?>
<!-- END OF HEADER -->
@@ -69,15 +69,15 @@
</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>
</div>
<?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>
View
42 theme/formfactor/layout/general.php
@@ -43,22 +43,22 @@
<?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) { ?>
@@ -69,15 +69,15 @@
<li>&nbsp;</li>
</ul>
<?php } ?>
- <?php } ?>
+ <?php } ?>
<?php if (!empty($courseheader)) { ?>
<div id="course-header"><?php echo $courseheader; ?></div>
<?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 } ?>
@@ -101,15 +101,15 @@
</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>
</div>
<?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>

0 comments on commit 98159dd

Please sign in to comment.
Something went wrong with that request. Please try again.