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

MDL-20204 blocks rendering does not depend on html_component any more

Browse Source
This commit is contained in:
Petr Skoda
2010-02-17 18:36:26 +00:00
parent 5be262b66f
commit dd72b308ed
4 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/moodleblock.class.php
+3 -13
View File
@@ -358,7 +358,8 @@ class block_base {
public function get_content_for_output($output) {
global $CFG;
$bc = new block_contents();
$bc = new block_contents($this->html_attributes());
$bc->blockinstanceid = $this->instance->id;
$bc->blockpositionid = $this->instance->blockpositionid;
@@ -371,17 +372,6 @@ class block_base {
$bc->add_class('invisible');
}
$attributes = $this->html_attributes();
if (isset($attributes['id'])) {
$bc->id = $attributes['id'];
unset($attributes['id']);
}
if (isset($attributes['class'])) {
$bc->set_classes($attributes['class']);
unset($attributes['class']);
}
$bc->attributes = $attributes;
if (!$this->hide_header()) {
$bc->title = $this->title;
}
@@ -545,7 +535,7 @@ class block_base {
function html_attributes() {
$attributes = array(
'id' => 'inst' . $this->instance->id,
'class' => 'block_' . $this->name()
'class' => 'block_' . $this->name(). ' sideblock'
);
if ($this->instance_can_be_docked() && get_user_preferences('docked_block_instance_'.$this->instance->id, 0)) {
$attributes['class'] .= ' dock_on_load';