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

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

Browse Source
This commit is contained in:
Dan Poltawski
2012-11-14 14:10:49 +08:00
parent 1720550b5d b7494afe49
commit ebdbc6b781
44 changed files with 163 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/activity_modules/block_activity_modules.php
+2 -2
View File
@@ -53,10 +53,10 @@ class block_activity_modules extends block_list {
foreach ($modfullnames as $modname => $modfullname) {
if ($modname === 'resources') {
$icon = $OUTPUT->pix_icon(file_extension_icon('.htm'), '', 'moodle', array('class' => 'icon')). ' ';
$icon = $OUTPUT->pix_icon(file_extension_icon('.htm'), '', 'moodle', array('class' => 'icon')). '';
$this->content->items[] = '<a href="'.$CFG->wwwroot.'/course/resources.php?id='.$course->id.'">'.$icon.$modfullname.'</a>';
} else {
$icon = '<img src="'.$OUTPUT->pix_url('icon', $modname) . '" class="icon" alt="" />&nbsp;';
$icon = '<img src="'.$OUTPUT->pix_url('icon', $modname) . '" class="icon" alt="" />';
$this->content->items[] = '<a href="'.$CFG->wwwroot.'/mod/'.$modname.'/index.php?id='.$course->id.'">'.$icon.$modfullname.'</a>';
}
}
blocks/community/block_community.php
+1 -1
View File
@@ -72,7 +72,7 @@ class block_community extends block_list {
'class' => 'icon', 'alt' => get_string('addcourse', 'block_community')));
$addcourseurl = new moodle_url('/blocks/community/communitycourse.php',
array('add' => true, 'courseid' => $this->page->course->id));
$searchlink = html_writer::tag('a', $icon . '&nbsp;' . get_string('addcourse', 'block_community'),
$searchlink = html_writer::tag('a', $icon . get_string('addcourse', 'block_community'),
array('href' => $addcourseurl->out(false)));
$this->content->items[] = $searchlink;
blocks/course_list/block_course_list.php
+2 -2
View File
@@ -23,7 +23,7 @@ class block_course_list extends block_list {
$this->content->icons = array();
$this->content->footer = '';
$icon = '<img src="' . $OUTPUT->pix_url('i/course') . '" class="icon" alt="" />&nbsp;';
$icon = '<img src="' . $OUTPUT->pix_url('i/course') . '" class="icon" alt="" />';
$adminseesall = true;
if (isset($CFG->block_course_list_adminview)) {
@@ -109,7 +109,7 @@ class block_course_list extends block_list {
return;
}
$icon = '<img src="'.$OUTPUT->pix_url('i/mnethost') . '" class="icon" alt="" />&nbsp;';
$icon = '<img src="'.$OUTPUT->pix_url('i/mnethost') . '" class="icon" alt="" />';
// shortcut - the rest is only for logged in users!
if (!isloggedin() || isguestuser()) {
blocks/dock.js
+9 -3
View File
@@ -532,10 +532,16 @@ M.core_dock.fixTitleOrientation = function(item, title, text) {
'position' : 'relative',
'fontSize' : fontsize,
'width' : width,
'top' : width/2,
'right' : width/2 - height
'top' : width/2
});
// Positioning is different when in RTL mode.
if (Y.one(document.body).hasClass('dir-rtl')) {
title.setStyle('left', width/2 - height);
} else {
title.setStyle('right', width/2 - height);
}
// Rotate the text
title.setStyles({
'transform' : transform,
@@ -922,7 +928,7 @@ M.core_dock.genericblock.prototype = {
}, this);
// Add a close icon
// Must set the image src seperatly of we get an error with XML strict headers
var closeicon = Y.Node.create('<span class="hidepanelicon" tabindex="0"><img alt="" style="width:11px;height:11px;cursor:pointer;" /></span>');
var closeicon = Y.Node.create('<span class="hidepanelicon" tabindex="0"><img alt="" /></span>');
closeicon.one('img').setAttribute('src', M.util.image_url('t/dockclose', 'moodle'));
closeicon.on('forceclose|click', this.hide, this);
closeicon.on('dock:actionkey',this.hide, this, {actions:{enter:true,toggle:true}});
blocks/navigation/styles.css
+21 -10
View File
@@ -1,19 +1,23 @@
/** General display rules **/
.block_navigation .block_tree {margin:5px;padding-left:0px;overflow:visible;}
.block_navigation .block_tree li {margin:3px;list-style: none;padding:0;}
.block_navigation .block_tree li.item_with_icon > p {position:relative;}
.block_navigation .block_tree li.item_with_icon > p img {vertical-align:middle;position:absolute;left:0;top:3px}
.block_navigation .block_tree li.item_with_icon > p {position:relative; padding-left: 21px;}
.block_navigation .block_tree li.item_with_icon > p img,
.block_navigation .block_tree .type_activity > p.tree_item.active_tree_node img,
.block_navigation .block_tree li > p.hasicon img {vertical-align:middle;position:absolute;left:0;top:-1px;width:16px;height:16px;}
.block_navigation .block_tree li.item_with_icon.contains_branch > p img {left:16px;}
.block_navigation .block_tree li.item_with_icon.contains_branch .tree_item {padding-left:34px;}
.block_navigation .block_tree .type_activity > p.branch.hasicon,
.block_navigation .block_tree li.item_with_icon.contains_branch > .tree_item {padding-left:37px;}
.block_navigation .block_tree li ul {padding-left:0;margin:0;}
.block_navigation .block_tree li.depth_2 ul {padding-left:16px;margin:0;}
.block_navigation .block_tree .tree_item {padding-left: 18px;margin:3px 0px;text-align:left;}
.block_navigation .block_tree .type_activity > p.tree_item.branch.hasicon.active_tree_node,
.block_navigation .block_tree .tree_item {padding-left: 21px;margin:3px 0px;text-align:left;}
.block_navigation .block_tree .tree_item.branch {background-image: url([[pix:t/expanded]]);background-position: 0 10%;background-repeat: no-repeat;}
.block_navigation .block_tree .tree_item.branch {background-image: url([[pix:t/expanded]]);background-position: 0 0;background-repeat: no-repeat;}
.block_navigation .block_tree .tree_item.branch.navigation_node {background-image:none;padding-left:0;}
.block_navigation .block_tree .type_activity > .tree_item.branch {background-image:none;position:relative;}
.block_navigation .block_tree .type_activity > .tree_item.branch img {position:absolute;left:0;}
.block_navigation .block_tree .type_activity > .tree_item.branch img {left: 16px;}
.block_navigation .block_tree .root_node.leaf {padding-left:0px;}
.block_navigation .block_tree .active_tree_node {font-weight:bold;}
.block_navigation .block_tree .depth_1.current_branch ul {font-weight:normal;}
@@ -21,8 +25,9 @@
.dock .block_navigation .tree_item {white-space: nowrap;}
.jsenabled .block_navigation .block_tree .tree_item.branch {cursor:pointer;}
.jsenabled .block_navigation .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty]]);background-position: 0% 5%;background-repeat: no-repeat;}
.jsenabled .block_navigation .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty]]);background-position: 0 0;background-repeat: no-repeat;}
.jsenabled .block_navigation .block_tree .collapsed ul {display: none;}
.jsenabled .block_navigation .block_tree .type_activity > .tree_item.branch {background-image: url([[pix:t/expanded]]);}
.jsenabled .block_navigation .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed]]);}
.jsenabled .block_navigation .block_tree .tree_item.branch.loadingbranch {background-image:url([[pix:i/loading_small]]);}
@@ -35,8 +40,9 @@
.ie6 .block_navigation .block_tree .tree_item {width:100%;}
/** Overide for RTL layout **/
.dir-rtl .block_navigation .block_tree li.depth_2 ul {padding-left:0;padding-right: 7px;}
.dir-rtl .block_navigation .block_tree .tree_item {padding-right: 18px;text-align:right;}
.dir-rtl .block_navigation .block_tree li.depth_2 ul {padding-left:0;padding-right: 16px; padding-left: 0;}
.dir-rtl .block_navigation .block_tree .type_activity > p.tree_item.branch.hasicon.active_tree_node,
.dir-rtl .block_navigation .block_tree .tree_item {padding-right: 21px;text-align:right;}
.dir-rtl .block_navigation .block_tree .tree_item.branch {background-position: center right;}
@@ -46,7 +52,12 @@
.dir-rtl .block_navigation .block_tree .root_node.leaf {padding-right:0;}
.dir-rtl .block_navigation .block_tree li.item_with_icon > p img,
.dir-rtl .block_navigation .block_tree .type_activity > .tree_item.branch img {right:0;left:auto;}
.dir-rtl .block_navigation .block_tree .type_activity > p.tree_item.active_tree_node img,
.dir-rtl .block_navigation .block_tree li > p.hasicon img {left:auto; right:0;}
.dir-rtl .block_navigation .block_tree li.item_with_icon.contains_branch > p img {left: auto; right:16px;}
.dir-rtl .block_navigation .block_tree .type_activity > p.branch.hasicon,
.dir-rtl .block_navigation .block_tree li.item_with_icon.contains_branch > .tree_item {padding-right:37px; padding-left: 0;}
.dir-rtl .block_navigation .block_tree .type_activity > .tree_item.branch img {right: 16px; left: auto;}
.jsenabled.dir-rtl .block_navigation .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty_rtl]]);background-position: center right;}
.jsenabled.dir-rtl .block_navigation .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed_rtl]]);}
blocks/participants/block_participants.php
+1 -1
View File
@@ -37,7 +37,7 @@ class block_participants extends block_list {
}
}
$icon = '<img src="'.$OUTPUT->pix_url('i/users') . '" class="icon" alt="" />&nbsp;';
$icon = '<img src="'.$OUTPUT->pix_url('i/users') . '" class="icon" alt="" />';
$this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
$CFG->wwwroot.'/user/index.php?contextid='.$currentcontext->id.'">'.$icon.get_string('participants').'</a>';
blocks/private_files/renderer.php
+2 -2
View File
@@ -66,13 +66,13 @@ class block_private_files_renderer extends plugin_renderer_base {
$result = '<ul>';
foreach ($dir['subdirs'] as $subdir) {
$image = $this->output->pix_icon(file_folder_icon(), $subdir['dirname'], 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.s($subdir['dirname']).'</div> '.$this->htmllize_tree($tree, $subdir).'</li>';
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.s($subdir['dirname']).'</div> '.$this->htmllize_tree($tree, $subdir).'</li>';
}
foreach ($dir['files'] as $file) {
$url = file_encode_url("$CFG->wwwroot/pluginfile.php", '/'.$tree->context->id.'/user/private'.$file->get_filepath().$file->get_filename(), true);
$filename = $file->get_filename();
$image = $this->output->pix_icon(file_file_icon($file), $filename, 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.html_writer::link($url, $image.'&nbsp;'.$filename).'</div></li>';
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.html_writer::link($url, $image.$filename).'</div></li>';
}
$result .= '</ul>';
blocks/settings/styles.css
+7 -8
View File
@@ -6,12 +6,12 @@
/** General display rules **/
.block_settings .block_tree {margin:5px;padding-left:0px;overflow:visible;}
.block_settings .block_tree li {margin:0;list-style: none;}
.block_settings .block_tree li ul {padding-left:16px;margin:0;}
.block_settings .block_tree li ul {padding-left:18px;margin:0;}
.block_settings .block_tree li.item_with_icon > p {position:relative;}
.block_settings .block_tree li.item_with_icon > p img {vertical-align:middle;position:absolute;left:0;top:-1px}
.block_settings .block_tree li.item_with_icon > p img {vertical-align:middle;position:absolute;left:0;top:-1px; width: 16px; height: 16px;}
.block_settings .block_tree .tree_item {padding-left: 18px;margin:3px 0px;text-align:left;}
.block_settings .block_tree .tree_item {padding-left: 21px;margin:3px 0px;text-align:left;}
.block_settings .block_tree .tree_item.branch {background-image: url([[pix:t/expanded]]);background-position: 0 10%;background-repeat: no-repeat;}
.block_settings .block_tree .root_node.leaf {padding-left:0px;}
@@ -26,12 +26,11 @@
/** Overide for RTL layout **/
.dir-rtl .block_settings .block_tree {padding-right:0px;}
.dir-rtl .block_settings .block_tree li ul {padding-left:0;padding-right: 7px;}
.dir-rtl .block_settings .block_tree li.item_with_icon > p img,
.dir-rtl .block_navigation .block_tree .type_activity > .tree_item.branch img {left:auto;right:0;}
.dir-rtl .block_settings .block_tree .tree_item {padding-right: 18px;text-align:right;}
.dir-rtl .block_settings .block_tree li ul {padding-left:0;padding-right: 18px;}
.dir-rtl .block_settings .block_tree .tree_item {padding-right: 21px; padding-left: 0; text-align:right;}
.dir-rtl .block_settings .block_tree .tree_item.branch {background-position: center right;}
.dir-rtl .block_settings .block_tree .root_node.leaf {padding-right:0px;}
.dir-rtl .block_settings .block_tree li.item_with_icon > p img { right: 0; left: auto;}
.jsenabled.dir-rtl .block_settings .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty_rtl]]);background-position: center right;}
.jsenabled.dir-rtl .block_settings .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed_rtl]]);}
.jsenabled.dir-rtl .block_settings .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed_rtl]]);}
blocks/site_main_menu/block_site_main_menu.php
+2 -2
View File
@@ -50,7 +50,7 @@ class block_site_main_menu extends block_list {
} else {
$linkcss = $cm->visible ? '' : ' class="dimmed" ';
//Accessibility: incidental image - should be empty Alt text
$icon = '<img src="' . $cm->get_icon_url() . '" class="icon" alt="" />&nbsp;';
$icon = '<img src="' . $cm->get_icon_url() . '" class="icon" alt="" />';
$this->content->items[] = '<a title="'.$cm->modplural.'" '.$linkcss.' '.$cm->extra.
' href="' . $url . '">' . $icon . $instancename . '</a>';
}
@@ -120,7 +120,7 @@ class block_site_main_menu extends block_list {
$this->content->icons[] = '';
} else {
//Accessibility: incidental image - should be empty Alt text
$icon = '<img src="' . $mod->get_icon_url() . '" class="icon" alt="" />&nbsp;';
$icon = '<img src="' . $mod->get_icon_url() . '" class="icon" alt="" />';
$this->content->items[] = '<a title="' . $mod->modfullname . '" ' . $linkcss . ' ' . $mod->extra .
' href="' . $url . '">' . $icon . $instancename . '</a>' . $editbuttons;
}
course/lib.php
+1 -1
View File
@@ -3315,7 +3315,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele
if (has_capability('moodle/role:assign', $modcontext)){
$actions[] = new action_link(
new moodle_url('/'.$CFG->admin.'/roles/assign.php', array('contextid' => $modcontext->id)),
new pix_icon('i/roles', $str->assign, 'moodle', array('class' => 'iconsmall', 'title' => '')),
new pix_icon('t/assignroles', $str->assign, 'moodle', array('class' => 'iconsmall', 'title' => '')),
null,
array('class' => 'editing_assign', 'title' => $str->assign)
);
grade/lib.php
+2 -2
View File
@@ -2300,14 +2300,14 @@ function grade_extend_settings($plugininfo, $courseid) {
if ($imports = grade_helper::get_plugins_import($courseid)) {
$importnode = $gradenode->add($strings['import'], null, navigation_node::TYPE_CONTAINER);
foreach ($imports as $import) {
$importnode->add($import->string, $import->link, navigation_node::TYPE_SETTING, null, $import->id, new pix_icon('i/restore', ''));
$importnode->add($import->string, $import->link, navigation_node::TYPE_SETTING, null, $import->id, new pix_icon('i/import', ''));
}
}
if ($exports = grade_helper::get_plugins_export($courseid)) {
$exportnode = $gradenode->add($strings['export'], null, navigation_node::TYPE_CONTAINER);
foreach ($exports as $export) {
$exportnode->add($export->string, $export->link, navigation_node::TYPE_SETTING, null, $export->id, new pix_icon('i/backup', ''));
$exportnode->add($export->string, $export->link, navigation_node::TYPE_SETTING, null, $export->id, new pix_icon('i/export', ''));
}
}
lib/blocklib.php
+1 -1
View File
@@ -1067,7 +1067,7 @@ class block_manager {
$controls[] = array('url' => $CFG->wwwroot . '/' . $CFG->admin .
'/roles/assign.php?contextid=' . $block->context->id . '&returnurl=' . urlencode($return),
'icon' => 'i/roles', 'caption' => get_string('assignroles', 'role'), 'class' => 'editing_roles');
'icon' => 't/assignroles', 'caption' => get_string('assignroles', 'role'), 'class' => 'editing_roles');
}
return $controls;
lib/enrollib.php
+2 -2
View File
@@ -444,7 +444,7 @@ function enrol_add_course_navigation(navigation_node $coursenode, $course) {
if ($course->id == SITEID or (!empty($CFG->adminsassignrolesincourse) and is_siteadmin())) {
if (has_capability('moodle/role:assign', $coursecontext)) {
$url = new moodle_url('/admin/roles/assign.php', array('contextid'=>$coursecontext->id));
$permissionsnode->add(get_string('assignedroles', 'role'), $url, navigation_node::TYPE_SETTING, null, 'roles', new pix_icon('i/roles', ''));
$permissionsnode->add(get_string('assignedroles', 'role'), $url, navigation_node::TYPE_SETTING, null, 'roles', new pix_icon('i/assignroles', ''));
}
}
// Check role permissions
@@ -459,7 +459,7 @@ function enrol_add_course_navigation(navigation_node $coursenode, $course) {
//TODO, create some new UI for role assignments at course level
if (has_capability('moodle/role:assign', $coursecontext)) {
$url = new moodle_url('/enrol/otherusers.php', array('id'=>$course->id));
$usersnode->add(get_string('notenrolledusers', 'enrol'), $url, navigation_node::TYPE_SETTING, null, 'otherusers', new pix_icon('i/roles', ''));
$usersnode->add(get_string('notenrolledusers', 'enrol'), $url, navigation_node::TYPE_SETTING, null, 'otherusers', new pix_icon('i/assignroles', ''));
}
}
lib/navigationlib.php
+3 -3
View File
@@ -3527,7 +3527,7 @@ class settings_navigation extends navigation_node {
// Import data from other courses
if (has_capability('moodle/restore:restoretargetimport', $coursecontext)) {
$url = new moodle_url('/backup/import.php', array('id'=>$course->id));
$coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, 'import', new pix_icon('i/restore', ''));
$coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, 'import', new pix_icon('i/import', ''));
}
// Publish course on a hub
@@ -3597,7 +3597,7 @@ class settings_navigation extends navigation_node {
$returnurl->param('sesskey', sesskey());
foreach ($roles as $key => $name) {
$url = new moodle_url('/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>$key, 'returnurl'=>$returnurl->out(false)));
$switchroles->add($name, $url, self::TYPE_SETTING, null, $key, new pix_icon('i/roles', ''));
$switchroles->add($name, $url, self::TYPE_SETTING, null, $key, new pix_icon('i/switchrole', ''));
}
}
// Return we are done
@@ -4064,7 +4064,7 @@ class settings_navigation extends navigation_node {
// Assign local roles
if (has_capability('moodle/role:assign', $this->context)) {
$assignurl = new moodle_url('/'.$CFG->admin.'/roles/assign.php', array('contextid'=>$this->context->id));
$categorynode->add(get_string('assignroles', 'role'), $assignurl, self::TYPE_SETTING, null, 'roles', new pix_icon('i/roles', ''));
$categorynode->add(get_string('assignroles', 'role'), $assignurl, self::TYPE_SETTING, null, 'roles', new pix_icon('i/assignroles', ''));
}
// Override roles
pix/i/assignroles.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 289 B

pix/i/assignroles.svg
+15
View File
@@ -0,0 +1,15 @@
<?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="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M10.8,10.3C10.3,10,10.2,9.4,10.6,9c0,0,1.4-1.8,1.4-3.8C12,2.3,10.2,0,8,0S4,2.3,4,5.2
C4,7.2,5.4,9,5.4,9c0.3,0.4,0.2,1-0.3,1.3L0,13.1V16h6.6L7,14.2l0.5-1.8l-0.6-0.6L7.7,11h0.6l0.8,0.8l-0.6,0.6L9,14.2L9.5,16H16v-3
L10.8,10.3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 864 B

pix/i/export.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 265 B

pix/i/export.svg
+16
View File
@@ -0,0 +1,16 @@
<?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="16px" height="16px" viewBox="0 -0.4 16 16" style="overflow:visible;enable-background:new 0 -0.4 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M16,8.6v6c0,0.5-0.5,1-1,1h-1H2H1c-0.5,0-1-0.5-1-1v-6c0-0.5,0.5-1,1-1h1c0.5,0,1,0.5,1,1v4h10v-4
c0-0.5,0.5-1,1-1h1C15.5,7.6,16,8,16,8.6z M12.4,4L8.7,0.3C8.6,0.1,8.3,0,8,0C7.8,0,7.5,0.1,7.3,0.3L3.6,4c-0.4,0.4-0.4,1,0,1.4
l0.7,0.7c0.4,0.4,1,0.4,1.4,0l0.8-0.8v4.2c0,0.5,0.5,1.1,1,1.1h1c0.6,0,1-0.5,1-1.1V5.3l0.8,0.8c0.4,0.4,1,0.4,1.4,0l0.7-0.7
C12.8,5,12.8,4.4,12.4,4z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1013 B

pix/i/import.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

pix/i/import.svg
+16
View File
@@ -0,0 +1,16 @@
<?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="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M16,9v6c0,0.5-0.5,1-1,1h-1H2H1c-0.5,0-1-0.5-1-1V9c0-0.5,0.5-1,1-1h1c0.5,0,1,0.5,1,1v4h10V9
c0-0.5,0.5-1,1-1h1C15.5,8,16,8.5,16,9z M12.4,5.1l-0.7-0.7c-0.4-0.4-1-0.4-1.4,0L9.5,5.2V1c0-0.5-0.4-1-1-1h-1c-0.5,0-1,0.5-1,1
v4.2L5.7,4.4C5.3,4,4.7,4,4.3,4.4L3.6,5.1c-0.4,0.4-0.4,1,0,1.4l3.7,3.7c0.2,0.2,0.5,0.3,0.7,0.3c0.3,0,0.5-0.1,0.7-0.3l3.7-3.7
C12.8,6.2,12.8,5.5,12.4,5.1z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1011 B

pix/i/item.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 171 B

pix/i/item.svg
+1 -1
View File
@@ -5,7 +5,7 @@
]>
<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="-3 -3 12 12" style="overflow:visible;enable-background:new -3 -3 12 12;"
x="0px" y="0px" width="16px" height="16px" viewBox="-5 -5 16 16" style="overflow:visible;enable-background:new -5 -5 16 16;"
xml:space="preserve">
<defs>
</defs>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 813 B

After

Width:  |  Height:  |  Size: 813 B

pix/i/navigationitem.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 150 B

pix/i/navigationitem.svg
+1 -1
View File
@@ -5,7 +5,7 @@
]>
<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="-3 -3 12 12" style="overflow:visible;enable-background:new -3 -3 12 12;"
x="0px" y="0px" width="16px" height="16px" viewBox="-5 -5 16 16" style="overflow:visible;enable-background:new -5 -5 16 16;"
xml:space="preserve">
<defs>
</defs>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 718 B

After

Width:  |  Height:  |  Size: 718 B

pix/i/switchrole.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 289 B

pix/i/switchrole.svg
+15
View File
@@ -0,0 +1,15 @@
<?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="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M10.8,10.3C10.3,10,10.2,9.4,10.6,9c0,0,1.4-1.8,1.4-3.8C12,2.3,10.2,0,8,0S4,2.3,4,5.2
C4,7.2,5.4,9,5.4,9c0.3,0.4,0.2,1-0.3,1.3L0,13.1V16h6.6L7,14.2l0.5-1.8l-0.6-0.6L7.7,11h0.6l0.8,0.8l-0.6,0.6L9,14.2L9.5,16H16v-3
L10.8,10.3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 864 B

pix/i/roles.png → pix/t/assignroles.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

pix/i/roles.svg → pix/t/assignroles.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 910 B

After

Width:  |  Height:  |  Size: 910 B

pix/t/collapsed.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 187 B

pix/t/collapsed.svg
+2 -2
View File
@@ -5,8 +5,8 @@
]>
<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="-3 -0.1 12 12"
style="overflow:visible;enable-background:new -3 -0.1 12 12;" xml:space="preserve">
x="0px" y="0px" width="16px" height="16px" viewBox="-5 -2.1 16 16"
style="overflow:visible;enable-background:new -5 -2.1 16 16;" xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M0.7,0.2C0.3-0.2,0,0,0,0.5v10.8c0,0.5,0.3,0.7,0.7,0.3l5-5c0.4-0.4,0.4-1,0-1.4L0.7,0.2z"/>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 731 B

