mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2014-11-18 13:10:57 +00:00
commit 8d3fba4ce4
4 changed files with 103 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
message/lib.php
View File

@ -1980,20 +1980,19 @@ function message_get_history($user1, $user2, $limitnum=0, $viewingnewmessages=fa
function message_print_message_history($user1, $user2 ,$search = '', $messagelimit = 0, $messagehistorylink = false, $viewingnewmessages = false, $showactionlinks = true) {
global $CFG, $OUTPUT;
echo $OUTPUT->box_start('center');
echo html_writer::start_tag('table', array('cellpadding' => '10', 'class' => 'message_user_pictures'));
echo html_writer::start_tag('tr');
echo html_writer::start_tag('td', array('align' => 'center', 'id' => 'user1'));
echo $OUTPUT->box_start('center', 'message_user_pictures');
echo $OUTPUT->box_start('user');
echo $OUTPUT->box_start('generalbox', 'user1');
echo $OUTPUT->user_picture($user1, array('size' => 100, 'courseid' => SITEID));
echo html_writer::tag('div', fullname($user1), array('class' => 'heading'));
echo html_writer::end_tag('td');
echo $OUTPUT->box_end();
echo $OUTPUT->box_end();
echo html_writer::start_tag('td', array('align' => 'center'));
echo html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('i/twoway'), 'alt' => ''));
echo html_writer::end_tag('td');
$imgattr = array('src' => $OUTPUT->pix_url('i/twoway'), 'alt' => '', 'width' => 16, 'height' => 16);
echo $OUTPUT->box(html_writer::empty_tag('img', $imgattr), 'between');
echo html_writer::start_tag('td', array('align' => 'center', 'id' => 'user2'));
echo $OUTPUT->box_start('user');
echo $OUTPUT->box_start('generalbox', 'user2');
// Show user picture with link is real user else without link.
if (core_user::is_real_user($user2->id)) {
echo $OUTPUT->user_picture($user2, array('size' => 100, 'courseid' => SITEID));
@ -2014,10 +2013,8 @@ function message_print_message_history($user1, $user2 ,$search = '', $messagelim
echo html_writer::tag('div', $useractionlinks, array('class' => 'useractionlinks'));
}
echo html_writer::end_tag('td');
echo html_writer::end_tag('tr');
echo html_writer::end_tag('table');
echo $OUTPUT->box_end();
echo $OUTPUT->box_end();
echo $OUTPUT->box_end();
if (!empty($messagehistorylink)) {

39
theme/base/style/message.css
View File

@ -34,10 +34,41 @@ table.message .searchresults td {padding:5px;}
.message .messagearea {padding-left:1%;border-left:1px solid LightGrey;width:74%;float:right;min-height:200px;}
.message .messagearea .messagehistorytype {clear:both;padding-bottom:20px;}
.message .messagearea .messagehistory .message_user_pictures {margin-left: auto;margin-right: auto;}
.message .messagearea .messagehistory .message_user_pictures #user1 {vertical-align:top;width:200px;}
.message .messagearea .messagehistory .message_user_pictures #user2 {vertical-align:top;width:200px;}
.message .messagearea .messagehistory .message_user_pictures .useractionlinks {font-size:0.9em;}
.message .messagearea .messagehistory .user {
vertical-align: top;
width: 32%;
min-width: 100px;
float: left;
}
.message .messagearea .messagehistory .user:first-child {
margin-left: 13%;
}
.message .messagearea .messagehistory .user:last-child {
margin-right: 13%;
}
.dir-rtl .message .messagearea .messagehistory .user:first-child {
margin-right: 13%;
margin-left: 0;
}
.dir-rtl .message .messagearea .messagehistory .user:last-child {
margin-left: 13%;
margin-right: 0;
}
.message .messagearea .messagehistory .user > div {
text-align: center;
border: none;
}
.message .messagearea .messagehistory .between {
float: left;
width: 16px;
margin: 0 3%;
padding-top: 40px;
}
.dir-rtl .message .messagearea .messagehistory .between,
.dir-rtl .message .messagearea .messagehistory .user {
float: right;
}
.message .messagearea .messagehistory .heading {width:100%;clear:both;}
.message .messagearea .messagehistory .left {padding-bottom:10px;width:50%;float:left;clear:both;}

67
theme/bootstrapbase/less/moodle/message.less
View File

@ -67,20 +67,65 @@ table.message .searchresults td {
clear: both;
padding-bottom: 20px;
}
.message .messagearea .messagehistory .message_user_pictures {
margin-left: auto;
margin-right: auto;
}
.message .messagearea .messagehistory .message_user_pictures #user1 {
.message .messagearea .messagehistory .user {
vertical-align: top;
width: 200px;
width: 45%;
min-width: 100px;
float: left;
}
.message .messagearea .messagehistory .message_user_pictures #user2 {
vertical-align: top;
width: 200px;
.message .messagearea .messagehistory .user > div {
text-align: center;
}
.message .messagearea .messagehistory .message_user_pictures .useractionlinks {
font-size: 0.9em;
.message .messagearea .messagehistory .between {
float: left;
width: 16px;
margin: 0 1%;
padding-top: 40px;
}
@media screen and (min-width: 800px) {
.message .messagearea .messagehistory .between {
margin: 0 3%;
}
.message .messagearea .messagehistory .user {
width: 32%
}
.message .messagearea .messagehistory .user:first-child {
margin-left: 13%;
}
.message .messagearea .messagehistory .user:last-child {
margin-right: 13%;
}
.dir-rtl .message .messagearea .messagehistory .user:first-child {
margin-right: 13%;
margin-left: 0%
}
.dir-rtl .message .messagearea .messagehistory .user:last-child {
margin-left: 13%;
margin-right: 0%;
}
}
@media screen and (min-width: 1200px) {
.message .messagearea .messagehistory .user {
width: 25%
}
.message .messagearea .messagehistory .user:first-child {
margin-left: 20%;
}
.message .messagearea .messagehistory .user:last-child {
margin-right: 20%;
}
.dir-rtl .message .messagearea .messagehistory .user:first-child {
margin-left: 0;
margin-right: 20%;
}
.dir-rtl .message .messagearea .messagehistory .user:last-child {
margin-right: 0%;
margin-left: 20%;
}
}
.dir-rtl .message .messagearea .messagehistory .between,
.dir-rtl .message .messagearea .messagehistory .user {
float: right;
}
.message .messagearea .messagehistory .heading {
width: 100%;

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long