Skip to content

Commit

Permalink
MDL-20787 removed mod_icon_url() completely
Browse files Browse the repository at this point in the history
  • Loading branch information
@skodak
skodak committed Dec 16, 2009
1 parent f44b10e commit 683c01d
Show file tree
Hide file tree
Showing 19 changed files with 26 additions and 32 deletions.
2 changes: 1 addition & 1 deletion admin/modules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
foreach ($modulebyname as $modulename => $module) {

// took out hspace="\10\", because it does not validate. don't know what to replace with.
$icon = "<img src=\"" . $OUTPUT->mod_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
$icon = "<img src=\"" . $OUTPUT->old_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";

$delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=".sesskey()."\">$strdelete</a>";

Expand Down
2 changes: 1 addition & 1 deletion blocks/activity_modules/block_activity_modules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function get_content() {
$this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('f/html') . '" class="icon" alt="" />';
} else {
$this->content->items[] = '<a href="'.$CFG->wwwroot.'/mod/'.$modname.'/index.php?id='.$course->id.'">'.$modfullname.'</a>';
$this->content->icons[] = '<img src="'.$OUTPUT->mod_icon_url('icon', $modname) . '" class="icon" alt="" />';
$this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('icon', $modname) . '" class="icon" alt="" />';
}
}

Expand Down
4 changes: 2 additions & 2 deletions blocks/site_main_menu/block_site_main_menu.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function get_content() {
if (!empty($cm->icon)) {
$icon = $OUTPUT->old_icon_url($cm->icon);
} else {
$icon = $OUTPUT->mod_icon_url('icon', $cm->modname);
$icon = $OUTPUT->old_icon_url('icon', $cm->modname);
}
$this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
}
Expand Down Expand Up @@ -124,7 +124,7 @@ function get_content() {
if (!empty($modinfo->cms[$modnumber]->icon)) {
$icon = $OUTPUT->old_icon_url($modinfo->cms[$modnumber]->icon);
} else {
$icon = $OUTPUT->mod_icon_url('icon', $mod->modname);
$icon = $OUTPUT->old_icon_url('icon', $mod->modname);
}

if ($mod->modname == 'label') {
Expand Down
4 changes: 2 additions & 2 deletions blocks/social_activities/block_social_activities.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function get_content() {
if (!empty($cm->icon)) {
$icon = $OUTPUT->old_icon_url($cm->icon);
} else {
$icon = $OUTPUT->mod_icon_url('icon', $cm->modname);
$icon = $OUTPUT->old_icon_url('icon', $cm->modname);
}
$this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
}
Expand Down Expand Up @@ -133,7 +133,7 @@ function get_content() {
if (!empty($modinfo->cms[$modnumber]->icon)) {
$icon = $OUTPUT->old_icon_url($modinfo->cms[$modnumber]->icon);
} else {
$icon = $OUTPUT->mod_icon_url('icon', $mod->modname);
$icon = $OUTPUT->old_icon_url('icon', $mod->modname);
}

if ($mod->modname == 'label') {
Expand Down
2 changes: 1 addition & 1 deletion blog/locallib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public function print_html($return=false) {

$associcon = new moodle_action_icon();
$associcon->link->url = new moodle_url($CFG->wwwroot.'/mod/'.$modname.'/view.php', array('id' => $modinfo->id));
$associcon->image->src = $OUTPUT->mod_icon_url('icon', $modname);
$associcon->image->src = $OUTPUT->old_icon_url('icon', $modname);
$associcon->linktext = $DB->get_field($modname, 'name', array('id' => $modinfo->instance));
$assocstr .= $OUTPUT->action_icon($associcon);
$assocstr .= ', ';
Expand Down
4 changes: 2 additions & 2 deletions calendar/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
}
$event = $events[$eventid];
if(!empty($event->modulename)) {
$popupicon = $OUTPUT->mod_icon_url('icon', $event->modulename) . '';
$popupicon = $OUTPUT->old_icon_url('icon', $event->modulename) . '';
$popupalt = $event->modulename;

} else if ($event->courseid == SITEID) { // Site event
Expand Down Expand Up @@ -505,7 +505,7 @@ function calendar_add_event_metadata($event) {

$modulename = get_string('modulename', $event->modulename);
$eventtype = get_string($event->eventtype, $event->modulename);
$icon = $OUTPUT->mod_icon_url('icon', $event->modulename) . '';
$icon = $OUTPUT->old_icon_url('icon', $event->modulename) . '';

$event->icon = '<img height="16" width="16" src="'.$icon.'" alt="'.$eventtype.'" title="'.$modulename.'" style="vertical-align: middle;" />';
$event->referer = '<a href="'.$CFG->wwwroot.'/mod/'.$event->modulename.'/view.php?id='.$module->id.'">'.$event->name.'</a>';
Expand Down
2 changes: 1 addition & 1 deletion course/modedit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
$helpicon->page = 'mods';
$helpicon->text = $pageheading;
$helpicon->module = $module->name;
echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->mod_icon_url('icon', $module->name));
echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->old_icon_url('icon', $module->name));

$mform->display();

Expand Down
2 changes: 1 addition & 1 deletion course/recent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
$name = format_string($cm->name);
$modfullname = $modnames[$cm->modname];

$image = "<img src=\"" . $OUTPUT->mod_icon_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />";
$image = "<img src=\"" . $OUTPUT->old_icon_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />";
echo "<h4>$image $modfullname".
" <a href=\"$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id\" $linkformat>$name</a></h4>";
}
Expand Down
2 changes: 1 addition & 1 deletion course/report/outline/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
$activitycell = new html_table_cell();
$activitycell->add_class('activity');

$activityicon = html_image::make($OUTPUT->mod_icon_url('icon', $cm->modname));
$activityicon = html_image::make($OUTPUT->old_icon_url('icon', $cm->modname));
$activityicon->add_class('icon');
$activityicon->alt = $modulename;

Expand Down
2 changes: 1 addition & 1 deletion course/report/progress/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ function csv_quote($value) {
print '<th scope="col" class="'.$activity->datepassedclass.'">'.
'<a href="'.$CFG->wwwroot.'/mod/'.$activity->modname.
'/view.php?id='.$activity->id.'">'.
'<img src="'.$OUTPUT->mod_icon_url('icon', $activity->modname).'/icon.gif" alt="'.
'<img src="'.$OUTPUT->old_icon_url('icon', $activity->modname).'/icon.gif" alt="'.
get_string('modulename',$activity->modname).'" /> <span class="completion-activityname">'.
format_string($activity->name).'</span></a>';
if($activity->completionexpected) {
Expand Down
2 changes: 1 addition & 1 deletion course/user.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
function print_outline_row($mod, $instance, $result) {
global $OUTPUT;

$image = "<img src=\"" . $OUTPUT->mod_icon_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />";
$image = "<img src=\"" . $OUTPUT->old_icon_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />";

echo "<tr>";
echo "<td valign=\"top\">$image</td>";
Expand Down
2 changes: 1 addition & 1 deletion grade/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,7 @@ public function get_element_icon(&$element, $spacerifnone=false) {

} else if ($element['object']->itemtype == 'mod') {
$strmodname = get_string('modulename', $element['object']->itemmodule);
return '<img src="'.$OUTPUT->mod_icon_url('icon',
return '<img src="'.$OUTPUT->old_icon_url('icon',
$element['object']->itemmodule) . '" ' .
'class="icon itemicon" title="' .s($strmodname).
'" alt="' .s($strmodname).'"/>';
Expand Down
6 changes: 3 additions & 3 deletions lib/navigationlib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ protected function load_course_activities(&$keys, $course=null) {
$icon = null;
if (!in_array($module->modname, $resources)) {
if ($module->icon=='') {
$icon = $OUTPUT->mod_icon_url('icon', $module->modname);
$icon = $OUTPUT->old_icon_url('icon', $module->modname);
}
$url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY;
Expand Down Expand Up @@ -1154,7 +1154,7 @@ protected function load_section_activities(&$keys, $singlesectionid=false, $cour
$icon = null;
if (!in_array($module->modname, $resources)) {
if ($module->icon=='') {
$icon = $OUTPUT->mod_icon_url('icon', $module->modname);
$icon = $OUTPUT->old_icon_url('icon', $module->modname);
}
$url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY;
Expand Down Expand Up @@ -2026,7 +2026,7 @@ protected function load_section_activities($course, $section) {
$icon = null;
if (!in_array($module->modname, $resources)) {
if ($module->icon=='') {
$icon = $OUTPUT->mod_icon_url('icon', $module->modname);
$icon = $OUTPUT->old_icon_url('icon', $module->modname);
}
$url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY;
Expand Down
6 changes: 0 additions & 6 deletions lib/outputrenderers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,6 @@ public function old_icon_url($iconname, $component='moodle', $escaped=true) {
return $url->out(false, array(), $escaped);
}

/** OBSOLETED: to be removed soon */
public function mod_icon_url($iconname, $component, $escaped=true) {
$url = $this->page->theme->image_url($iconname, $component);
return $url->out(false, array(), $escaped);
}

/**
* Return the moodle_url for an image
*
Expand Down
2 changes: 1 addition & 1 deletion lib/weblib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2427,7 +2427,7 @@ function navmenulist($course, $sections, $modinfo, $strsection, $strjumpto, $wid
$class = 'activity '.$mod->modname;
$class .= ($cmid == $mod->id) ? ' selected' : '';
$menu[] = '<li class="'.$class.'">'.
'<img src="'.$OUTPUT->mod_icon_url('icon', $mod->modname) . '" alt="" />'.
'<img src="'.$OUTPUT->old_icon_url('icon', $mod->modname) . '" alt="" />'.
'<a href="'.$CFG->wwwroot.'/mod/'.$url.'">'.$mod->name.'</a></li>';
}

Expand Down
2 changes: 1 addition & 1 deletion mod/assignment/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2897,7 +2897,7 @@ function assignment_print_recent_mod_activity($activity, $courseid, $detail, $mo
if ($detail) {
$modname = $modnames[$activity->type];
echo '<div class="title">';
echo "<img src=\"" . $OUTPUT->mod_icon_url('icon', 'assignment') . "\" ".
echo "<img src=\"" . $OUTPUT->old_icon_url('icon', 'assignment') . "\" ".
"class=\"icon\" alt=\"$modname\">";
echo "<a href=\"$CFG->wwwroot/mod/assignment/view.php?id={$activity->cmid}\">{$activity->name}</a>";
echo '</div>';
Expand Down
4 changes: 2 additions & 2 deletions mod/scorm/datamodels/aicclib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
$result->toc .= "\t</ul>\n";
if ($scorm->hidetoc == 0) {
$result->toc .= $PAGE->requires->data_for_js('scormdata', array(
'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')))->asap();
'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')))->asap();
$result->toc .= $PAGE->requires->js('lib/cookies.js')->asap();
$result->toc .= $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js')->asap();
}
Expand Down
4 changes: 2 additions & 2 deletions mod/scorm/datamodels/scorm_12lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
$result->toc .= "\t</ul>\n";
if ($scorm->hidetoc == 0) {
$PAGE->requires->data_for_js('scormdata', array(
'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')));
'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')));
$PAGE->requires->js('lib/cookies.js');
$PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
}
Expand Down
4 changes: 2 additions & 2 deletions mod/scorm/datamodels/scorm_13lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
$result->toc .= "\t</ul>\n";
if ($scorm->hidetoc == 0) {
$PAGE->requires->data_for_js('scormdata', array(
'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')));
'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')));
$PAGE->requires->js('lib/cookies.js');
$PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
}
Expand Down

0 comments on commit 683c01d

Please sign in to comment.