L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nicolasconnault
2009-08-20 08:42:59 +00:00
parent 75d47fa90c
commit af7bad7997
8 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/chat/chatd.php
+1 -1
View File
@@ -281,7 +281,7 @@ EOD;
$popuppar = '\'/user/view.php?id='.$userinfo['user']->id.'&course='.$userinfo['courseid'].'\',\'user'.$userinfo['chatuser']->id.'\',\'\'';
echo '<tr><td width="35">';
echo '<a target="_new" onclick="return openpopup('.$popuppar.');" href="'.$CFG->wwwroot.'/user/view.php?id='.$userinfo['chatuser']->id.'&amp;course='.$userinfo['courseid'].'">';
print_user_picture($userinfo['user']->id, 0, $userinfo['user']->picture, false, false, false);
echo $OUTPUT->user_picture(moodle_user_picture::make($userinfo['user'], 0));
echo "</a></td><td valign=\"center\">";
echo "<p><font size=\"1\">";
echo fullname($userinfo['user'])."<br />";
mod/chat/gui_ajax/common.php
+2 -2
View File
@@ -5,12 +5,12 @@ function microtime_float(){
}
function format_user_list($data, $course) {
global $CFG, $DB, $COURSE;
global $CFG, $DB, $COURSE, $OUTPUT;
$users = array();
foreach($data as $v){
$user['name'] = fullname($v);
$user['url'] = $CFG->wwwroot.'/user/view.php?id='.$v->id.'&amp;course='.$course->id;
$user['picture'] = print_user_picture($v->id, $COURSE->id, $v->picture, false, true, false);
$user['picture'] = $OUTPUT->user_picture(moodle_user_picture::make($v, $COURSE->id));
$user['id'] = $v->id;
$users[] = $user;
}
mod/chat/gui_basic/index.php
+3 -1
View File
@@ -101,7 +101,9 @@
echo '<div id="participants"><ul>';
foreach($chatusers as $chu) {
echo '<li>';
print_user_picture($chu->id, $course->id, $chu->picture, 24, false, false, '', false);
$userpic = moodle_user_picture::make($chu->id, $course->id);
$userpic->size = 24;
echo $OUTPUT->user_picture($userpic)
echo '<div class="userinfo">';
echo fullname($chu).' ';
if ($idle = time() - $chu->lastmessageping) {
mod/chat/gui_header_js/users.php
+1 -1
View File
@@ -88,7 +88,7 @@
$idle = $min.':'.$sec;
echo '<tr><td width="35">';
echo "<a target=\"_blank\" onClick=\"return openpopup('/user/view.php?id=$chatuser->id&amp;course=$courseid','user$chatuser->id','');\" href=\"$CFG->wwwroot/user/view.php?id=$chatuser->id&amp;course=$courseid\">";
print_user_picture($chatuser->id, 0, $chatuser->picture, false, false, false);
echo $OUTPUT->user_picture(moodle_user_picture::make($chatuser, 0));
echo '</a></td><td valign="center">';
echo '<p><font size="1">';
echo fullname($chatuser).'<br />';
mod/chat/index.php
+3 -1
View File
@@ -42,6 +42,8 @@
$strweek = get_string('week');
$strtopic = get_string('topic');
$table = new html_table();
if ($course->format == 'weeks') {
$table->head = array ($strweek, $strname);
$table->align = array ('center', 'left');
@@ -81,7 +83,7 @@
echo '<br />';
print_table($table);
echo $OUTPUT->table($table);
/// Finish the page
mod/chat/lib.php
+2 -2
View File
@@ -758,7 +758,7 @@ function chat_update_chat_times($chatid=0) {
* @return bool|string Returns HTML or false
*/
function chat_format_message_manually($message, $courseid, $sender, $currentuser, $chat_lastrow=NULL) {
global $CFG, $USER;
global $CFG, $USER, $OUTPUT;
$output = new object();
$output->beep = false; // by default
@@ -777,7 +777,7 @@ function chat_format_message_manually($message, $courseid, $sender, $currentuser
$USER->timezone = $tz;
$message->strtime = userdate($message->timestamp, get_string('strftimemessage', 'chat'), $tz);
$message->picture = print_user_picture($sender->id, $courseid, $sender->picture, false, true, false);
$message->picture = $OUTPUT->user_picture(moodle_user_picture::make($sender, $courseid));
if ($courseid) {
$message->picture = "<a onclick=\"window.open('$CFG->wwwroot/user/view.php?id=$sender->id&amp;course=$courseid')\" href=\"$CFG->wwwroot/user/view.php?id=$sender->id&amp;course=$courseid\">$message->picture</a>";
}
mod/chat/report.php
+3 -3
View File
@@ -59,8 +59,8 @@
}
if ($deletesession and has_capability('mod/chat:deletelog', $context)) {
notice_yesno(get_string('deletesessionsure', 'chat'),
"report.php?id=$cm->id&amp;deletesession=1&amp;confirmdelete=1&amp;start=$start&amp;end=$end&amp;sesskey=".sesskey(),
echo $OUTPUT->confirm(get_string('deletesessionsure', 'chat'),
"report.php?id=$cm->id&deletesession=1&confirmdelete=1&start=$start&end=$end",
"report.php?id=$cm->id");
}
@@ -189,7 +189,7 @@
arsort($sessionusers);
foreach ($sessionusers as $sessionuser => $usermessagecount) {
if ($user = $DB->get_record('user', array('id'=>$sessionuser))) {
print_user_picture($user, $course->id, $user->picture);
$OUTPUT->user_picture(moodle_user_picture::make($user, $course->id));
echo '&nbsp;'.fullname($user, true); // XXX TODO use capability instead of true
echo "&nbsp;($usermessagecount)<br />";
}
mod/chat/view.php
+2 -2
View File
@@ -49,7 +49,7 @@
print_header_simple(format_string($chat->name), '', $navigation,
'', '', true, '', navmenu($course, $cm));
notice_yesno(get_string('noguests', 'chat').'<br /><br />'.get_string('liketologin'),
echo $OUTPUT->confirm(get_string('noguests', 'chat').'<br /><br />'.get_string('liketologin'),
get_login_url(), $CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->footer();
@@ -172,7 +172,7 @@
$lastping = $timenow - $chatuser->lastmessageping;
echo '<tr><td class="chatuserimage">';
echo "<a href=\"$CFG->wwwroot/user/view.php?id=$chatuser->id&amp;course=$chat->course\">";
print_user_picture($chatuser, $COURSE->id, $chatuser->picture, false, false, false);
echo $OUTPUT->user_picture(moodle_user_picture::make($chatuser, $COURSE->id));
echo '</a></td><td class="chatuserdetails">';
echo '<p>';
echo fullname($chatuser).'<br />';