diff --git a/admin/modules.php b/admin/modules.php index 371695a2d51ef..c6af968d666cd 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -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 = "mod_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />"; + $icon = "old_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />"; $delete = "name&sesskey=".sesskey()."\">$strdelete"; diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php index b3010cbdaae34..3b8a8206992f1 100644 --- a/blocks/activity_modules/block_activity_modules.php +++ b/blocks/activity_modules/block_activity_modules.php @@ -54,7 +54,7 @@ function get_content() { $this->content->icons[] = ''; } else { $this->content->items[] = ''.$modfullname.''; - $this->content->icons[] = ''; + $this->content->icons[] = ''; } } diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php index 15c3fd7fad15b..14d802ad11535 100644 --- a/blocks/site_main_menu/block_site_main_menu.php +++ b/blocks/site_main_menu/block_site_main_menu.php @@ -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[] = ''; } @@ -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') { diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php index 79aa8a1f12ad2..2ed93ade2a834 100644 --- a/blocks/social_activities/block_social_activities.php +++ b/blocks/social_activities/block_social_activities.php @@ -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[] = ''; } @@ -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') { diff --git a/blog/locallib.php b/blog/locallib.php index 7148579d7a6af..d63df1ebcb5ea 100644 --- a/blog/locallib.php +++ b/blog/locallib.php @@ -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 .= ', '; diff --git a/calendar/lib.php b/calendar/lib.php index 118e19056a916..15c5756c6ba6c 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -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 @@ -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 = ''.$eventtype.''; $event->referer = ''.$event->name.''; diff --git a/course/modedit.php b/course/modedit.php index b464229c2b155..d73366cdb3fb3 100644 --- a/course/modedit.php +++ b/course/modedit.php @@ -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(); diff --git a/course/recent.php b/course/recent.php index dc0dc547d6d53..f363199284eba 100644 --- a/course/recent.php +++ b/course/recent.php @@ -246,7 +246,7 @@ $name = format_string($cm->name); $modfullname = $modnames[$cm->modname]; - $image = "mod_icon_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />"; + $image = "old_icon_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />"; echo "

$image $modfullname". " wwwroot/mod/$cm->modname/view.php?id=$cm->id\" $linkformat>$name

"; } diff --git a/course/report/outline/index.php b/course/report/outline/index.php index 802949c24a8a1..985b25f094515 100644 --- a/course/report/outline/index.php +++ b/course/report/outline/index.php @@ -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; diff --git a/course/report/progress/index.php b/course/report/progress/index.php index 0dde0538e7949..8318a60f0eb16 100644 --- a/course/report/progress/index.php +++ b/course/report/progress/index.php @@ -198,7 +198,7 @@ function csv_quote($value) { print ''. ''. - ''. + '<img src=old_icon_url('icon', $activity->modname).'/icon.gif" alt="'. get_string('modulename',$activity->modname).'" /> '. format_string($activity->name).''; if($activity->completionexpected) { diff --git a/course/user.php b/course/user.php index bc89ef044209b..1293ae27a3a30 100644 --- a/course/user.php +++ b/course/user.php @@ -367,7 +367,7 @@ function print_outline_row($mod, $instance, $result) { global $OUTPUT; - $image = "mod_icon_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />"; + $image = "old_icon_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />"; echo ""; echo "$image"; diff --git a/grade/lib.php b/grade/lib.php index 45077255c7ef0..8453e5a2f4748 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -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 'old_icon_url('icon', $element['object']->itemmodule) . '" ' . 'class="icon itemicon" title="' .s($strmodname). '" alt="' .s($strmodname).'"/>'; diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 38473f7f92272..5cbebc94c62a5 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -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; @@ -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; @@ -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; diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 3d751054b4c6d..c26c2d98786b3 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -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 * diff --git a/lib/weblib.php b/lib/weblib.php index 250a7268f54c9..22a0f32d0edd9 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -2427,7 +2427,7 @@ function navmenulist($course, $sections, $modinfo, $strsection, $strjumpto, $wid $class = 'activity '.$mod->modname; $class .= ($cmid == $mod->id) ? ' selected' : ''; $menu[] = '
  • '. - ''. + ''. ''.$mod->name.'
    • '; } diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 4dcecfc641dbe..151627fbde263 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -2897,7 +2897,7 @@ function assignment_print_recent_mod_activity($activity, $courseid, $detail, $mo if ($detail) { $modname = $modnames[$activity->type]; echo '
    '; - echo "mod_icon_url('icon', 'assignment') . "\" ". + echo "old_icon_url('icon', 'assignment') . "\" ". "class=\"icon\" alt=\"$modname\">"; echo "wwwroot/mod/assignment/view.php?id={$activity->cmid}\">{$activity->name}"; echo '
    '; diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php index e6fd331c92fbd..da9f954ff4ab6 100644 --- a/mod/scorm/datamodels/aicclib.php +++ b/mod/scorm/datamodels/aicclib.php @@ -536,8 +536,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n $result->toc .= "\t\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(); } diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php index a852df4701bd3..b84f4f3fe0de4 100644 --- a/mod/scorm/datamodels/scorm_12lib.php +++ b/mod/scorm/datamodels/scorm_12lib.php @@ -318,8 +318,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n $result->toc .= "\t\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'); } diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php index bee59a9d9288b..bd9ba2218b3eb 100644 --- a/mod/scorm/datamodels/scorm_13lib.php +++ b/mod/scorm/datamodels/scorm_13lib.php @@ -209,8 +209,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n $result->toc .= "\t\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'); }