Permalink
Browse files

Bugfix: blocks with no content at all show up as shadows when editing.

  • Loading branch information...
1 parent 89adb17 commit 22931cf410bd3c6efc4edf85d121046e71fe56b7 defacer committed May 28, 2004
Showing with 36 additions and 12 deletions.
  1. +1 −1 blocks/course_summary/block_course_summary.php
  2. +35 −11 blocks/moodleblock.class.php
View
2 blocks/course_summary/block_course_summary.php
@@ -18,7 +18,7 @@ function get_content() {
return $this->content;
}
- $this->content = New object;
+ $this->content = New stdClass;
$this->content->text = format_text($this->course->summary, FORMAT_HTML);
$this->content->footer = '';
View
46 blocks/moodleblock.class.php
@@ -66,22 +66,46 @@ function print_block() {
case BLOCK_TYPE_NUKE:
case BLOCK_TYPE_TEXT:
if(empty($this->content->text) && empty($this->content->footer)) {
- break;
+ if(empty($this->edit_controls)) {
+ // No content, no edit controls, so just shut up
+ break;
+ }
+ else {
+ // No content but editing, so show something at least
+ $this->print_shadow();
+ }
}
- if ($this->edit_controls !== NULL || !$this->hide_header()) {
- print_side_block($title, $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes());
- } else {
- print_side_block(NULL, $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes());
+ else {
+ if($this->hide_header() && empty($this->edit_controls)) {
+ // Header wants to hide, no edit controls to show, so no header it is
+ print_side_block(NULL, $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes());
+ }
+ else {
+ // The full treatment, please
+ print_side_block($title, $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes());
+ }
}
break;
case BLOCK_TYPE_LIST:
- if(empty($this->content->items) && empty($this->content->footer)) {
- break;
+ if(empty($this->content->text) && empty($this->content->footer)) {
+ if(empty($this->edit_controls)) {
+ // No content, no edit controls, so just shut up
+ break;
+ }
+ else {
+ // No content but editing, so show something at least
+ $this->print_shadow();
+ }
}
- if ($this->edit_controls !== NULL || !$this->hide_header()) {
- print_side_block($title, '', $this->content->items, $this->content->icons, $this->content->footer, $this->html_attributes());
- } else {
- print_side_block(NULL, '', $this->content->items, $this->content->icons, $this->content->footer, $this->html_attributes());
+ else {
+ if($this->hide_header() && empty($this->edit_controls)) {
+ // Header wants to hide, no edit controls to show, so no header it is
+ print_side_block(NULL, '', $this->content->items, $this->content->icons, $this->content->footer, $this->html_attributes());
+ }
+ else {
+ // The full treatment, please
+ print_side_block($title, '', $this->content->items, $this->content->icons, $this->content->footer, $this->html_attributes());
+ }
}
break;
}

0 comments on commit 22931cf

Please sign in to comment.