MDL-19810 upgraded calls to print_table, print_single_button, print_user_picture, print_container* and notice_yesno

This commit is contained in:
nicolasconnault 2009-08-20 08:45:12 +00:00
parent 0b36c9489d
commit cf4d502665
5 changed files with 12 additions and 11 deletions

View File

@ -257,6 +257,7 @@
$strregraderequired = get_string('regraderequired', 'hotpot');
// column headings and attributes
$table = new html_table();
$table->head = array();
$table->align = array();
@ -399,7 +400,7 @@
echo "<br />";
print_table($table);
echo $OUTPUT->table($table);
// Finish the page
echo $OUTPUT->footer();

View File

@ -1262,7 +1262,7 @@ function hotpot_print_recent_mod_activity($activity, $course, $detail=false) {
print '<table border="0" cellpadding="3" cellspacing="0">';
print '<tr><td'.$bgcolor.' class="forumpostpicture" width="35" valign="top">';
print_user_picture($activity->user->userid, $course, $activity->user->picture);
echo $OUTPUT->user_picture(moodle_user_picture::make($activity->user, $course));
print '</td><td width="100%"><font size="2">';
if ($detail) {

View File

@ -9,7 +9,7 @@ class hotpot_report extends hotpot_default_report {
return true;
}
function create_overview_table(&$hotpot, &$cm, &$course, &$users, &$attempts, &$questions, &$options, &$tables) {
global $CFG;
global $CFG, $OUTPUT;
$strtimeformat = get_string('strftimedatetime');
$is_html = ($options['reportformat']=='htm');
$spacer = $is_html ? '&nbsp;' : ' ';
@ -48,7 +48,7 @@ class hotpot_report extends hotpot_default_report {
$picture = '';
$name = fullname($u);
if ($is_html) {
$picture = print_user_picture($u->userid, $course->id, $u->picture, false, true);
$picture = $OUTPUT->user_picture(moodle_user_picture::make($u->userid, $course->id));
$name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&amp;course='.$course->id.'">'.$name.'</a>';
}
$grade = isset($user->grade) && $user->grade<>'&nbsp;' ? $user->grade : $spacer;

View File

@ -10,7 +10,7 @@ class hotpot_report extends hotpot_default_report {
return true;
}
function create_scores_table(&$hotpot, &$course, &$users, &$attempts, &$questions, &$options, &$tables) {
global $CFG;
global $CFG, $OUTPUT;
$download = ($options['reportformat']=='htm') ? false : true;
$is_html = ($options['reportformat']=='htm');
$blank = ($download ? '' : '&nbsp;');
@ -57,8 +57,8 @@ class hotpot_report extends hotpot_default_report {
$picture = '';
$name = fullname($u);
if ($is_html) {
$picture = print_user_picture($u->userid, $course->id, $u->picture, false, true);
$name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&amp;course='.$course->id.'">'.$name.'</a>';
$picture = $OUTPUT->user_picture(moodle_user_picture::make($u, $course->id));
$name = $OUTPUT->link($CFG->wwwroot.'/user/view.php?id='.$u->userid.'&course='.$course->id, $name);
}
if (isset($user->grade)) {
$grade = $user->grade;

View File

@ -131,16 +131,16 @@ function hotpot_print_attempt_summary(&$hotpot, &$attempt) {
echo $OUTPUT->box_end();
}
function hotpot_print_review_buttons(&$course, &$hotpot, &$attempt, $context) {
global $DB;
global $DB, $OUTPUT;
print "\n".'<table border="0" align="center" cellpadding="2" cellspacing="2" class="generaltable">';
print "\n<tr>\n".'<td align="center">';
print_single_button("report.php?hp=$hotpot->id", NULL, get_string('continue'), 'post');
echo $OUTPUT->button(html_form::make_button("report.php?hp=$hotpot->id", NULL, get_string('continue')));
if (has_capability('mod/hotpot:viewreport',$context) && $DB->record_exists('hotpot_details', array('attempt'=>$attempt->id))) {
print "</td>\n".'<td align="center">';
print_single_button("review.php?hp=$hotpot->id&attempt=$attempt->id&action=showxmlsource", NULL, get_string('showxmlsource', 'hotpot'), 'post');
echo $OUTPUT->button(html_form::make_button("review.php?hp=$hotpot->id&attempt=$attempt->id&action=showxmlsource", NULL, get_string('showxmlsource', 'hotpot')));
print "</td>\n".'<td align="center">';
print_single_button("review.php?hp=$hotpot->id&attempt=$attempt->id&action=showxmltree", NULL, get_string('showxmltree', 'hotpot'), 'post');
echo $OUTPUT->button(html_form::make_button("review.php?hp=$hotpot->id&attempt=$attempt->id&action=showxmltree", NULL, get_string('showxmltree', 'hotpot')));
$colspan = 3;
} else {
$colspan = 1;