From: nicolasconnault Date: Thu, 20 Aug 2009 08:42:12 +0000 (+0000) Subject: MDL-19803 upgraded calls to print_table, print_single_button, print_user_picture... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=75d47fa90c03b9b4c488984a2ca9f550434737f4;p=moodle.git MDL-19803 upgraded calls to print_table, print_single_button, print_user_picture, print_container* and notice_yesno --- diff --git a/mod/assignment/index.php b/mod/assignment/index.php index cb3247b835..0e5136f17a 100644 --- a/mod/assignment/index.php +++ b/mod/assignment/index.php @@ -36,6 +36,8 @@ $timenow = time(); + $table = new html_table(); + if ($course->format == "weeks") { $table->head = array ($strweek, $strname, $strassignmenttype, $strduedate, $strsubmitted, $strgrade); $table->align = array ("center", "left", "left", "left", "right"); @@ -114,7 +116,7 @@ echo "
"; - print_table($table); + echo $OUTPUT->table($table); echo $OUTPUT->footer(); ?> diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 4db75391b4..94a5cbd3b8 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -302,7 +302,7 @@ class assignment_base { echo ''; echo ''; if ($teacher) { - print_user_picture($teacher, $this->course->id, $teacher->picture); + echo $OUTPUT->user_picture(moodle_user_picture::make($teacher, $this->course->id)); } echo ''; echo ''; @@ -937,7 +937,7 @@ class assignment_base { global $USER; $teacher = $USER; } - print_user_picture($teacher, $this->course->id, $teacher->picture); + echo $OUTPUT->user_picture(moodle_user_picture::make($teacher, $this->course->id)); echo ''; echo ''; echo '
'; @@ -1029,7 +1029,7 @@ class assignment_base { ///End of teacher info row, Start of student info row echo ''; echo ''; - print_user_picture($user, $this->course->id, $user->picture); + echo $OUTPUT->user_picture(moodle_user_picture::make($user, $this->course->id)); echo ''; echo ''; echo '
'; @@ -1248,7 +1248,7 @@ class assignment_base { /// Calculate user status $auser->status = ($auser->timemarked > 0) && ($auser->timemarked >= $auser->timemodified); - $picture = print_user_picture($auser, $course->id, $auser->picture, false, true); + $picture = $OUTPUT->user_picture(moodle_user_picture::make($auser, $course->id)); if (empty($auser->submissionid)) { $auser->grade = -1; //no submission yet @@ -2860,7 +2860,7 @@ function assignment_print_recent_mod_activity($activity, $courseid, $detail, $mo echo ''; echo "'; echo ''; echo '
"; - print_user_picture($activity->user->userid, $courseid, $activity->user->picture); + echo $OUTPUT->user_picture(moodle_user_picture::make($activity->user, $courseid)); echo ""; if ($detail) { diff --git a/mod/assignment/type/online/all.php b/mod/assignment/type/online/all.php index 561cab12d6..3a7054da0a 100644 --- a/mod/assignment/type/online/all.php +++ b/mod/assignment/type/online/all.php @@ -136,7 +136,7 @@ print_header_simple($str->assignments, "", $navigation, "", "", true, "", navmenu($course)); foreach ($views as $view) { - print_container_start(true,'generalbox assignment'); + echo $OUTPUT->container_start('clearfix generalbox assignment'); // info bit echo $OUTPUT->heading("$view->section - $view->name", 3, 'mdl-left'); @@ -148,17 +148,17 @@ echo '
'.$view->description.'
'; //submission part - print_container_start(false,'generalbox submission'); + echo $OUTPUT->container_start('generalbox submission'); echo '
'.$view->submissiondate.'
'; echo "

$view->submissiontext

\n"; echo "

$view->editlink

\n"; - print_container_end(); + echo $OUTPUT->container_end(); // feedback part $onlineinstance = new assignment_online( $view->cm ); $onlineinstance->view_feedback(); - print_container_end(); + echo $OUTPUT->container_end(); } echo $OUTPUT->footer(); diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index b886a9fc6c..9391683ede 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -115,8 +115,8 @@ class assignment_online extends assignment_base { echo $OUTPUT->box_end(); if (!$editmode && $editable) { echo "
"; - print_single_button('view.php', array('id'=>$this->cm->id,'edit'=>'1'), - get_string('editmysubmission', 'assignment')); + echo $OUTPUT->button(html_form::make_button('view.php', array('id'=>$this->cm->id,'edit'=>'1'), + get_string('editmysubmission', 'assignment'))); echo "
"; } diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 9ccfc01a25..b5550f2a44 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -116,7 +116,7 @@ class assignment_upload extends assignment_base { echo '
'; - print_user_picture($teacher, $this->course->id, $teacher->picture); + echo $OUTPUT->user_picture(moodle_user_picture::make($teacher, $this->course->id)); echo ''; echo '
'; @@ -180,7 +180,7 @@ class assignment_upload extends assignment_base { if ($this->can_update_notes($submission)) { $options = array ('id'=>$this->cm->id, 'action'=>'editnotes'); echo '
'; - print_single_button('upload.php', $options, get_string('edit'), 'post', '_self', false); + echo $OUTPUT->button(html_form::make_button('upload.php', $options, get_string('edit'))); echo '
'; } } @@ -372,10 +372,10 @@ class assignment_upload extends assignment_base { if ($this->drafts_tracked() and $this->isopen() and has_capability('mod/assignment:grade', $this->context) and $mode != '') { // we do not want it on view.php page if ($this->can_unfinalize($submission)) { $options = array ('id'=>$this->cm->id, 'userid'=>$userid, 'action'=>'unfinalize', 'mode'=>$mode, 'offset'=>$offset); - $output .= print_single_button('upload.php', $options, get_string('unfinalize', 'assignment'), 'post', '_self', true); + $output .= $OUTPUT->button(html_form::make_button('upload.php', $options, get_string('unfinalize', 'assignment'))); } else if ($this->can_finalize($submission)) { $options = array ('id'=>$this->cm->id, 'userid'=>$userid, 'action'=>'finalizeclose', 'mode'=>$mode, 'offset'=>$offset); - $output .= print_single_button('upload.php', $options, get_string('finalize', 'assignment'), 'post', '_self', true); + $output .= $OUTPUT->button(html_form::make_button('upload.php', $options, get_string('finalize', 'assignment'))); } } @@ -646,7 +646,7 @@ class assignment_upload extends assignment_base { $optionsyes = array ('id'=>$this->cm->id, 'confirm'=>1, 'action'=>'finalize'); $this->view_header(get_string('submitformarking', 'assignment')); echo $OUTPUT->heading(get_string('submitformarking', 'assignment')); - notice_yesno(get_string('onceassignmentsent', 'assignment'), 'upload.php', 'view.php', $optionsyes, $optionsno, 'post', 'get'); + echo $OUTPUT->confirm(get_string('onceassignmentsent', 'assignment'), new moodle_url('upload.php', $optionsyes),new moodle_url( 'view.php', $optionsno)); $this->view_footer(); die; @@ -756,7 +756,7 @@ class assignment_upload extends assignment_base { $offset = required_param('offset', PARAM_INT); $confirm = optional_param('confirm', 0, PARAM_BOOL); - $returnurl = "submissions.php?id={$this->cm->id}&userid=$userid&mode=$mode&offset=$offset"; + $returnurl = "submissions.php?id={$this->cm->id}&userid=$userid&mode=$mode&offset=$offset"; if (!$this->can_manage_responsefiles()) { redirect($returnurl); @@ -769,7 +769,7 @@ class assignment_upload extends assignment_base { $optionsyes = array ('id'=>$this->cm->id, 'file'=>$file, 'userid'=>$userid, 'confirm'=>1, 'action'=>'response', 'mode'=>$mode, 'offset'=>$offset); print_header(get_string('delete')); echo $OUTPUT->heading(get_string('delete')); - notice_yesno(get_string('confirmdeletefile', 'assignment', $file), 'delete.php', $urlreturn, $optionsyes, $optionsreturn, 'post', 'get'); + echo $OUTPUT->confirm(get_string('confirmdeletefile', 'assignment', $file), new moodle_url('delete.php', $optionsyes), new moodle_url($urlreturn, $optionsreturn)); echo $OUTPUT->footer(); die; } @@ -809,7 +809,7 @@ class assignment_upload extends assignment_base { } else { $urlreturn = 'submissions.php'; $optionsreturn = array('id'=>$this->cm->id, 'offset'=>$offset, 'mode'=>$mode, 'userid'=>$userid); - $returnurl = "submissions.php?id={$this->cm->id}&offset=$offset&mode=$mode&userid=$userid"; + $returnurl = "submissions.php?id={$this->cm->id}&offset=$offset&mode=$mode&userid=$userid"; } if (!$submission = $this->get_submission($userid) // incorrect submission @@ -829,7 +829,7 @@ class assignment_upload extends assignment_base { print_header(get_string('delete')); } echo $OUTPUT->heading(get_string('delete')); - notice_yesno(get_string('confirmdeletefile', 'assignment', $file), 'delete.php', $urlreturn, $optionsyes, $optionsreturn, 'post', 'get'); + echo $OUTPUT->confirm(get_string('confirmdeletefile', 'assignment', $file), new moodle_url('delete.php', $optionsyes), new moodle_url($urlreturn, $optionsreturn)); if (empty($mode)) { $this->view_footer(); } else {