After

Width:  |  Height:  |  Size: 731 B

pix/t/collapsed_empty.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 210 B

pix/t/collapsed_empty.svg
+2 -2
View File
@@ -5,8 +5,8 @@
]>
<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="-3 -0.1 12 12"
style="overflow:visible;enable-background:new -3 -0.1 12 12;" xml:space="preserve">
x="0px" y="0px" width="16px" height="16px" viewBox="-5 -2.1 16 16"
style="overflow:visible;enable-background:new -5 -2.1 16 16;" xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M5.7,5.2l-5-5C0.3-0.2,0,0,0,0.5v10.8c0,0.5,0.3,0.7,0.7,0.3l5-5C6.1,6.2,6.1,5.6,5.7,5.2z M4.3,6.6
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 830 B

After

Width:  |  Height:  |  Size: 830 B

pix/t/collapsed_empty_rtl.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 B

After

Width:  |  Height:  |  Size: 218 B

pix/t/collapsed_empty_rtl.svg
+2 -2
View File
@@ -5,8 +5,8 @@
]>
<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="-3 -0.1 12 12"
style="overflow:visible;enable-background:new -3 -0.1 12 12;" xml:space="preserve">
x="0px" y="0px" width="16px" height="16px" viewBox="-5 -2.1 16 16"
style="overflow:visible;enable-background:new -5 -2.1 16 16;" xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M0.3,6.6l5,5C5.7,12,6,11.9,6,11.3V0.5C6,0,5.7-0.2,5.3,0.2l-5,5C-0.1,5.6-0.1,6.2,0.3,6.6z M1.7,5.2
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 830 B

