MDL-40759 icons: Split pix_icon from activity_icon

Activity icons always use the standard icon renderer.
This commit is contained in:
Damyon Wiese 2017-01-19 14:06:07 +08:00
parent 95b06c13c6
commit c2dde7eebc
7 changed files with 48 additions and 7 deletions

View file

@ -271,7 +271,7 @@ abstract class backup_activity_task extends backup_task {
// - section_included setting (if exists)
$settingname = $settingprefix . 'included';
$activity_included = new backup_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
$activity_included->get_ui()->set_icon(new pix_icon('icon', get_string('pluginname', $this->modulename),
$activity_included->get_ui()->set_icon(new activity_icon('icon', get_string('pluginname', $this->modulename),
$this->modulename, array('class' => 'iconlarge icon-post')));
$this->add_setting($activity_included);
// Look for "activities" root setting

View file

@ -287,7 +287,7 @@ abstract class restore_activity_task extends restore_task {
// - section_included setting (if exists)
$settingname = $settingprefix . 'included';
$activity_included = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
$activity_included->get_ui()->set_icon(new pix_icon('icon', get_string('pluginname', $this->modulename),
$activity_included->get_ui()->set_icon(new activity_icon('icon', get_string('pluginname', $this->modulename),
$this->modulename, array('class' => 'iconlarge icon-post')));
$this->add_setting($activity_included);
// Look for "activities" root setting

View file

@ -171,7 +171,7 @@ class core_backup_renderer extends plugin_renderer_base {
$table->data = array();
}
$name = get_string('pluginname', $activity->modulename);
$icon = new pix_icon('icon', $name, $activity->modulename, array('class' => 'iconlarge icon-pre'));
$icon = new activity_icon('icon', $name, $activity->modulename, array('class' => 'iconlarge icon-pre'));
$table->data[] = array(
$this->output->render($icon).$name,
$activity->title,