Skip to content
This repository was archived by the owner on May 7, 2020. It is now read-only.

pix_url deprecation fix #35

Open
Syxton wants to merge 2 commits into
base: master
Choose a base branch
from
Open

pix_url deprecation fix #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c724db8
fix pix_url
Syxton May 12, 2017
cb5699b
Update version.php
May 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assign_edit_grade_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function definition() {
$mform->addElement('html', '<div class="'.$gradeviewclass.'">');
$cm = get_coursemodule_from_instance("assign", $assignment->get_instance()->id, $assignment->get_course()->id);
$mform->addElement('html', '<a href="'.$CFG->wwwroot.'/mod/assign/view.php?id='.$cm->id.'"><img src="'.
$OUTPUT->pix_url('popup', 'scorm').'"> '.
$OUTPUT->image_url('popup', 'scorm').'"> '.
get_string('moodledefaultview', 'block_fn_marking').'</a>');
$mform->addElement('html', '</div>');

Expand Down Expand Up @@ -669,7 +669,7 @@ class="marking_header_link" title="Assignment" href="'.$CFG->wwwroot.'/mod/assig
$mform->addElement('html', '<td width="35%" align="right" class="rightSide">');

if ($overriden) {
$locked = '<img class="ned-locked-icon" width="16" height="16" alt="Locked" src="'.$OUTPUT->pix_url('t/locked', '').'">';
$locked = '<img class="ned-locked-icon" width="16" height="16" alt="Locked" src="'.$OUTPUT->image_url('t/locked', '').'">';
$mform->addElement('html', get_string('gradeoverridedetected', 'block_fn_marking').' '.$locked);
} else {
$buttonarray = array();
Expand Down
8 changes: 4 additions & 4 deletions block_fn_marking.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,14 +287,14 @@ class="icon" alt="">';
$this->content->items[] = '<a href="' . $CFG->wwwroot . '/blocks/fn_marking/progress_report.php?id=' .
$this->page->course->id .
'">' . get_string('simplegradebook', 'block_fn_marking') . '</a>';
$this->content->icons[] = "<img src=\"" . $OUTPUT->pix_url('i/grades') . "\" class=\"icon\" alt=\"\" />";
$this->content->icons[] = "<img src=\"" . $OUTPUT->image_url('i/grades') . "\" class=\"icon\" alt=\"\" />";
}

if (isset($this->config->showreportslink) && $this->config->showreportslink) {
$this->content->items[] = '<a href="' . $CFG->wwwroot . '/user/index.php?contextid='.$context->id.
'&sifirst=&silast=&roleid=5">' .
get_string('studentlist', 'block_fn_marking') . '</a>';
$this->content->icons[] = "<img src=\"" . $OUTPUT->pix_url('i/group') . "\" class=\"icon\" alt=\"\" />";
$this->content->icons[] = "<img src=\"" . $OUTPUT->image_url('i/group') . "\" class=\"icon\" alt=\"\" />";
}

if (($this->config->shownotloggedinuser || $this->config->showstudentnotsubmittedassignment
Expand Down Expand Up @@ -347,7 +347,7 @@ class="icon" alt="">';
$humantime = get_string('lastrefreshupdating', 'block_fn_marking');
}

$refreshicon = html_writer::img($OUTPUT->pix_url('refresh_button', 'block_fn_marking'), '', null);
$refreshicon = html_writer::img($OUTPUT->image_url('refresh_button', 'block_fn_marking'), '', null);
$refreshbutton = html_writer::link(
new moodle_url('/blocks/fn_marking/update_cache.php'),
$refreshicon,
Expand Down Expand Up @@ -405,7 +405,7 @@ private function get_frontpage_content() {
$humantime = get_string('lastrefreshupdating', 'block_fn_marking');
}

$refreshicon = html_writer::img($OUTPUT->pix_url('refresh_button', 'block_fn_marking'), '', null);
$refreshicon = html_writer::img($OUTPUT->image_url('refresh_button', 'block_fn_marking'), '', null);
$refreshbutton = html_writer::link(
new moodle_url('/blocks/fn_marking/update_cache.php'),
$refreshicon,
Expand Down
12 changes: 6 additions & 6 deletions fn_gradebook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
);

$select = new single_select($urlview, 'view', $viewopts, $selected = $view, '');
$select->label = html_writer::img($OUTPUT->pix_url('i/hide'), '');
$select->label = html_writer::img($OUTPUT->image_url('i/hide'), '');
$select->formid = 'fnview';
$viewform = '<div class="groupselector">'.$OUTPUT->render($select).'</div>';

Expand Down Expand Up @@ -522,7 +522,7 @@

$image = "<a href=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\"" .
" title=\"$mod->name\">" .
'<img class="actionicon" width="16" height="16" alt="'.$mod->name.'" src="'.$OUTPUT->pix_url('icon', $mod->modname).'">'.
'<img class="actionicon" width="16" height="16" alt="'.$mod->name.'" src="'.$OUTPUT->image_url('icon', $mod->modname).'">'.
"</a>";


Expand Down Expand Up @@ -614,7 +614,7 @@
);
$activitytypeselect = new single_select($activitytypeurl, 'activity_type', $activitytypeopts, $activitytype, '');
$activitytypeselect->formid = 'fn_activity_type';
$activitytypeselect->label = html_writer::img($OUTPUT->pix_url('i/preview'), '');
$activitytypeselect->label = html_writer::img($OUTPUT->image_url('i/preview'), '');
$activitytypeform = '<div class="groupselector">'.$OUTPUT->render($activitytypeselect).'</div>';

// PARTICIPANTS.
Expand Down Expand Up @@ -644,7 +644,7 @@
);
$participantsselect = new single_select($participantsurl, 'participants', $participantsopts, $participants, '');
$participantsselect->formid = 'fn_participants';
$participantsselect->label = html_writer::img($OUTPUT->pix_url('i/user'), '');
$participantsselect->label = html_writer::img($OUTPUT->image_url('i/user'), '');
$participantsform = '<div class="groupselector">'.$OUTPUT->render($participantsselect).'</div>';

echo '<div class="fn-menuwrapper">';
Expand All @@ -670,7 +670,7 @@
echo $viewform . " ";

echo html_writer::link('#',
html_writer::img($OUTPUT->pix_url('fullscreen', 'block_fn_marking'), ''),
html_writer::img($OUTPUT->image_url('fullscreen', 'block_fn_marking'), ''),
array('class' => 'ned-hide-blocks')
);

Expand Down Expand Up @@ -705,7 +705,7 @@
if ($gradeitem = $DB->get_record('grade_items', array('courseid' => $courseid, 'itemtype' => 'course'))) {
if ($gradeitem->gradetype == GRADE_TYPE_NONE) {
$nocorseaveragemsg = '<div class="course-average-warning"><img class="actionicon" width="16" height="16" alt="" src="'.
$OUTPUT->pix_url('i/risk_xss', '').'"> '.get_string('nocoursetotal', 'block_fn_mentor').'<div>';
$OUTPUT->image_url('i/risk_xss', '').'"> '.get_string('nocoursetotal', 'block_fn_mentor').'<div>';
}
}

Expand Down
4 changes: 2 additions & 2 deletions forum.submissions.fn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@

$o .= '<div class="default-grade-view-nobtn">';
$o .= '<a href="'.$CFG->wwwroot.'/mod/forum/view.php?id='.$cm->id.'"><img src="'.
$OUTPUT->pix_url('popup', 'scorm').'"> '.
$OUTPUT->image_url('popup', 'scorm').'"> '.
get_string('moodledefaultview', 'block_fn_marking').'</a>';
$o .= '</div>';

Expand Down Expand Up @@ -252,7 +252,7 @@
}
}

