L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-11370 :: added a global var $THEME->customcornersopen to track properly closed custom corners divs. In function print_footer I added a check if some custom_corneres divs are still open and eventually close them.

Browse Source
This commit is contained in:
urs_hunkler
2007-09-24 11:08:02 +00:00
parent 540286f1f2
commit c7a66cc4e1
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/custom_corners_lib.php
+8 -2
View File
@@ -17,6 +17,7 @@
* @param mixed $idbase, optionally, define one idbase to be added to all the elements in the corners
*/
function print_custom_corners_start($clearfix=false, $return=false, $idbase=null) {
global $THEME;
/// Analise if we want ids for the custom corner elements
$idbt = '';
@@ -37,7 +38,9 @@ function print_custom_corners_start($clearfix=false, $return=false, $idbase=null
$output .= "\n";
$output .= '<div '.$idi1.'class="i1"><div '.$idi2.'class="i2">';
$output .= (!empty($clearfix)) ? '<div '.$idi3.'class="i3 clearfix">' : '<div '.$idi3.'class="i3">';
$THEME->customcornersopen += 1;
if ($return) {
return $output;
} else {
@@ -53,6 +56,7 @@ function print_custom_corners_start($clearfix=false, $return=false, $idbase=null
* @param mixed $idbase, optionally, define one idbase to be added to all the elements in the corners
*/
function print_custom_corners_end($return=false, $idbase=null) {
global $THEME;
/// Analise if we want ids for the custom corner elements
$idbb = '';
@@ -66,7 +70,9 @@ function print_custom_corners_end($return=false, $idbase=null) {
$output .= "\n";
$output .= '<div '.$idbb.'class="bb"><div>&nbsp;</div></div>'."\n";
$output .= '</div>';
$THEME->customcornersopen -= ($THEME->customcornersopen > 0) ? 1 : 0;
if ($return) {
return $output;
} else {
lib/weblib.php
+8
View File
@@ -2665,6 +2665,13 @@ function print_footer($course=NULL, $usercourse=NULL, $return=false) {
}
}
/// Close eventually open custom_corner divs
if ((!empty($THEME->customcorners)) && ($THEME->customcornersopen > 1)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
while ($THEME->customcornersopen > 1) {
print_custom_corners_end();
}
}
/// Include the actual footer file
@@ -5948,6 +5955,7 @@ function print_side_block_start($heading='', $attributes = array()) {
if (!empty($THEME->customcorners)) {
echo '<div class="i1"><div class="i2">';
echo '<div class="i3">';
$THEME->customcornersopen += 1;
}
echo '<div class="content">';