diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php index 0a391b03b78..5edaa9805d0 100644 --- a/blocks/activity_modules/block_activity_modules.php +++ b/blocks/activity_modules/block_activity_modules.php @@ -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[] = ''.$icon.$modfullname.''; } else { - $icon = ' '; + $icon = ''; $this->content->items[] = ''.$icon.$modfullname.''; } } diff --git a/blocks/community/block_community.php b/blocks/community/block_community.php index c211342cc18..3702f11b1b9 100644 --- a/blocks/community/block_community.php +++ b/blocks/community/block_community.php @@ -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 . ' ' . 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; diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php index 2e6fa7c7306..540c49afc27 100644 --- a/blocks/course_list/block_course_list.php +++ b/blocks/course_list/block_course_list.php @@ -23,7 +23,7 @@ class block_course_list extends block_list { $this->content->icons = array(); $this->content->footer = ''; - $icon = ' '; + $icon = ''; $adminseesall = true; if (isset($CFG->block_course_list_adminview)) { @@ -109,7 +109,7 @@ class block_course_list extends block_list { return; } - $icon = ' '; + $icon = ''; // shortcut - the rest is only for logged in users! if (!isloggedin() || isguestuser()) { diff --git a/blocks/dock.js b/blocks/dock.js index 34a859d41b6..ca685d53fed 100644 --- a/blocks/dock.js +++ b/blocks/dock.js @@ -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(''); + var closeicon = Y.Node.create(''); 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}}); diff --git a/blocks/navigation/styles.css b/blocks/navigation/styles.css index 6da90532f8b..6d08f5ede47 100644 --- a/blocks/navigation/styles.css +++ b/blocks/navigation/styles.css @@ -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]]);} diff --git a/blocks/participants/block_participants.php b/blocks/participants/block_participants.php index c46a5aa3d66..82889f811c0 100644 --- a/blocks/participants/block_participants.php +++ b/blocks/participants/block_participants.php @@ -37,7 +37,7 @@ class block_participants extends block_list { } } - $icon = ' '; + $icon = ''; $this->content->items[] = ''.$icon.get_string('participants').''; diff --git a/blocks/private_files/renderer.php b/blocks/private_files/renderer.php index e93121986bf..f84d2d7dab6 100644 --- a/blocks/private_files/renderer.php +++ b/blocks/private_files/renderer.php @@ -66,13 +66,13 @@ class block_private_files_renderer extends plugin_renderer_base { $result = ''; diff --git a/blocks/settings/styles.css b/blocks/settings/styles.css index cfa9ab8348c..2c6e4513937 100644 --- a/blocks/settings/styles.css +++ b/blocks/settings/styles.css @@ -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]]);} \ No newline at end of file +.jsenabled.dir-rtl .block_settings .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed_rtl]]);} diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php index 39a550e5f55..d4374bc122f 100644 --- a/blocks/site_main_menu/block_site_main_menu.php +++ b/blocks/site_main_menu/block_site_main_menu.php @@ -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 = ' '; + $icon = ''; $this->content->items[] = 'extra. ' href="' . $url . '">' . $icon . $instancename . ''; } @@ -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 = ' '; + $icon = ''; $this->content->items[] = 'extra . ' href="' . $url . '">' . $icon . $instancename . '' . $editbuttons; } diff --git a/course/lib.php b/course/lib.php index dab4668dda7..c3a4165df14 100644 --- a/course/lib.php +++ b/course/lib.php @@ -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) ); diff --git a/grade/lib.php b/grade/lib.php index 67e9f70d9ed..645d73a7f7e 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -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', '')); } } diff --git a/lib/blocklib.php b/lib/blocklib.php index c28c9193b05..e56693300ae 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -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; diff --git a/lib/enrollib.php b/lib/enrollib.php index a045d77e7d2..835a07a4b14 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -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', '')); } } diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 0f8df494361..0fd249691c8 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -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 diff --git a/pix/i/assignroles.png b/pix/i/assignroles.png new file mode 100644 index 00000000000..77011dbfc20 Binary files /dev/null and b/pix/i/assignroles.png differ diff --git a/pix/i/assignroles.svg b/pix/i/assignroles.svg new file mode 100644 index 00000000000..7521139dbd5 --- /dev/null +++ b/pix/i/assignroles.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/pix/i/export.png b/pix/i/export.png new file mode 100644 index 00000000000..312f10be722 Binary files /dev/null and b/pix/i/export.png differ diff --git a/pix/i/export.svg b/pix/i/export.svg new file mode 100644 index 00000000000..66e03aab4cf --- /dev/null +++ b/pix/i/export.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/pix/i/import.png b/pix/i/import.png new file mode 100644 index 00000000000..f2d450b5c37 Binary files /dev/null and b/pix/i/import.png differ diff --git a/pix/i/import.svg b/pix/i/import.svg new file mode 100644 index 00000000000..9cc13cd1696 --- /dev/null +++ b/pix/i/import.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/pix/i/item.png b/pix/i/item.png index 25ce1890ede..0da3dd02009 100644 Binary files a/pix/i/item.png and b/pix/i/item.png differ diff --git a/pix/i/item.svg b/pix/i/item.svg index 22132cd7d0f..56884a21713 100644 --- a/pix/i/item.svg +++ b/pix/i/item.svg @@ -5,7 +5,7 @@ ]> diff --git a/pix/i/navigationitem.png b/pix/i/navigationitem.png index 0bc08cc81c6..1e831d389a6 100644 Binary files a/pix/i/navigationitem.png and b/pix/i/navigationitem.png differ diff --git a/pix/i/navigationitem.svg b/pix/i/navigationitem.svg index 7fd7231e61b..055d3c3300a 100644 --- a/pix/i/navigationitem.svg +++ b/pix/i/navigationitem.svg @@ -5,7 +5,7 @@ ]> diff --git a/pix/i/switchrole.png b/pix/i/switchrole.png new file mode 100644 index 00000000000..77011dbfc20 Binary files /dev/null and b/pix/i/switchrole.png differ diff --git a/pix/i/switchrole.svg b/pix/i/switchrole.svg new file mode 100644 index 00000000000..7521139dbd5 --- /dev/null +++ b/pix/i/switchrole.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/pix/i/roles.png b/pix/t/assignroles.png similarity index 100% rename from pix/i/roles.png rename to pix/t/assignroles.png diff --git a/pix/i/roles.svg b/pix/t/assignroles.svg similarity index 100% rename from pix/i/roles.svg rename to pix/t/assignroles.svg diff --git a/pix/t/collapsed.png b/pix/t/collapsed.png index 12da3ad0453..75d64e6162c 100644 Binary files a/pix/t/collapsed.png and b/pix/t/collapsed.png differ diff --git a/pix/t/collapsed.svg b/pix/t/collapsed.svg index e07f4268072..5f14390554d 100644 --- a/pix/t/collapsed.svg +++ b/pix/t/collapsed.svg @@ -5,8 +5,8 @@ ]> + 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"> diff --git a/pix/t/collapsed_empty.png b/pix/t/collapsed_empty.png index fb07d0dc11a..24b80e928e2 100644 Binary files a/pix/t/collapsed_empty.png and b/pix/t/collapsed_empty.png differ diff --git a/pix/t/collapsed_empty.svg b/pix/t/collapsed_empty.svg index 8faab587ea8..cccaf78bd08 100644 --- a/pix/t/collapsed_empty.svg +++ b/pix/t/collapsed_empty.svg @@ -5,8 +5,8 @@ ]> + 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"> + 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"> + 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"> diff --git a/pix/t/expanded.png b/pix/t/expanded.png index bd7ed3ea572..e1570ebbfbc 100644 Binary files a/pix/t/expanded.png and b/pix/t/expanded.png differ diff --git a/pix/t/expanded.svg b/pix/t/expanded.svg index 6e96c042ed0..459eeb0d4cc 100644 --- a/pix/t/expanded.svg +++ b/pix/t/expanded.svg @@ -5,8 +5,8 @@ ]> + 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"> diff --git a/theme/base/style/blocks.css b/theme/base/style/blocks.css index c8b24844793..7283d491c1e 100644 --- a/theme/base/style/blocks.css +++ b/theme/base/style/blocks.css @@ -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;} \ No newline at end of file +.dir-rtl .block .header .commands { text-align: left;} +.dir-rtl .block .header .block_action { float: left; margin-left: 4px; margin-left: 0;} diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 2b26b5e93a0..a7b16b40693 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -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;} diff --git a/theme/base/style/dock.css b/theme/base/style/dock.css index 97f866016e5..a5fb7ff6ba2 100644 --- a/theme/base/style/dock.css +++ b/theme/base/style/dock.css @@ -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} \ No newline at end of file +body.dir-rtl.has_dock {margin-left: 0px; margin-right: 30px} diff --git a/theme/standard/style/blocks.css b/theme/standard/style/blocks.css index 8283217c2aa..45fbd70251b 100644 --- a/theme/standard/style/blocks.css +++ b/theme/standard/style/blocks.css @@ -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;} diff --git a/theme/standard/style/dock.css b/theme/standard/style/dock.css index 760483508b7..fd43db31891 100644 --- a/theme/standard/style/dock.css +++ b/theme/standard/style/dock.css @@ -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%;} \ No newline at end of file +.ie6 #dock .bd.oversized_content {width:100%;} diff --git a/theme/upgrade.txt b/theme/upgrade.txt index 9dec36e942d..ce15db20614 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -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 ===