After

Width:  |  Height:  |  Size: 830 B

pix/t/collapsed_rtl.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 181 B

pix/t/collapsed_rtl.svg
+2 -2
View File
@@ -5,8 +5,8 @@
]>
<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="-3 -0.1 12 12"
style="overflow:visible;enable-background:new -3 -0.1 12 12;" xml:space="preserve">
x="0px" y="0px" width="16px" height="16px" viewBox="-5 -2.1 16 16"
style="overflow:visible;enable-background:new -5 -2.1 16 16;" xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M5.3,0.2C5.7-0.2,6,0,6,0.5v10.8c0,0.5-0.3,0.7-0.7,0.3l-5-5c-0.4-0.4-0.4-1,0-1.4L5.3,0.2z"/>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 733 B

After

Width:  |  Height:  |  Size: 733 B

pix/t/expanded.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 181 B

pix/t/expanded.svg
+2 -2
View File
@@ -5,8 +5,8 @@
]>
<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 -3 12 12"
style="overflow:visible;enable-background:new -0.1 -3 12 12;" xml:space="preserve">
x="0px" y="0px" width="16px" height="16px" viewBox="-2.1 -5 16 16"
style="overflow:visible;enable-background:new -2.1 -5 16 16;" xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M0.5,0C0,0-0.2,0.3,0.2,0.7l5,5c0.4,0.4,1,0.4,1.4,0l5-5C12,0.3,11.9,0,11.3,0H0.5z"/>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 725 B