$vars = array('mid' => $mid, 'spinner' => $OUTPUT->pix_url('i/loading').'');
$vars = array('mid' => $mid, 'spinner' => $OUTPUT->image_url('i/loading').'');

$jsmodule1 = array(
'name' => 'M.show_forum_panel',
Expand Down
4 changes: 2 additions & 2 deletions journal.submissions.fn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@

$o .= '<div class="'.$gradeviewclass.'">';
$o .= '<a href="'.$CFG->wwwroot.'/mod/journal/report.php?id='.$cm->id.'"><img src="'.
$OUTPUT->pix_url('popup', 'scorm').'"> '.
$OUTPUT->image_url('popup', 'scorm').'"> '.
get_string('moodledefaultview', 'block_fn_marking').'</a>';
$o .= '</div>';

Expand Down Expand Up @@ -286,7 +286,7 @@
$o .= '</td>';
$o .= '<td width="35%" align="right" class="rightSide">';
if ($overriden) {
$locked = '<img class="ned-locked-icon" width="16" height="16" alt="Locked" src="'.$OUTPUT->pix_url('t/locked', '').'">';
$locked = '<img class="ned-locked-icon" width="16" height="16" alt="Locked" src="'.$OUTPUT->image_url('t/locked', '').'">';
$o .= get_string('gradeoverridedetected', 'block_fn_marking').' '.$locked;
} else {
$o .= "<input type=\"submit\" value=\"" . get_string('save', 'block_fn_marking') . "\" />";
Expand Down
24 changes: 12 additions & 12 deletions lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,7 +1599,7 @@ function block_fn_marking_view_submissions($mform, $offset=0, $showattemptnumber
if (count($unsubmitted) > 0) {
$url = new moodle_url('/mod/'.$cm->modname.'/view.php', array('id' => $cm->id));
$image = '<a href="'.$url->out().'"><img width="16" height="16" alt="'.
$cm->modname.'" src="'.$OUTPUT->pix_url('icon', $cm->modname).'"></a>';
$cm->modname.'" src="'.$OUTPUT->image_url('icon', $cm->modname).'"></a>';

$o .= '<div class="unsubmitted_header">' . $image .
" Assignment: <A HREF=\"$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id\" TITLE=\"$cm->modname\">" .
Expand Down Expand Up @@ -2923,7 +2923,7 @@ function block_fn_marking_build_ungraded_tree ($courses, $supportedmodules, $cla
$totalungraded += $numunmarked;
$gradelink = $CFG->wwwroot . '/blocks/fn_marking/fn_gradebook.php?courseid=' .
$course->id . '&show=unmarked' . '&navlevel=top&mid=0&activity_type=' . $supportedmodule;
$moduleicon = '<img src="' . $OUTPUT->pix_url('icon', $supportedmodule) . '" class="icon" alt="">';
$moduleicon = '<img src="' . $OUTPUT->image_url('icon', $supportedmodule) . '" class="icon" alt="">';

if ($numunmarked) {
$moduletext .= '<dd id="cmid' . $supportedmodule . '" class="module ' . $classforhide . '">' . "\n";
Expand Down Expand Up @@ -3235,7 +3235,7 @@ function block_fn_marking_footer() {
html_writer::div(
html_writer::link(
'http://ned.ca',
html_writer::img($OUTPUT->pix_url('ned_26', 'block_fn_marking'), 'NED'),
html_writer::img($OUTPUT->image_url('ned_26', 'block_fn_marking'), 'NED'),
array('target' => '_blank')
),
'markingmanagercontainer-footer-right'
Expand Down Expand Up @@ -3539,10 +3539,10 @@ function block_fn_marking_groups_print_course_menu($course, $urlroot, $return=fa

if (count($groupsmenu) == 1) {
$groupname = reset($groupsmenu);
$output = html_writer::img($OUTPUT->pix_url('i/users'), '').' '.$groupname;
$output = html_writer::img($OUTPUT->image_url('i/users'), '').' '.$groupname;
} else {
$select = new single_select(new moodle_url($urlroot), 'group', $groupsmenu, $activegroup, null, 'selectgroup');
$select->label = html_writer::img($OUTPUT->pix_url('i/users'), '');
$select->label = html_writer::img($OUTPUT->image_url('i/users'), '');
$output = $OUTPUT->render($select);
}

Expand Down Expand Up @@ -3614,7 +3614,7 @@ function block_fn_marking_view_journal_submissions($journal, $students, $cm, $co
if (count($attempts) > 0) {
$url = new moodle_url('/mod/'.$cm->modname.'/view.php', array('id' => $cm->id));
$image = '<a href="'.$url->out().'"><img width="16" height="16" alt="'.
$cm->modname.'" src="'.$OUTPUT->pix_url('icon', $cm->modname).'"></a>';
$cm->modname.'" src="'.$OUTPUT->image_url('icon', $cm->modname).'"></a>';

$o .= '<div class="unsubmitted_header">' . $image .
" Journal: <A HREF=\"$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id\" TITLE=\"$cm->modname\">" .
Expand Down Expand Up @@ -3682,17 +3682,17 @@ function block_fn_marking_view_journal_submissions($journal, $students, $cm, $co
$t->data[] = new html_table_row(array($cell));

$submittedicon = '<img width="16" height="16" border="0" alt="Journal" src="'.
$OUTPUT->pix_url('text', 'block_fn_marking').'" valign="absmiddle"> ';
$OUTPUT->image_url('text', 'block_fn_marking').'" valign="absmiddle"> ';
$markedicon = '<img width="16" height="16" border="0" alt="Journal" src="'.
$OUTPUT->pix_url('completed', 'block_fn_marking').'" valign="absmiddle"> ';
$OUTPUT->image_url('completed', 'block_fn_marking').'" valign="absmiddle"> ';
$savedicon = '<img width="16" height="16" border="0" alt="Journal" src="'.
$OUTPUT->pix_url('saved', 'block_fn_marking').'" valign="absmiddle"> ';
$OUTPUT->image_url('saved', 'block_fn_marking').'" valign="absmiddle"> ';
if ($gradeitem->gradepass > 0) {
$markediconincomplete = '<img width="16" height="16" border="0" alt="Journal" src="'.
$OUTPUT->pix_url('incomplete', 'block_fn_marking').'" valign="absmiddle"> ';
$OUTPUT->image_url('incomplete', 'block_fn_marking').'" valign="absmiddle"> ';
} else {
$markediconincomplete = '<img width="16" height="16" border="0" alt="Journal" src="'.
$OUTPUT->pix_url('graded', 'block_fn_marking').'" valign="absmiddle"> ';
$OUTPUT->image_url('graded', 'block_fn_marking').'" valign="absmiddle"> ';
}

$lastsubmissionclass = '';
Expand Down Expand Up @@ -3740,7 +3740,7 @@ function block_fn_marking_view_journal_submissions($journal, $students, $cm, $co

if ($journal->grade == 0) {
$cell1 = new html_table_cell('<img width="16" height="16" border="0" alt="Journal" src="'.
$OUTPUT->pix_url('graded', 'block_fn_marking').'" valign="absmiddle"> Marked');
$OUTPUT->image_url('graded', 'block_fn_marking').'" valign="absmiddle"> Marked');
} else {
$cell1 = new html_table_cell(((($gradeitem->gradepass > 0)
&& ($item->rating >= $gradeitem->gradepass)) ? $markedicon : $markediconincomplete) . 'Marked');
Expand Down
6 changes: 3 additions & 3 deletions progress_report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@

$image = "<A target='_blank' HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\"
TITLE=\"$instance->name\"><IMG BORDER=0 VALIGN=absmiddle
SRC=\"".$OUTPUT->pix_url('icon', $mod->modname)."\"
SRC=\"".$OUTPUT->image_url('icon', $mod->modname)."\"
HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\"></A>";


Expand Down Expand Up @@ -340,15 +340,15 @@
if ($gradeitem = $DB->get_record('grade_items', array('courseid' => $courseid, 'itemtype' => 'course'))) {
if ($gradeitem->gradetype == GRADE_TYPE_NONE) {
$nocorseaveragemsg = '<div class="course-average-warning"><img class="actionicon" width="16" height="16" alt="" src="'.
$OUTPUT->pix_url('i/risk_xss', '').'"> '.get_string('nocoursetotal', 'block_fn_mentor').'<div>';
$OUTPUT->image_url('i/risk_xss', '').'"> '.get_string('nocoursetotal', 'block_fn_mentor').'<div>';
}
}

echo '<div class="fn-menuwrapper">';
block_fn_marking_groups_print_course_menu($course, $CFG->wwwroot.'/blocks/fn_marking/progress_report.php?id='.
$course->id.'&unsubmitted='.$unsubmitted, false, true);
echo $viewform;
echo "<img src=\"" . $OUTPUT->pix_url('i/grades') . "\" class=\"icon\" alt=\"\" />" .
echo "<img src=\"" . $OUTPUT->image_url('i/grades') . "\" class=\"icon\" alt=\"\" />" .
'<a href="' . $CFG->wwwroot . '/grade/report/index.php?id=' . $course->id .
'&navlevel=top">' . get_string('moodlegradebook', 'block_fn_marking') . '</a>';
echo '</div>';
Expand Down
18 changes: 9 additions & 9 deletions quiz.submissions.fn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
} else {
$columnicon = ($qdir == "ASC") ? "sort_asc" : "sort_desc";
}
$columnicon = "<img class='iconsort' src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
$columnicon = "<img class='iconsort' src=\"" . $OUTPUT->image_url('t/' . $columnicon) . "\" alt=\"\" />";

}
if (($column == 'userpicture') || ($column == 'edit')) {
Expand Down Expand Up @@ -250,7 +250,7 @@
$tablerow->attempt . '&amp;slot=' .
$quizslot->slot . '" title="Review response">
<span class="que">
<img src="' . $OUTPUT->pix_url('i/grade_incorrect', 'core') .
<img src="' . $OUTPUT->image_url('i/grade_incorrect', 'core') .
'" title="Incorrect" alt="Incorrect" class="icon fn-icon">
<span class="incorrect">' . $questionstepgrade . '</span>
</span>
Expand All @@ -260,7 +260,7 @@
$tablerow->attempt . '&amp;slot=' .
$quizslot->slot . '" title="Review response">
<span class="que">
<img src="' . $OUTPUT->pix_url('i/grade_correct', 'core') .
<img src="' . $OUTPUT->image_url('i/grade_correct', 'core') .
'" title="Incorrect" alt="Incorrect" class="icon fn-icon">
<span class="correct">' . $questionstepgrade . '</span>
</span>
Expand All @@ -269,7 +269,7 @@
$cell = new html_table_cell('<a target="_blank" href="' . $CFG->wwwroot . '/mod/quiz/reviewquestion.php?attempt=' .
$tablerow->attempt . '&amp;slot=' . $quizslot->slot . '" title="Review response">
<span class="que">
<img src="' . $OUTPUT->pix_url('i/edit', 'core') .
<img src="' . $OUTPUT->image_url('i/edit', 'core') .
'" title="Edit" alt="Editt" class="icon fn-icon">
</span></a>');
$cell->attributes = array('class' => 'fn-highlighted');
Expand All @@ -278,7 +278,7 @@
$cellarray[] = '<a href="' . $CFG->wwwroot . '/mod/quiz/reviewquestion.php?attempt=' .
$tablerow->attempt . '&amp;slot=' . $quizslot->slot . '" title="Review response">
<span class="que">
<img src="' . $OUTPUT->pix_url('i/grade_partiallycorrect', 'core') .
<img src="' . $OUTPUT->image_url('i/grade_partiallycorrect', 'core') .
'" title="Partially correct" alt="Partially correct" class="icon fn-icon">
<span class="partiallycorrect">' . $questionstepgrade . '</span>
</span></a>';
Expand Down Expand Up @@ -315,11 +315,11 @@
$o .= '<div class="quiz-top-menu"><div class="qdefault-view">';

$o .= '<a href="' . $CFG->wwwroot . '/mod/quiz/report.php?id=' . $cm->id .
'&mode=overview"><img src="' . $OUTPUT->pix_url('popup', 'scorm') . '"> '.
'&mode=overview"><img src="' . $OUTPUT->image_url('popup', 'scorm') . '"> '.
get_string('moodledefaultview', 'block_fn_marking').'</a>';

$o .= '&nbsp;&nbsp;&nbsp;<a href="' . $CFG->wwwroot . '/mod/quiz/report.php?id=' . $cm->id .
'&mode=grading"><img src="' . $OUTPUT->pix_url('popup', 'scorm') . '"> '.
'&mode=grading"><img src="' . $OUTPUT->image_url('popup', 'scorm') . '"> '.
get_string('manualgrading', 'block_fn_marking').'</a>';

$o .= '</div><div class="qall-participants">';
Expand All @@ -332,7 +332,7 @@
}
$o .= '</div></div>';

$o .= '<div class="fn_quiz_header"><img src="' . $OUTPUT->pix_url('icon', 'quiz') . '">' . $quiz->name . '</div>';
$o .= '<div class="fn_quiz_header"><img src="' . $OUTPUT->image_url('icon', 'quiz') . '">' . $quiz->name . '</div>';

$qpagingparams = array(
'courseid' => $courseid,
Expand Down Expand Up @@ -399,7 +399,7 @@
if (count($students) > 0) {

$image = "<a href=\"$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id\" TITLE=\"$cm->modname\">
<img border=0 valign=absmiddle src=\"".$OUTPUT->pix_url('icon', 'quiz')."\" " .
<img border=0 valign=absmiddle src=\"".$OUTPUT->image_url('icon', 'quiz')."\" " .
"height=16 width=16 ALT=\"$cm->modname\"></a>";

$o .= '<div class="unsubmitted_header">' . $image .
Expand Down
4 changes: 2 additions & 2 deletions version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
* @developer Michael Gardener <mgardener@cissq.com>
*/

$plugin->version = 2017051000;
$plugin->version = 2017051200;
$plugin->requires = 2014051200;
$plugin->maturity = MATURITY_STABLE;
$plugin->component = 'block_fn_marking';
$plugin->release = '3.1.8';
$plugin->release = '3.1.9';