MDL-20787 final switch to new $OUTPUT->pix_url() - yay!

This commit is contained in:
Petr Skoda 2009-12-16 21:50:45 +00:00
parent cb1e046d6e
commit b5d0cafc6f
157 changed files with 576 additions and 576 deletions

View file

@ -137,7 +137,7 @@ class grade_edit_tree {
if ($this->element_deletable($element)) {
$actionicon = new moodle_action_icon();
$actionicon->link->url = new moodle_url('index.php', array('id' => $COURSE->id, 'action' => 'delete', 'eid' => $eid, 'sesskey' => sesskey()));
$actionicon->image->src = $OUTPUT->old_icon_url('t/delete');
$actionicon->image->src = $OUTPUT->pix_url('t/delete');
$actionicon->image->alt = get_string('delete');
$actionicon->image->title = get_string('delete');
$actionicon->image->add_class('iconsmall');
@ -146,7 +146,7 @@ class grade_edit_tree {
$actionicon = new moodle_action_icon();
$actionicon->link->url = new moodle_url('index.php', array('id' => $COURSE->id, 'action' => 'moveselect', 'eid' => $eid, 'sesskey' => sesskey()));
$actionicon->image->src = $OUTPUT->old_icon_url('t/move');
$actionicon->image->src = $OUTPUT->pix_url('t/move');
$actionicon->image->alt = get_string('move');
$actionicon->image->title = get_string('move');
$actionicon->image->add_class('iconsmall');
@ -224,7 +224,7 @@ class grade_edit_tree {
$moveicon->link->url->params($first);
}
$moveicon->image->add_class('movetarget');
$moveicon->image->src = $OUTPUT->old_icon_url('movehere');
$moveicon->image->src = $OUTPUT->pix_url('movehere');
$moveicon->image->alt = $strmovehere;
$moveicon->image->title = $strmovehere;

View file

@ -61,13 +61,13 @@ if ($keys) {
$icon->image->add_class('iconsmall');
$editicon = clone($icon);
$editicon->image->src = $OUTPUT->old_icon_url('t/edit');
$editicon->image->src = $OUTPUT->pix_url('t/edit');
$editicon->image->title = $stredit;
$editicon->image->alt = $stredit;
$buttons = $OUTPUT->action_icon($editicon);
$deleteicon = clone($icon);
$deleteicon->image->src = $OUTPUT->old_icon_url('t/delete');
$deleteicon->image->src = $OUTPUT->pix_url('t/delete');
$deleteicon->image->title = $strdelete;
$deleteicon->image->alt = $strdelete;
$deleteicon->link->url->param('delete', 1);

View file

@ -58,13 +58,13 @@ if ($keys = $DB->get_records_select('user_private_key', "script='grade/import' A
$icon->image->add_class('iconsmall');
$editicon = clone($icon);
$editicon->image->src = $OUTPUT->old_icon_url('t/edit');
$editicon->image->src = $OUTPUT->pix_url('t/edit');
$editicon->image->title = $stredit;
$editicon->image->alt = $stredit;
$buttons = $OUTPUT->action_icon($editicon);
$deleteicon = clone($icon);
$deleteicon->image->src = $OUTPUT->old_icon_url('t/delete');
$deleteicon->image->src = $OUTPUT->pix_url('t/delete');
$deleteicon->image->title = $strdelete;
$deleteicon->image->alt = $strdelete;
$deleteicon->link->url->param('delete', 1);

View file

@ -1222,7 +1222,7 @@ class grade_structure {
if ($element['object']->is_calculated()) {
$strcalc = get_string('calculatedgrade', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('i/calc') . '" class="icon itemicon" title="'.
return '<img src="'.$OUTPUT->pix_url('i/calc') . '" class="icon itemicon" title="'.
s($strcalc).'" alt="'.s($strcalc).'"/>';
} else if (($is_course or $is_category) and ($is_scale or $is_value)) {
@ -1234,18 +1234,18 @@ class grade_structure {
case GRADE_AGGREGATE_WEIGHTED_MEAN2:
case GRADE_AGGREGATE_EXTRACREDIT_MEAN:
$stragg = get_string('aggregation', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('i/agg_mean') . '" ' .
return '<img src="'.$OUTPUT->pix_url('i/agg_mean') . '" ' .
'class="icon itemicon" title="'.s($stragg).'" alt="'.s($stragg).'"/>';
case GRADE_AGGREGATE_SUM:
$stragg = get_string('aggregation', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('i/agg_sum') . '" ' .
return '<img src="'.$OUTPUT->pix_url('i/agg_sum') . '" ' .
'class="icon itemicon" title="'.s($stragg).'" alt="'.s($stragg).'"/>';
}
}
} else if ($element['object']->itemtype == 'mod') {
$strmodname = get_string('modulename', $element['object']->itemmodule);
return '<img src="'.$OUTPUT->old_icon_url('icon',
return '<img src="'.$OUTPUT->pix_url('icon',
$element['object']->itemmodule) . '" ' .
'class="icon itemicon" title="' .s($strmodname).
'" alt="' .s($strmodname).'"/>';
@ -1253,12 +1253,12 @@ class grade_structure {
} else if ($element['object']->itemtype == 'manual') {
if ($element['object']->is_outcome_item()) {
$stroutcome = get_string('outcome', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('i/outcomes') . '" ' .
return '<img src="'.$OUTPUT->pix_url('i/outcomes') . '" ' .
'class="icon itemicon" title="'.s($stroutcome).
'" alt="'.s($stroutcome).'"/>';
} else {
$strmanual = get_string('manualitem', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('t/manual_item') . '" '.
return '<img src="'.$OUTPUT->pix_url('t/manual_item') . '" '.
'class="icon itemicon" title="'.s($strmanual).
'" alt="'.s($strmanual).'"/>';
}
@ -1267,7 +1267,7 @@ class grade_structure {
case 'category':
$strcat = get_string('category', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('f/folder') . '" class="icon itemicon" ' .
return '<img src="'.$OUTPUT->pix_url('f/folder') . '" class="icon itemicon" ' .
'title="'.s($strcat).'" alt="'.s($strcat).'" />';
}
@ -1459,7 +1459,7 @@ class grade_structure {
$url = $gpr->add_url_params($url);
$editicon = new moodle_action_icon();
$editicon->link->url = $url;
$editicon->image->src = $OUTPUT->old_icon_url('t/edit');
$editicon->image->src = $OUTPUT->pix_url('t/edit');
$editicon->image->alt = $stredit;
$editicon->image->title = $stredit;
$editicon->image->add_class('iconsmall');
@ -1508,13 +1508,13 @@ class grade_structure {
}
$hideicon->link->url->param('action', 'show');
$hideicon->image->src = $OUTPUT->old_icon_url('t/' . $icon);
$hideicon->image->src = $OUTPUT->pix_url('t/' . $icon);
$hideicon->image->alt = $strshow;
$hideicon->image->title = $tooltip;
} else {
$hideicon->link->url->param('action', 'hide');
$hideicon->image->src = $OUTPUT->old_icon_url('t/hide');
$hideicon->image->src = $OUTPUT->pix_url('t/hide');
$hideicon->image->alt = $strhide;
$hideicon->image->title = $strhide;
}
@ -1553,7 +1553,7 @@ class grade_structure {
$strnonunlockable = get_string('nonunlockableverbose', 'grades', $strparamobj);
$lockicon = new html_image();
$lockicon->image->src = $OUTPUT->old_icon_url('t/unlock_gray');
$lockicon->image->src = $OUTPUT->pix_url('t/unlock_gray');
$lockicon->image->alt = s($strnonunlockable);
$lockicon->image->title = s($strnonunlockable);
$lockicon->image->add_class('iconsmall');
@ -1575,7 +1575,7 @@ class grade_structure {
}
$lockicon->link->url->param('action', 'unlock');
$lockicon->link->add_class('lock');
$lockicon->image->src = $OUTPUT->old_icon_url('t/'.$icon);
$lockicon->image->src = $OUTPUT->pix_url('t/'.$icon);
$lockicon->image->alt = $strunlock;
$lockicon->image->title = $tooltip;
$action = $OUTPUT->action_icon($lockicon);
@ -1588,7 +1588,7 @@ class grade_structure {
$lockicon->link->url->param('action', 'lock');
$lockicon->link->add_class('lock');
$lockicon->image->src = $OUTPUT->old_icon_url('t/lock');
$lockicon->image->src = $OUTPUT->pix_url('t/lock');
$lockicon->image->alt = $strlock;
$lockicon->image->title = $strlock;
$action = $OUTPUT->action_icon($lockicon);
@ -1633,7 +1633,7 @@ class grade_structure {
array('courseid' => $this->courseid, 'id' => $object->id));
$calcicon->link->url = $gpr->add_url_params($calcicon->link->url);
$calcicon->image->src = $OUTPUT->old_icon_url($icon);
$calcicon->image->src = $OUTPUT->pix_url($icon);
$calcicon->add_class('iconsmall');
$calcicon->alt = $streditcalculation;
$calcicon->title = $streditcalculation;
@ -2267,7 +2267,7 @@ function grade_button($type, $courseid, $object) {
$icon->link->url = new moodle_url('edit.php', array('courseid' => $courseid, 'id' => $object->id));
}
$icon->image->src = $OUTPUT->old_icon_url('t/'.$type);
$icon->image->src = $OUTPUT->pix_url('t/'.$type);
$icon->image->add_class('iconsmall');
$icon->image->title = ${'str'.$type};
$icon->image->alt = ${'str'.$type};

View file

@ -503,7 +503,7 @@ class grade_report_grader extends grade_report {
$string = ${'str' . $showhide};
$toggleicon = new moodle_action_icon();
$toggleicon->image->src = $OUTPUT->old_icon_url($imagename);
$toggleicon->image->src = $OUTPUT->pix_url($imagename);
$toggleicon->image->add_class('iconsmall');
$toggleicon->alt = $string;
$toggleicon->title = $string;
@ -617,7 +617,7 @@ class grade_report_grader extends grade_report {
$userreporticon = new moodle_action_icon();
$userreporticon->link->url = new moodle_url($CFG->wwwroot.'/grade/report/user/index.php', array('userid' => $user->id, 'id' => $this->course->id));
$userreporticon->image->add_class('iconsmall');
$userreporticon->image->src = $OUTPUT->old_icon_url('t/grades');
$userreporticon->image->src = $OUTPUT->pix_url('t/grades');
$userreporticon->image->alt = $strgradesforuser;
$userreportcell->text = $OUTPUT->action_icon($userreporticon);
$userrow->cells[] = $userreportcell;
@ -1417,15 +1417,15 @@ class grade_report_grader extends grade_report {
$contractexpandicon = new moodle_action_icon();
$contractexpandicon->link->url = new moodle_url($this->gpr->get_return_url(null, array('target'=>$element['eid'], 'action'=>'switch_minus', 'sesskey'=>sesskey())));
$contractexpandicon->image->add_class('iconsmall');
$contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_minus');
$contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_minus');
$contractexpandicon->image->alt = $strswitchminus;
if (in_array($element['object']->id, $this->collapsed['aggregatesonly'])) {
$contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_plus');
$contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_plus');
$contractexpandicon->image->alt = $strswitchplus;
$contractexpandicon->link->url->param('action', 'switch_plus');
} elseif (in_array($element['object']->id, $this->collapsed['gradesonly'])) {
$contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_whole');
$contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_whole');
$contractexpandicon->image->alt = $strswitchwhole;
$contractexpandicon->link->url->param('action', 'switch_whole');
}