After

Width:  |  Height:  |  Size: 725 B

theme/base/style/blocks.css
+9 -6
View File
@@ -1,9 +1,11 @@
.block {border:1px solid;margin-bottom:1em;}
.block .header h2 {margin:4px;}
.block .header .block_action {float:right;margin:2px 4px 0;vertical-align:top;}
.block .header .block_action input {margin-right:2px;}
.block .header .commands {margin-left:4px;}
.block .header .commands .icon img {width:12px;height:12px;margin-right:3px;}
.block .header h2 { padding: .2em 0 0 .2em; margin: 0;}
.block .header .block_action {float:right;margin:4px 0 3px 0;vertical-align:top;}
.block .header .block_action img,
.block .header .block_action input {margin:0 3px; width: 12px; height: 12px;}
.block .header .commands { text-align: right; clear: both;}
.block .header .commands > a { margin:0 3px; }
.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;}
@@ -32,4 +34,5 @@
/** Overide for RTL layout **/
.dir-rtl .block .header,
.dir-rtl .block h2.header {text-align:right;}
.dir-rtl .block .header .commands { text-align: right;}
.dir-rtl .block .header .commands { text-align: left;}
.dir-rtl .block .header .block_action { float: left; margin-left: 4px; margin-left: 0;}
theme/base/style/core.css
+2 -1
View File
@@ -89,7 +89,8 @@ a.autolink.glossary:hover {cursor: help;}
img.resize {height: 1em;width: 1em;}
.block img.resize,
.breadcrumb img.resize {height: 0.9em;width: 0.8em;}
img.icon {height:16px;vertical-align:middle;width:16px;padding-right:4px;padding-top:2px;padding-bottom:2px;}
img.icon {height:16px;vertical-align:text-bottom;width:16px;padding: 2px 6px 2px 0;}
.dir-rtl img.icon {padding: 2px 0 2px 6px;}
img.iconsmall {height:12px;margin-right:3px;vertical-align:middle;width:12px;}
img.iconhelp, .helplink img {height:16px; padding-left:3px;vertical-align:middle;width:16px;}
img.iconlarge {height: 24px; width: 24px; vertical-align:middle;}
theme/base/style/dock.css
+11 -9
View File
@@ -11,7 +11,7 @@ body.has_dock {margin-left:30px;}
#dock.nothingdocked {visibility: hidden;display:none;}
#dock .dockeditem .firstdockitem {margin-top:1em;}
#dock .dockedtitle {border-bottom:1px solid #000;border-top:1px solid #000;cursor:pointer;}
#dock .dockedtitle h2 {font-size:0.8em;line-height:100%;text-align:center;}
#dock .dockedtitle h2 {font-size:0.80em;line-height:100%;text-align:center;}
#dock .dockedtitle .filterrotate {margin-left:8px;}
#dock .controls {position:absolute;bottom:1em;text-align:center;width:100%;}
#dock .controls img {cursor:pointer;}
@@ -23,20 +23,22 @@ body.has_dock {margin-left:30px;}
#dockeditempanel .dockeditempanel_bd {overflow:auto;width:auto;}
#dockeditempanel .dockeditempanel_bd .block_docked {margin:10px;}
#dockeditempanel .dockeditempanel_bd .block_navigation .block_tree li {overflow:visible;}
#dockeditempanel .dockeditempanel_hd {border-bottom:1px solid #000;text-align:right;}
#dockeditempanel .dockeditempanel_hd h2 {display:inline;margin:0;padding-right:1em;}
#dockeditempanel .dockeditempanel_hd .commands {display:inline;}
#dockeditempanel .dockeditempanel_hd .commands img {margin-right:2px;vertical-align:middle;}
#dockeditempanel .dockeditempanel_hd {border-bottom:1px solid #000;}
#dockeditempanel .dockeditempanel_hd h2 {display:block;margin:0;padding-right:1em;}
#dockeditempanel .dockeditempanel_hd .commands {display:block;text-align:right;}
#dockeditempanel .dockeditempanel_hd .commands > a,
#dockeditempanel .dockeditempanel_hd .commands > span { margin:0 3px; }
#dockeditempanel .dockeditempanel_hd .commands img,
#dockeditempanel .dockeditempanel_hd .commands input {vertical-align:middle; width: 12px; height: 12px;}
#dockeditempanel .dockeditempanel_hd .commands .hidepanemicon img { cursor:pointer; }
/** IE 6 doesn't support fixed pos elements **/
.ie6 #dockeditempanel {position:absolute;}
/** Overide for RTL layout **/
.dir-rtl #dockeditempanel {left:670%;}
/* right align the DOCK panel
------------------------------*/
.dir-rtl #dockeditempanel .dockeditempanel_hd .commands {text-align: left;}
.dir-rtl #dockeditempanel {right: 100%;}
.dir-rtl #dock {left:auto;right: 0%; border-left: 1px solid #DDD;}
.dir-rtl #dock .dockedtitle { border-bottom: 1px solid #DDD;border-top: 1px solid #EEE; cursor: pointer;}
body.dir-rtl.has_dock {margin-left: 0px; margin-right: 30px}
body.dir-rtl.has_dock {margin-left: 0px; margin-right: 30px}
theme/standard/style/blocks.css
+2 -6
View File
@@ -1,19 +1,15 @@
/** General **/
.block {border:1px solid #DDD;}
.block .header {border-bottom:1px solid #DDD;border-color: #dddddd;}
.block .header h2 {margin-top:2px;font-size:1em;}
.block .header .block_action {margin:0 4px;}
.block .header .block_action img,
.block .header .block_action input {width:11px; height:11px;}
.block .header h2 {font-size:1em;}
.block .content {border-color: #dddddd;background-color:#FCFCFC;}
.block .content hr {border-top-color:#999999;}
.block .header .commands {font-size:0.9em;clear:both;}
.block .header .commands .icon {margin-right:2px;}
.block .footer {font-size:0.9em;text-align:center;clear:both;}
.block.beingmoved {border-color: #f88;}
.block .header,
.block h2.header {text-align: left;margin:0;padding:4px;padding-top:0;border-bottom-width: 0;}
.block h2.header {text-align: left;margin:0;padding:4px;border-bottom-width: 0;}
.block .content h2 {text-align: left;margin:1.5em 0 0;padding:0;}
.block .content h3 {text-align: left;}
.dir-rtl .block .content h3 {text-align: right;}
theme/standard/style/dock.css
+3 -3
View File
@@ -9,8 +9,8 @@
/** For the panel the docked blocks are shown in */
#dockeditempanel .dockeditempanel_content {border-color:#AAA;}
#dockeditempanel .dockeditempanel_hd {border-bottom-color:#AAA;padding:3px 5px;background-image:url([[pix:theme|hgradient]]);}
#dockeditempanel .dockeditempanel_hd h2 {font-size:80%;color:#999;}
#dockeditempanel .dockeditempanel_hd {border-bottom-color:#AAA;padding:4px;background-image:url([[pix:theme|hgradient]]);}
#dockeditempanel .dockeditempanel_hd h2 {font-size:95%;color:#999;}
/* block expansion code */
.block_js_expansion .block_tree {overflow-x:scroll;}
@@ -25,4 +25,4 @@
.ie6 #dock li p {background-color:inherit;}
.ie6 #dock .bd.oversized_content .content, .ie7 #dock .bd.oversized_content .content {padding-bottom:0px;}
.ie6 .block_js_expansion.mouseover .content, .ie7 .block_js_expansion.mouseover .content{ padding-bottom:2px;}
.ie6 #dock .bd.oversized_content {width:100%;}
.ie6 #dock .bd.oversized_content {width:100%;}
theme/upgrade.txt
+6
View File
@@ -6,10 +6,16 @@ information provided here is intended especially for theme designer.
required changes:
* output course and course content header/footer that may be returned by course format (see MDL-36048)
deprecation:
* i/roles: Use t/assignroles instead
optional changes:
* new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365)
* new layout option "nologinlinks" and new page layout "secure" e.g. for safebrowser and securewindow (MDL-31365)
* new class 'iconlarge' for 24x24 icons.
* new icons i/export and i/import (sized 16x16). Previously export and import actions used i/backup and i/restore.
* new icon i/assignroles (sized 16x16), to prevent the use of i/roles which is 12x12.
* new icon i/switchrole (sized 16x16), was previously using i/roles. Now is a copy of the new i/assignroles icon.
=== 2.3 ===