mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36630-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-11-27 11:25:10 +08:00
commit e8d7f57e8c
9 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blocks/online_users/styles.css
View File

@ -1,7 +1,8 @@
.block_online_users .content .list li.listentry {clear:both;}
.block_online_users .content .list li.listentry .user {float:left;position:relative;}
.block_online_users .content .list li.listentry .message {float:right;}
.block_online_users .content .list li.listentry .user .userpicture { vertical-align: text-bottom;}
.block_online_users .content .list li.listentry .message {float:right; margin-top: 3px;}
.block_online_users .content .info {text-align:center;}
.dir-rtl .block_online_users .content .list li.listentry .user {float:right;}
.dir-rtl .block_online_users .content .list li.listentry .message {float:left;}
.dir-rtl .block_online_users .content .list li.listentry .message {float:left;}

BIN
pix/t/email.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 226 B

14
pix/t/email.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 -1 12 12" style="overflow:visible;enable-background:new 0 -1 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M0,0v10h12V0H0z M1,2.7l2.7,2.7L1,8.1V2.7z M4.4,6.1l1.2,1.2C5.7,7.4,5.9,7.5,6,7.5s0.3,0,0.4-0.1
l1.2-1.2L10.4,9H1.6L4.4,6.1z M8.3,5.4L11,2.7v5.4L8.3,5.4z M11,1v0.3L6.4,5.9c-0.2,0.2-0.5,0.2-0.7,0L1,1.3V1H11z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 846 B

BIN
pix/t/emailno.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 258 B

14
pix/t/emailno.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M12,2.8V11H3.8l1-1h5.7L7.6,7.2l0.7-0.7L11,9.1V3.8L12,2.8z M1,9.1V3.7l2.7,2.7l0.7-0.7L1,2.3V2h7.1
l1-1H0v9.1L1,9.1z M12,1.2V0h-0.2L0,11.8V12h1.2L12,1.2z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 790 B

BIN
pix/t/message.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 B

13
pix/t/message.svg Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M11,0H1C0.4,0,0,0.4,0,1v6c0,0.6,0.4,1,1,1h1v4l4-4h5c0.6,0,1-0.4,1-1V1C12,0.4,11.6,0,11,0z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 726 B

2
theme/base/style/blocks.css
View File

@ -8,7 +8,7 @@
.block .header .commands .icon img {width:12px;height:12px;}
.block .content {padding:4px;}
.block.hidden .content {display: none;}
.block .content .userpicture {width:16px;height:16px;margin-right:4px;}
.block .content .userpicture {width:16px;height:16px;margin-right:6px;}
.block .content .list li.listentry {clear:both;}
.block .content .list .c0 {display:inline;}
.block .content .list .c1 {margin-left:5px;display:inline;}

2
user/message.html
View File

@ -45,7 +45,7 @@
$error = get_string('emailempty');
}
if (!empty($error)) {
echo '<img src="'.$OUTPUT->pix_url('t/emailno') . '" alt="'.$error.'" title="'.$error.'"/>';
echo '<img src="'.$OUTPUT->pix_url('t/emailno') . '" alt="'.$error.'" class="iconsmall" title="'.$error.'"/>';
unset($error);
}
echo '</td><td><input type="submit" onClick="this.form.deluser.value='.$user->id.';" value="' . get_string('remove') . '" /></td></tr>';