# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: moodle/admin/blocks.php --- moodle/admin/blocks.php Base (1.66) +++ moodle/admin/blocks.php Locally Modified (Based On 1.66) @@ -131,8 +131,7 @@ $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'delete', 'settings')); $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strdelete, $strsettings)); $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php'); - $table->set_attribute('id', 'blocks'); - $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide'); + $table->set_attribute('class', 'compatibleblockstable blockstable generaltable'); $table->setup(); foreach ($blockbyname as $blockname => $blockid) { @@ -188,7 +187,7 @@ $table->print_html(); if(!empty($incompatible)) { - echo $OUTPUT->heading(get_string('incompatibleblocks', 'admin')); + echo $OUTPUT->heading(get_string('incompatibleblocks', 'blockstable', 'admin')); $table = new flexible_table('admin-blocks-incompatible'); @@ -196,8 +195,7 @@ $table->define_headers(array($strname, $strdelete)); $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php'); - $table->set_attribute('id', 'incompatible'); - $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide'); + $table->set_attribute('class', 'incompatibleblockstable generaltable'); $table->setup(); Index: moodle/admin/enrol.php --- moodle/admin/enrol.php Base (1.46) +++ moodle/admin/enrol.php Locally Modified (Based On 1.46) @@ -68,7 +68,7 @@ $table->head = array(get_string('name'), get_string('enable'), get_string('default'), $str->settings); $table->align = array('left', 'center', 'center', 'center'); $table->size = array('60%', '', '', '15%'); - $table->width = '700'; + $table->attributes['class'] = 'generaltable enrolpluggintable'; $table->data = array(); $enabledplugins = explode(',', $CFG->enrol_plugins_enabled); Index: moodle/admin/report/capability/index.php --- moodle/admin/report/capability/index.php Base (1.23) +++ moodle/admin/report/capability/index.php Locally Modified (Based On 1.23) @@ -67,7 +67,7 @@ } // Print the settings form. -echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter centerpara'); +echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter'); echo '
'; echo $OUTPUT->heading(get_string('reportsettings', 'report_capability')); echo '

', get_string('intro', 'report_capability') , '

'; Index: moodle/blocks/admin_tree/styles.css --- moodle/blocks/admin_tree/styles.css No Base Revision +++ moodle/blocks/admin_tree/styles.css Locally New @@ -0,0 +1,5 @@ +.block_admin_tree .admintree {text-align:left;} +.block_admin_tree .admintree .depth1 {padding-left: 16px;} +.block_admin_tree .admintree .depth2 {padding-left: 32px;} +.block_admin_tree .admintree .depth3 {padding-left: 48px;} +.block_admin_tree .admintree .depth4 {padding-left: 64px;} Index: moodle/blocks/blog_tags/styles.css --- moodle/blocks/blog_tags/styles.css No Base Revision +++ moodle/blocks/blog_tags/styles.css Locally New @@ -0,0 +1,20 @@ +.block_blog_tags .s20 {font-size: 1.5em;font-weight: bold;} +.block_blog_tags .s19 {font-size: 1.5em;} +.block_blog_tags .s18 {font-size: 1.4em;font-weight: bold;} +.block_blog_tags .s17 {font-size: 1.4em;} +.block_blog_tags .s16 {font-size: 1.3em;font-weight: bold;} +.block_blog_tags .s15 {font-size: 1.3em;} +.block_blog_tags .s14 {font-size: 1.2em;font-weight: bold;} +.block_blog_tags .s13 {font-size: 1.2em;} +.block_blog_tags .s12, +.block_blog_tags .s11 {font-size: 1.1em;font-weight: bold;} +.block_blog_tags .s10, +.block_blog_tags .s9 {font-size: 1.1em;} +.block_blog_tags .s8, +.block_blog_tags .s7 {font-size: 1em;font-weight: bold;} +.block_blog_tags .s6, +.block_blog_tags .s5 {font-size: 1em;} +.block_blog_tags .s4, +.block_blog_tags .s3 {font-size: 0.9em;font-weight: bold;} +.block_blog_tags .s2, +.block_blog_tags .s1 {font-size: 0.9em;} Index: moodle/blocks/calendar_month/styles.css --- moodle/blocks/calendar_month/styles.css No Base Revision +++ moodle/blocks/calendar_month/styles.css Locally New @@ -0,0 +1,11 @@ +.block_calendar_month .minicalendar {width:100%;margin:10px auto;} +.block_calendar_month .minicalendar th, +.block_calendar_month .minicalendar td {padding:2px;font-size:0.8em;} +.block_calendar_month .minicalendar td.weekend {color:#A00;} + +.block_calendar_month .calendar-controls .previous {text-align: left;display: block;float: left;width: 12%;} +.block_calendar_month .calendar-controls .current {float:left;text-align: center;display: block;width:76%;} +.block_calendar_month .calendar-controls .next {text-align: right;display: block;float: left;width: 12%;} + +.block_calendar_month .filters table {border-collapse:separate;border-spacing: 2px;padding: 2px;width: 100%;} +.block_calendar_month .content h3.eventskey {margin-top:0.5em;margin-bottom:0;margin-left:0.5em;} Index: moodle/blocks/calendar_month/styles.php --- moodle/blocks/calendar_month/styles.php Base (1.2) +++ moodle/blocks/calendar_month/styles.php Locally Deleted @@ -1,23 +0,0 @@ -.block_calendar_month .cal_popup_caption, -.block_calendar_month .cal_popup_fg div { - font-size: 0.85em !important; -} - -.block_calendar_month .filters { - font-size:0.75em; - padding: 5px; -} - -.block_calendar_month .filters table { - border-collapse:separate; - border-spacing: 2px; - padding: 2px; -} - -.block_calendar_month .event_global, -.block_calendar_month .event_course, -.block_calendar_month .event_group, -.block_calendar_month .event_user { - border-width: 2px; - border-style: solid; -} Index: moodle/blocks/calendar_upcoming/styles.css --- moodle/blocks/calendar_upcoming/styles.css No Base Revision +++ moodle/blocks/calendar_upcoming/styles.css Locally New @@ -0,0 +1 @@ +.block_calendar_upcoming .event .date {text-align:right;} Index: moodle/blocks/course_list/styles.css --- moodle/blocks/course_list/styles.css No Base Revision +++ moodle/blocks/course_list/styles.css Locally New @@ -0,0 +1 @@ +.block_course_list .footer {margin-top: 5px;} Index: moodle/blocks/course_summary/styles.css --- moodle/blocks/course_summary/styles.css No Base Revision +++ moodle/blocks/course_summary/styles.css Locally New @@ -0,0 +1,2 @@ +.block_course_summary .content {padding:10px;} +.block_course_summary .editbutton {text-align:right;} Index: moodle/blocks/course_summary/styles.php --- moodle/blocks/course_summary/styles.php Base (1.2) +++ moodle/blocks/course_summary/styles.php Locally Deleted @@ -1,7 +0,0 @@ -.block_course_summary .content { - padding:10px; -} - -.block_course_summary .editbutton { - text-align:right; -} Index: moodle/blocks/dock.js --- moodle/blocks/dock.js Base (1.10) +++ moodle/blocks/dock.js Locally Modified (Based On 1.10) @@ -369,6 +369,12 @@ return; } + var blockclass = (function(classes){ + var r = /(^|\s)(block_[a-zA-Z0-9_]+)(\s|$)/; + var m = r.exec(classes); + return (m)?m[2]:m; + })(node.getAttribute('className').toString()); + this.cachedcontentnode = node; var placeholder = this.Y.Node.create('
'); @@ -391,7 +397,7 @@ blockcommands.append(moveto); // Create a new dock item for the block - var dockitem = new M.core_dock.item(this.Y, this.id, blocktitle, blockcontent, blockcommands); + var dockitem = new M.core_dock.item(this.Y, this.id, blocktitle, blockcontent, blockcommands, blockclass); if (spacewidth !== null && M.core_dock.cfg.display.mindisplaywidth == null) { dockitem.cfg.display.mindisplaywidth = spacewidth; } @@ -566,6 +572,7 @@ this.panel.renderEvent.subscribe(this.resize_panel, this, true); this.panel.setBody(this.Y.Node.getDOMNode(this.contents)); this.panel.render(M.core_dock.node); + this.Y.one(this.panel.body).addClass(this.blockclass); if (this.cfg.display.mindisplaywidth !== null && this.Y.one(this.panel.body).getStyle('minWidth') == '0px') { this.Y.one(this.panel.body).setStyle('minWidth', this.cfg.display.mindisplaywidth); this.Y.one(this.panel.body).setStyle('minHeight', dockitemtitle.get('offsetHeight')+'px'); @@ -744,7 +751,7 @@ * @param {this.Y.Node} contents * @param {this.Y.Node} commands */ -M.core_dock.item = function(Y, uid, title, contents, commands){ +M.core_dock.item = function(Y, uid, title, contents, commands, blockclass){ this.Y = Y; if (uid && this.id==null) { this.id = uid; @@ -758,6 +765,9 @@ if (commands && this.commands==null) { this.commands = commands; } + if (blockclass && this.blockclass==null) { + this.blockclass = blockclass + } this.init_events(); } /** Properties */ @@ -770,6 +780,7 @@ M.core_dock.item.prototype.panel = M.core_dock.abstract_item_class.panel; M.core_dock.item.prototype.preventhide = M.core_dock.abstract_item_class.preventhide; M.core_dock.item.prototype.cfg = M.core_dock.cfg; +M.core_dock.item.prototype.blockclass = null; M.core_dock.item.prototype.delayhiderunning = false; M.core_dock.item.prototype.delayhidetimeout = 1000; // 1 Second /** Methods **/ Index: moodle/blocks/global_navigation_tree/styles.css --- moodle/blocks/global_navigation_tree/styles.css No Base Revision +++ moodle/blocks/global_navigation_tree/styles.css Locally New @@ -0,0 +1,22 @@ +/** JavaScript state rules **/ +.jsenabled .block_global_navigation_tree.dock_on_load, +.block_global_navigation_tree .block_tree_box .requiresjs {display:none;} +.jsenabled .block_global_navigation_tree .block_tree_box .requiresjs {display:inline;} + +/** General display rules **/ +.block_global_navigation_tree .block_tree {margin:5px;padding-left:0px;overflow-x:auto;overflow-y:visible;} +.block_global_navigation_tree .block_tree li {margin:0;list-style: none;} +.block_global_navigation_tree .block_tree li ul {padding-left:16px;margin:0;} +.block_global_navigation_tree .block_tree .tree_item {white-space:nowrap;margin:2px 0px;padding-left: 16px;margin:3px 0px;white-space:nowrap;text-align:left;} +.block_global_navigation_tree .block_tree .tree_item.branch {background-image: url([[pix:t/expanded]]);background-position: center left;background-repeat: no-repeat;} +.block_global_navigation_tree .block_tree .root_node.leaf {padding-left:0px;} +.block_global_navigation_tree .block_tree .current_branch {font-weight:bold;} +.jsenabled .block_global_navigation_tree .block_tree .tree_item.branch {cursor:pointer;} +.jsenabled .block_global_navigation_tree .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty]]);background-position: center left;background-repeat: no-repeat;} +.jsenabled .block_global_navigation_tree .block_tree .collapsed ul {display: none;} +.jsenabled .block_global_navigation_tree .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed]]);} + +/** Internet explorer specific rules **/ +.ie6 .block_global_navigation_tree .block_tree, +.ie7 .block_global_navigation_tree .block_tree {overflow-x:scroll;} +.ie6 .block_global_navigation_tree .block_tree .tree_item {width:100%;} Index: moodle/blocks/messages/styles.css --- moodle/blocks/messages/styles.css No Base Revision +++ moodle/blocks/messages/styles.css Locally New @@ -0,0 +1,4 @@ +.block_messages .content {text-align:left;font-size:0.75em;padding-top:5px;} +.block_messages .content .list li.listentry {clear:both;} +.block_messages .content .list li.listentry div.user {float:left;} +.block_messages .content .list li.listentry div.message {float:right;} Index: moodle/blocks/online_users/styles.css --- moodle/blocks/online_users/styles.css No Base Revision +++ moodle/blocks/online_users/styles.css Locally New @@ -0,0 +1,3 @@ +.block_online_users .content .list li.listentry {clear:both;} +.block_online_users .content .list li.listentry div.user {float:left;} +.block_online_users .content .list li.listentry div.message {float:right;} Index: moodle/blocks/quiz_results/styles.css --- moodle/blocks/quiz_results/styles.css No Base Revision +++ moodle/blocks/quiz_results/styles.css Locally New @@ -0,0 +1,6 @@ +.block_quiz_results {text-align: center;} +.block_quiz_results h1 {margin: 4px;font-size: 1.1em;} +.block_quiz_results table.grades {text-align: left;width: 100%;} +.block_quiz_results table.grades .number, +.block_quiz_results table.grades .grade {text-align: right;width: 10%;} +.block_quiz_results table.grades caption {margin: 1em 0px 0px 0px;border-bottom-width: 1px;border-bottom-style: solid;font-weight: bold;} Index: moodle/blocks/recent_activity/styles.css --- moodle/blocks/recent_activity/styles.css No Base Revision +++ moodle/blocks/recent_activity/styles.css Locally New @@ -0,0 +1,2 @@ +.block_recent_activity .activitydate, +.block_recent_activity .activityhead {text-align:center;} Index: moodle/blocks/rss_client/styles.php --- moodle/blocks/rss_client/styles.php Base (1.10) +++ moodle/blocks/rss_client/styles.php Locally Deleted @@ -1,54 +0,0 @@ -.block_rss_client .link { - border-top:1px solid; - border-top-color:#DDDDDD; - padding-bottom:5px; - font-size:0.82em; -} - -.block_rss_client .description { - color:#555555; - font-size:0.78em; - padding-left:10px; - padding-bottom:8px; -} - -.block_rss_client .title { - font-size:1.0em; -} - -.block_rss_client .image { -} - -.blockconfigtable #rssfeeds { - margin-left: auto; - margin-right: auto; - background-color: blue; -} - -.blockconfigtable #rssfeeds td.actions { - text-align: center; - vertical-align: middle; - padding: 10px; -} - -.blockconfigtable #rssfeeds td.feed { - vertical-align: middle; - padding: 5px; -} - -.blockconfigtable #rssfeeds .title { - font-weight: bold; - margin-bottom: 2px; -} - -.blockconfigtable #rssfeeds .url, .blockconfigtable #rssfeeds .description { - font-size: 0.8em; -} - -.blockconfigtable #rssfeeds tr.r0 { - background-color: #ffffff; -} - -.blockconfigtable #rssfeeds tr.r1 { - background-color: #f0f0f0; -} Index: moodle/blocks/search_forums/styles.css --- moodle/blocks/search_forums/styles.css No Base Revision +++ moodle/blocks/search_forums/styles.css Locally New @@ -0,0 +1,4 @@ +.block_search_forums .searchform {text-align: center;} +.block_search_forums .searchform img {vertical-align: middle;} +.block_search_forums .searchform img.resize {width: 1em;height: 1.1em;} +.block_search_forums .invisiblefieldset {display: block;} Index: moodle/blocks/settings_navigation_tree/styles.css --- moodle/blocks/settings_navigation_tree/styles.css No Base Revision +++ moodle/blocks/settings_navigation_tree/styles.css Locally New @@ -0,0 +1,22 @@ +/** JavaScript state rules **/ +.jsenabled .block_settings_navigation_tree.dock_on_load, +.block_settings_navigation_tree .block_tree_box .requiresjs {display:none;} +.jsenabled .block_settings_navigation_tree .block_tree_box .requiresjs {display:inline;} + +/** General display rules **/ +.block_settings_navigation_tree .block_tree {margin:5px;padding-left:0px;overflow-x:auto;overflow-y:visible;} +.block_settings_navigation_tree .block_tree li {margin:0;list-style: none;} +.block_settings_navigation_tree .block_tree li ul {padding-left:16px;margin:0;} +.block_settings_navigation_tree .block_tree .tree_item {white-space:nowrap;margin:2px 0px;padding-left: 16px;margin:3px 0px;white-space:nowrap;text-align:left;} +.block_settings_navigation_tree .block_tree .tree_item.branch {background-image: url([[pix:t/expanded]]);background-position: center left;background-repeat: no-repeat;} +.block_settings_navigation_tree .block_tree .root_node.leaf {padding-left:0px;} +.block_settings_navigation_tree .block_tree .current_branch {font-weight:bold;} +.jsenabled .block_settings_navigation_tree .block_tree .tree_item.branch {cursor:pointer;} +.jsenabled .block_settings_navigation_tree .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty]]);background-position: center left;background-repeat: no-repeat;} +.jsenabled .block_settings_navigation_tree .block_tree .collapsed ul {display: none;} +.jsenabled .block_settings_navigation_tree .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed]]);} + +/** Internet explorer specific rules **/ +.ie6 .block_settings_navigation_tree .block_tree, +.ie7 .block_settings_navigation_tree .block_tree {overflow-x:scroll;} +.ie6 .block_settings_navigation_tree .block_tree .tree_item {width:100%;} Index: moodle/blocks/tag_flickr/styles.css --- moodle/blocks/tag_flickr/styles.css No Base Revision +++ moodle/blocks/tag_flickr/styles.css Locally New @@ -0,0 +1 @@ +.block_tag_flickr .flickr-photos {padding:3px;} Index: moodle/blocks/tag_youtube/styles.css --- moodle/blocks/tag_youtube/styles.css No Base Revision +++ moodle/blocks/tag_youtube/styles.css Locally New @@ -0,0 +1,2 @@ +.block_tag_youtube .youtube-thumb {padding: 3px;padding-bottom: 0.5em;display: block;float: left;} +.block_tag_youtube .yt-video-entry li {clear: left;} Index: moodle/blocks/tags/styles.css --- moodle/blocks/tags/styles.css No Base Revision +++ moodle/blocks/tags/styles.css Locally New @@ -0,0 +1,11 @@ +.block_tags {} +.block_tags #coursetag {} +.block_tags #coursetag .coursetag_form_wrapper {} +.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner {position: relative;} +.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input1 {position: relative;top: 0;left: 0;z-index: 1;width:100%;} +.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input2 {position: absolute;top: 0;left: 0;z-index: 2;width:100%;} +.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input3 {position: absolute;top: 3px;left: 12.8em;display: none;} +.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input1a {background-color: white; border: 1px solid #999;width: 12em;padding: 2px;} +.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input2a {background-color: transparent; border: 1px solid #999;width: 12em;color: #669954;padding: 2px;} +.block_tags .coursetag_morelink {} +.block_tags .coursetag_list {} Index: moodle/blocks/tags/styles.php --- moodle/blocks/tags/styles.php Base (1.2) +++ moodle/blocks/tags/styles.php Locally Deleted @@ -1,116 +0,0 @@ -/* - * CSS for course tags - * @author j.beedell@open.ac.uk July07 - * - * Styles for block_tags.php - */ - -.coursetag_form_wrapper { - margin: auto; - width: 13em; -} - -.coursetag_form_positioner { - position: relative; - margin: 5px 0 0 0; - height: 25px; -} - -.coursetag_form_input1 { - position: absolute; - top: 0; - left: 0; - z-index: 1; -} - -.coursetag_form_input2 { - position: absolute; - top: 0; - left: 0; - z-index: 2; -} - -.coursetag_form_input3 { - position: absolute; - top: 3px; - left: 12.8em; - display: none; -} - -.coursetag_form_input1a { - background-color: white; - border: 1px solid #999; - width: 12em; - padding: 2px; -} - -.coursetag_form_input2a { - background: transparent; - color: #669954; - border: 1px solid #999; - width: 12em; - padding: 2px; -} - -.coursetag_morelink { - float: right; - font-size: 0.8em; - margin: -5px 5px 5px 0; -} - -.coursetag_list { - padding-top: 4px; -} - -/* Styles for coursetag_edit.php */ - -.coursetag_edit_centered { - position: relative; - width: 600px; - margin: 20px auto; -} - -.coursetag_edit_row { - margin: 5px 0 5px 0; - height: 30px; -} - -.coursetag_edit_left { - position: relative; - float: left; - padding: 3px 5px; -} - -.coursetag_edit_right { - position: relative; - float: left; - padding: 3px 0px; -} - -.coursetag_edit_input3 { - position: relative; - left: 10.5em; - display: none; -} - -/* Styles for coursetag_more.php */ - -.coursetag_more_title { - margin: 30px 30px -25px 30px; -} - -.coursetag_more_tags { - margin: 30px; -} - -.coursetag_more_large { - font-size: 120% -} - -.coursetag_more_small { - font-size: 80% -} - -.coursetag_more_link { - font-size: 80%; -} Index: moodle/calendar/event.php --- moodle/calendar/event.php Base (1.106) +++ moodle/calendar/event.php Locally Modified (Based On 1.106) @@ -208,7 +208,7 @@ echo $OUTPUT->header(); -echo ''; +echo '
'; echo '
'; echo $OUTPUT->heading($title); $mform->display(); Index: moodle/calendar/export.php --- moodle/calendar/export.php Base (1.22) +++ moodle/calendar/export.php Locally Modified (Based On 1.22) @@ -139,7 +139,7 @@ echo $OUTPUT->header(); // Layout the whole page as three big columns. -echo ''; +echo '
'; echo ''; // START: Main column Index: moodle/calendar/lib.php --- moodle/calendar/lib.php Base (1.256) +++ moodle/calendar/lib.php Locally Modified (Based On 1.256) @@ -194,7 +194,7 @@ $summary = get_string('calendarheading', 'calendar', userdate(make_timestamp($y, $m), get_string('strftimemonthyear'))); $summary = get_string('tabledata', 'access', $summary); - $content .= '
'; // Begin table + $content .= '
'; // Begin table $content .= ''; // Header row: day names // Print out the names of the weekdays @@ -229,14 +229,14 @@ if(CALENDAR_WEEKEND & (1 << ($dayweek % 7))) { // Weekend. This is true no matter what the exact range is. $class = 'weekend day'; - } - else { + } else { // Normal working day. $class = 'day'; } // Special visual fx if an event is defined if(isset($eventsbyday[$day])) { + $class .= ' hasevent'; $dayhref = calendar_get_link_href(CALENDAR_URL.'view.php?view=day'.$morehref.'&', $day, $m, $y); // OverLib popup @@ -275,35 +275,32 @@ // Class and cell content if(isset($typesbyday[$day]['startglobal'])) { - $class .= ' event_global'; + $class .= ' calendar_event_global'; + } else if(isset($typesbyday[$day]['startcourse'])) { + $class .= ' calendar_event_course'; + } else if(isset($typesbyday[$day]['startgroup'])) { + $class .= ' calendar_event_group'; + } else if(isset($typesbyday[$day]['startuser'])) { + $class .= ' calendar_event_user'; } - else if(isset($typesbyday[$day]['startcourse'])) { - $class .= ' event_course'; - } - else if(isset($typesbyday[$day]['startgroup'])) { - $class .= ' event_group'; - } - else if(isset($typesbyday[$day]['startuser'])) { - $class .= ' event_user'; - } $cell = ''.$day.''; - } - else { + } else { $cell = $day; } - if(isset($typesbyday[$day]['durationglobal'])) { - $class .= ' duration_global'; + $durationclass = false; + if (isset($typesbyday[$day]['durationglobal'])) { + $durationclass = ' duration_global'; + } else if(isset($typesbyday[$day]['durationcourse'])) { + $durationclass = ' duration_course'; + } else if(isset($typesbyday[$day]['durationgroup'])) { + $durationclass = ' duration_group'; + } else if(isset($typesbyday[$day]['durationuser'])) { + $durationclass = ' duration_user'; } - else if(isset($typesbyday[$day]['durationcourse'])) { - $class .= ' duration_course'; + if ($durationclass) { + $class .= ' duration '.$durationclass; } - else if(isset($typesbyday[$day]['durationgroup'])) { - $class .= ' duration_group'; - } - else if(isset($typesbyday[$day]['durationuser'])) { - $class .= ' duration_user'; - } // If event has a class set then add it to the table day '; if($SESSION->cal_show_global) { - $content .= ''; + $content .= ''; $content .= ''."\n"; } else { $content .= ''; $content .= ''."\n"; } if($SESSION->cal_show_course) { - $content .= ''; + $content .= ''; $content .= ''."\n"; } else { $content .= ''; @@ -867,7 +864,7 @@ if($groupevents) { // This course MIGHT have group events defined, so show the filter if($SESSION->cal_show_groups) { - $content .= ''; + $content .= ''; $content .= ''."\n"; } else { $content .= ''; @@ -878,7 +875,7 @@ $content .= ''."\n"; } if($SESSION->cal_show_user) { - $content .= ''; + $content .= ''; $content .= ''."\n"; } else { $content .= ''; @@ -1092,22 +1089,22 @@ if($event->courseid == SITEID && $event->groupid == 0) { $typesbyday[$eventdaystart]['startglobal'] = true; // Set event class for global event - $events[$event->id]->class = 'event_global'; + $events[$event->id]->class = 'calendar_event_global'; } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { $typesbyday[$eventdaystart]['startcourse'] = true; // Set event class for course event - $events[$event->id]->class = 'event_course'; + $events[$event->id]->class = 'calendar_event_course'; } else if($event->groupid) { $typesbyday[$eventdaystart]['startgroup'] = true; // Set event class for group event - $events[$event->id]->class = 'event_group'; + $events[$event->id]->class = 'calendar_event_group'; } else if($event->userid) { $typesbyday[$eventdaystart]['startuser'] = true; // Set event class for user event - $events[$event->id]->class = 'event_user'; + $events[$event->id]->class = 'calendar_event_user'; } } Index: moodle/calendar/view.php --- moodle/calendar/view.php Base (1.132) +++ moodle/calendar/view.php Locally Modified (Based On 1.132) @@ -157,7 +157,7 @@ echo $OUTPUT->header(); // Layout the whole page as three big columns. -echo '
tag // Note: only one colour for minicalendar @@ -515,18 +512,18 @@ } else if($event->courseid == SITEID) { // Site event $event->icon = ''.get_string('globalevent', 'calendar').''; - $event->cssclass = 'event_global'; + $event->cssclass = 'calendar_event_global'; } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event calendar_get_course_cached($coursecache, $event->courseid); $event->icon = ''.get_string('courseevent', 'calendar').''; $event->courselink = ''.$coursecache[$event->courseid]->fullname.''; - $event->cssclass = 'event_course'; + $event->cssclass = 'calendar_event_course'; } else if ($event->groupid) { // Group event $event->icon = ''.get_string('groupevent', 'calendar').''; - $event->cssclass = 'event_group'; + $event->cssclass = 'calendar_event_group'; } else if($event->userid) { // User event $event->icon = ''.get_string('userevent', 'calendar').''; - $event->cssclass = 'event_user'; + $event->cssclass = 'calendar_event_user'; } return $event; } @@ -845,14 +842,14 @@ $content .= '
'.get_string('hide').''.get_string('hide').''.get_string('global', 'calendar').''.get_string('show').''.get_string('global', 'calendar').''.get_string('hide').''.get_string('hide').''.get_string('course', 'calendar').''.get_string('hide').''.get_string('hide').''.get_string('hide').''.get_string('group', 'calendar').''.get_string('show').' '.get_string('hide').''.get_string('hide').''.get_string('user', 'calendar').''.get_string('show').'
'; +echo '
'; echo ''; // START: Main column @@ -423,7 +423,7 @@ echo ''; // Start calendar display - echo '
'; // Begin table. First row: day names + echo '
'; // Begin table. First row: day names // Print out the names of the weekdays for($i = $display->minwday; $i <= $display->maxwday; ++$i) { @@ -480,18 +480,19 @@ } // Special visual fx if an event spans many days - if(isset($typesbyday[$day]['durationglobal'])) { - $class .= ' duration_global'; + $durationclass = false; + if (isset($typesbyday[$day]['durationglobal'])) { + $durationclass = ' duration_global'; + } else if(isset($typesbyday[$day]['durationcourse'])) { + $durationclass = ' duration_course'; + } else if(isset($typesbyday[$day]['durationgroup'])) { + $durationclass = ' duration_group'; + } else if(isset($typesbyday[$day]['durationuser'])) { + $durationclass = ' duration_user'; } - else if(isset($typesbyday[$day]['durationcourse'])) { - $class .= ' duration_course'; + if ($durationclass) { + $class .= ' duration '.$durationclass; } - else if(isset($typesbyday[$day]['durationgroup'])) { - $class .= ' duration_group'; - } - else if(isset($typesbyday[$day]['durationuser'])) { - $class .= ' duration_user'; - } // Special visual fx for today if($display->thismonth && $day == $d) { @@ -543,7 +544,7 @@ // Global events if($SESSION->cal_show_global) { - echo ''."\n"; } else { echo ''."\n"; } else { echo ''; // Group events if($SESSION->cal_show_groups) { - echo ''."\n"; } else { echo ''."\n"; } else { echo '
'.get_string('globalevents', 'calendar').': '; + echo ''.get_string('globalevents', 'calendar').': '; echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('globalevents', 'calendar').': '; @@ -552,7 +553,7 @@ // Course events if(!empty($SESSION->cal_show_course)) { - echo ''.get_string('courseevents', 'calendar').': '; + echo ''.get_string('courseevents', 'calendar').': '; echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('courseevents', 'calendar').': '; @@ -565,7 +566,7 @@ echo '
'.get_string('groupevents', 'calendar').': '; + echo ''.get_string('groupevents', 'calendar').': '; echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('groupevents', 'calendar').': '; @@ -573,7 +574,7 @@ } // User events if($SESSION->cal_show_user) { - echo ''.get_string('userevents', 'calendar').': '; + echo ''.get_string('userevents', 'calendar').': '; echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('userevents', 'calendar').': '; Index: moodle/course/format/topics/styles.css --- moodle/course/format/topics/styles.css No Base Revision +++ moodle/course/format/topics/styles.css Locally New @@ -0,0 +1,6 @@ +.course-content ul.topics {margin:0;} +.course-content ul.topics li.section {list-style: none;margin:5px 0 0 0;padding:0;} +.course-content ul.topics li.section .content {margin:0 40px;} +.course-content ul.topics li.section .left {width:40px;float:left;text-align:center;} +.course-content ul.topics li.section .right {width:40px;float:right;text-align:center;} +.jumpmenu {text-align:center;} Index: moodle/course/format/weeks/styles.css --- moodle/course/format/weeks/styles.css No Base Revision +++ moodle/course/format/weeks/styles.css Locally New @@ -0,0 +1,6 @@ +.course-content ul.weeks {margin:0;} +.course-content ul.weeks li.section {list-style: none;margin:5px 0 0 0;padding:0;} +.course-content ul.weeks li.section .content {margin:0 40px;} +.course-content ul.weeks li.section .left {width:40px;float:left;text-align:center;} +.course-content ul.weeks li.section .right {width:40px;float:right;text-align:center;} +.jumpmenu {text-align:center;} Index: moodle/course/lib.php --- moodle/course/lib.php Base (1.722) +++ moodle/course/lib.php Locally Modified (Based On 1.722) @@ -346,7 +346,7 @@ echo $OUTPUT->paging_bar($totalcount, $page, $perpage, "$url&perpage=$perpage"); $table = new html_table(); - $table->classes = array('logtable','generalbox','boxaligncenter'); + $table->classes = array('logtable','generalbox'); $table->align = array('right', 'left', 'left'); $table->head = array( get_string('time'), @@ -2164,9 +2164,9 @@ echo '
'; echo '
'; - echo '
'. - highlight($highlightterms, format_string($course->fullname)).'
'; + highlight($highlightterms, format_string($course->fullname)).''; /// first find all roles that are supposed to be displayed Index: moodle/grade/edit/outcome/import.php --- moodle/grade/edit/outcome/import.php Base (1.14) +++ moodle/grade/edit/outcome/import.php Locally Modified (Based On 1.14) @@ -133,7 +133,7 @@ } } if ($error) { - echo $OUTPUT->box_start('generalbox importoutcomenofile'); + echo $OUTPUT->box_start('generalbox importoutcomenofile buttons'); echo get_string('importoutcomenofile', 'grades', $line); echo $OUTPUT->single_button(new moodle_url('/grade/edit/outcome/index.php', array('id'=> $courseid)), get_string('back'), 'get'); echo $OUTPUT->box_end(); Index: moodle/grade/edit/tree/index.php --- moodle/grade/edit/tree/index.php Base (1.62) +++ moodle/grade/edit/tree/index.php Locally Modified (Based On 1.62) @@ -336,7 +336,7 @@ echo $OUTPUT->box_end(); // Print action buttons -echo $OUTPUT->container_start('buttons'); +echo $OUTPUT->container_start('buttons mdl-align'); if ($moving) { echo $OUTPUT->single_button(new moodle_url('index.php', array('id'=>$course->id)), get_string('cancel'), 'get'); Index: moodle/grade/report/user/styles.css --- moodle/grade/report/user/styles.css No Base Revision +++ moodle/grade/report/user/styles.css Locally New @@ -0,0 +1,36 @@ +.page-grade-report-user table.user-grade .datesubmitted {font-size: 0.7em;} +.page-grade-report-user table.user-grade .courseitem, +.page-grade-report-user table.user-grade .categoryitem {font-weight: bold;} +.page-grade-report-user table.user-grade td.cell {padding-left: 5px;padding-right: 5px;} +#graded_users_selector {float: right;text-align: right;} + +/* this must be last if we want to override other category and course item colors */ +.page-grade-report-user table.user-grade .hidden, +.page-grade-report-user table.user-grade .hidden a {color:#aaaaaa;} +table.user-grade {border: 1px solid black;margin: auto;padding: 0.25em;font-size: 0.8em;} +table.user-grade td {margin: 1px;padding: 0.25em;} +table.user-grade thead {border-bottom: 3px double black;} +table.user-grade thead th {padding: 0.25em 0.75em;} +table.user-grade td.oddd1 {background-color: #f3dfd0;} +table.user-grade td.oddd2 {background-color: #d0dbf3;} +table.user-grade td.oddd3 {background-color: #d0f3d6;} +table.user-grade td.oddd4 {background-color: #f0f0aa;} +table.user-grade td.evend2 {background-color: #b0bbd3;} +table.user-grade td.evend3 {background-color: #b0dfb6;} +table.user-grade td.evend4 {background-color: #cac8be;} +table.user-grade td.b1t, +table.user-grade td.b2t {border-top: 2px solid black;} +table.user-grade td.b1r, +table.user-grade td.b2r {border-right: 2px solid black;} +table.user-grade td.b1b, +table.user-grade td.b2b {border-bottom: 2px solid black;} +table.user-grade td.b1l, +table.user-grade td.b2l {border-left: 2px solid black;} +table.user-grade td.baggt, +table.user-grade td.baggb {font-style: italic;font-weight: bold;} +table.user-grade td.baggt {border-top: 3px double black;} +table.user-grade td.baggb {border-bottom: 3px double black;} +table.user-grade td.item {border-left: 1px solid gray;border-right: 1px solid gray;} +table.user-grade td.excluded {background-color: #666;} +table.user-grade td.hidden {color: #aaa;} +table.user-grade td {min-width: 0.5em;vertical-align: top;} Index: moodle/grade/report/user/styles.php --- moodle/grade/report/user/styles.php Base (1.6) +++ moodle/grade/report/user/styles.php Locally Deleted @@ -1,121 +0,0 @@ -.grade-report-user table.user-grade .datesubmitted { - font-size: 0.7em; -} - -.grade-report-user table.user-grade .courseitem, -.grade-report-user table.user-grade .categoryitem { - font-weight: bold; -} - -.grade-report-user table.user-grade td.cell { - padding-left: 5px; - padding-right: 5px; -} - -#graded_users_selector { - float: right; - text-align: right; -} - -/* this must be last if we want to override other category and course item colors */ -.grade-report-user table.user-grade .hidden, -.grade-report-user table.user-grade .hidden a { - color:#aaaaaa; -} - -table.user-grade { - border: 1px solid black; - margin: auto; - padding: 0.25em; - font-size: 0.8em; -} -table.user-grade td { - margin: 1px; - padding: 0.25em; -} -table.user-grade thead { - border-bottom: 3px double black; -} -table.user-grade thead th { - padding: 0.25em 0.75em 0.25em 0.75em; -} - -table.user-grade td.oddd1 { - background-color: #f3dfd0; -} -table.user-grade td.oddd2 { - background-color: #d0dbf3; -} -table.user-grade td.oddd3 { - background-color: #d0f3d6; -} -table.user-grade td.oddd4 { - background-color: #f0f0aa; -} - -table.user-grade td.evend2 { - background-color: #b0bbd3; -} -table.user-grade td.evend3 { - background-color: #b0dfb6; -} -table.user-grade td.evend4 { - background-color: #cac8be; -} - -table.user-grade td.b1t { - border-top: 1px solid black; -} -table.user-grade td.b1r { - border-right: 1px solid black; -} -table.user-grade td.b1b { - border-bottom: 1px solid black; -} -table.user-grade td.b1l { - border-left: 1px solid black; -} - -table.user-grade td.b2t { - border-top: 2px solid black; -} -table.user-grade td.b2r { - border-right: 2px solid black; -} -table.user-grade td.b2b { - border-bottom: 2px solid black; -} -table.user-grade td.b2l { - border-left: 2px solid black; -} - -table.user-grade td.baggt, -table.user-grade td.baggb { - font-style: italic; - font-weight: bold; -} -table.user-grade td.baggt { - border-top: 3px double black; -} -table.user-grade td.baggb { - border-bottom: 3px double black; -} - -table.user-grade td.item { - border-left: 1px solid gray; - border-right: 1px solid gray; -} -table.user-grade td.excluded { - /*text-decoration: line-through;*/ - background-color: #666; -} -table.user-grade td.hidden { - color: #aaa; -} - -table.user-grade td { - min-width: 0.5em; - vertical-align: top; -} - - Index: moodle/lib/adminlib.php --- moodle/lib/adminlib.php Base (1.438) +++ moodle/lib/adminlib.php Locally Modified (Based On 1.438) @@ -4769,8 +4769,8 @@ $table = new html_table(); $table->head = array($txt->name, $txt->enable, $txt->updown, $txt->settings); $table->align = array('left', 'center', 'center', 'center'); - $table->width = '90%'; $table->data = array(); + $table->attributes['class'] = 'manageauthtable generaltable'; //add always enabled plugins first $displayname = "".$displayauths['manual'].""; Index: moodle/lib/outputlib.php --- moodle/lib/outputlib.php Base (1.135) +++ moodle/lib/outputlib.php Locally Modified (Based On 1.135) @@ -96,9 +96,8 @@ class theme_config { /** * @var string default theme, used when requested theme not found - * TODO: MDL-21149 replace with some new default theme when implemented */ - const DEFAULT_THEME = 'standardold'; + const DEFAULT_THEME = 'standard'; /** * You can base your theme on other themes by linking to the other theme as Index: moodle/lib/pagelib.php --- moodle/lib/pagelib.php Base (1.173) +++ moodle/lib/pagelib.php Locally Modified (Based On 1.173) @@ -149,6 +149,7 @@ protected $_docspath = null; + /** @var string|null A legacy class that will be added to the body tag */ protected $_legacyclass = null; protected $_url = null; @@ -318,7 +319,7 @@ /** * Please do not call this method directly, use the ->pagetype syntax. {@link __get()}. - * @return string e.g. 'my-index' or 'mod-quiz-attempt'. Same as the id attribute on . + * @return string e.g. 'my-index' or 'mod-quiz-attempt'. */ protected function magic_get_pagetype() { if (is_null($this->_pagetype) || isset($CFG->pagepath)) { @@ -328,6 +329,14 @@ } /** + * Please do not call this method directly, use the ->pagetype syntax. {@link __get()}. + * @return string The id to use on the body tag, uses {@link magic_get_pagetype()}. + */ + protected function magic_get_bodyid() { + return 'page-'.$this->pagetype; + } + + /** * Please do not call this method directly, use the ->pagelayout syntax. {@link __get()}. * @return string the general type of page this is. For example 'standard', 'popup', 'home'. * Allows the theme to display things differently, if it wishes to. @@ -1211,11 +1220,14 @@ $this->_legacyclass = 'course'; } else if (substr($pagetype, 0, 6) == 'admin-') { $this->_legacyclass = 'admin'; - } else { - $this->_legacyclass = substr($pagetype, 0, strrpos($pagetype, '-')); } $this->add_body_class($this->_legacyclass); + $pathbits = explode('-', trim($pagetype)); + for ($i=1;$i<=count($pathbits);$i++) { + $this->add_body_class('page-'.join('-',array_slice($pathbits, 0, $i))); + } + $this->add_body_classes(get_browser_version_classes()); $this->add_body_class('dir-' . get_string('thisdirection')); $this->add_body_class('lang-' . current_language()); Index: moodle/mod/assignment/styles.css --- moodle/mod/assignment/styles.css No Base Revision +++ moodle/mod/assignment/styles.css Locally New @@ -0,0 +1,30 @@ +/** General Styles **/ +.page-mod-assignment .userpicture, +.page-mod-assignment .picture.user, +.page-mod-assignment .picture.teacher {width:35px;height: 35px;vertical-align:top;} +.page-mod-assignment .feedback .files, +.page-mod-assignment .feedback .grade, +.page-mod-assignment .feedback .outcome, +.page-mod-assignment .feedback .finalgrade {float: right;} +.page-mod-assignment .feedback .disabledfeedback {width: 500px;height: 250px;} +.page-mod-assignment .feedback .from {float: left;} +.page-mod-assignment .files img {margin-right: 4px;} +.page-mod-assignment .files a {white-space:nowrap;} + +/** Styles for submissions.php **/ +#page-mod-assignment-submissions form#options div {text-align:right;margin-left:auto;margin-right:20px;} +#page-mod-assignment-submissions .header .commands {display: inline;} +#page-mod-assignment-submissions .picture {width: 35px;} +#page-mod-assignment-submissions .fullname, +#page-mod-assignment-submissions .timemodified, +#page-mod-assignment-submissions .timemarked {text-align: left;} +#page-mod-assignment-submissions .submissions .grade, +#page-mod-assignment-submissions .submissions .outcome, +#page-mod-assignment-submissions .submissions .finalgrade {text-align: right;} +#page-mod-assignment-submissions .qgprefs #optiontable {text-align:right;margin-left:auto;} + +/** Styles for view.php **/ +#page-mod-assignment-view .feedback {margin:10px auto;} +#page-mod-assignment-view .feedback .grade {text-align: right;} +#page-mod-assignment-view #online .singlebutton {text-align: center;} +#page-mod-assignment-view #dates .c0 {text-align:right;font-weight:bold;} Index: moodle/mod/chat/styles.css --- moodle/mod/chat/styles.css No Base Revision +++ moodle/mod/chat/styles.css Locally New @@ -0,0 +1,32 @@ +/** General Styles **/ +.page-mod-chat .chat-event .picture, +.page-mod-chat .chat-message .picture {width:40px;vertical-align:top;} +.page-mod-chat .chat-event .text, +.page-mod-chat .chat-message .text {text-align: left;} +.page-mod-chat #messages-list, +.page-mod-chat #users-list {list-style-type:none;padding:0;margin:0} +.page-mod-chat #chat-header {overflow: hidden;} + +/** styles for view.php **/ +#page-mod-chat-view #chatcurrentusers .chatuserdetails {vertical-align: middle;} + +/** Styles for basic chat **/ +#page-mod-chat-gui_basic #participants ul {margin:0;padding:0;list-style-type:none;} +#page-mod-chat-gui_basic #participants ul li {display:inline;margin-right:10px;} +#page-mod-chat-gui_basic #participants ul li .userinfo {display:inline;} +#page-mod-chat-gui_basic #messages dl {padding:0;margin:1px;} +#page-mod-chat-gui_basic #messages dd, +#page-mod-chat-gui_basic #messages dt {margin-left:0;margin-right:5px;padding:0;display:inline;} + +/** Styles for header **/ +#page-mod-chat-gui_header_js-jsupdate .chat-event, +#page-mod-chat-gui_header_js-jsupdate .chat-message {width:100%;} + +/** YUI Overrides **/ +.page-mod-chat .yui-layout-unit-top {background: #FFE39D;} +.page-mod-chat .yui-layout-unit-right {border-top: 5px solid white;background: #FFD46B;} +.page-mod-chat .yui-layout-unit-bottom {border-top: 5px solid white;background: #FFCB44;} +.page-mod-chat .yui-layout .yui-layout-hd {border:0;} +.page-mod-chat .yui-layout .yui-layout-unit div.yui-layout-bd {border:0;background: transparent;} +.page-mod-chat .yui-layout .yui-layout-unit div.yui-layout-unit-right {background: white;} +.page-mod-chat .yui-layout-doc .yui-layout-unit .yui-layout-wrap .yui-layout-hd h2 {font-size:100%;padding:0px;font-weight:normal;} Index: moodle/mod/choice/styles.css --- moodle/mod/choice/styles.css No Base Revision +++ moodle/mod/choice/styles.css Locally New @@ -0,0 +1,10 @@ +.page-mod-choice .results {border-collapse: separate;} +.page-mod-choice .results .data {vertical-align:top;white-space: nowrap;} +.page-mod-choice .button {text-align:center;} +.page-mod-choice .attemptcell {width:5px;white-space: nowrap;} +.page-mod-choice .anonymous, +.page-mod-choice .names {margin-left:auto;margin-right:auto;} +.page-mod-choice .downloadreport {border-width:0;margin-left:auto;margin-right:auto;} +.page-mod-choice .choiceresponse {width:100%;} +.page-mod-choice .choiceresponse .picture {width:10px;white-space: nowrap;} +.page-mod-choice .choiceresponse .fullname {width:100%;white-space: nowrap;} Index: moodle/mod/data/styles.css --- moodle/mod/data/styles.css No Base Revision +++ moodle/mod/data/styles.css Locally New @@ -0,0 +1,22 @@ +.page-mod-data .fieldadd, +.page-mod-data .sortdefault, +.page-mod-data .defaulttemplate, +#page-mod-data-view .datapreferences, +#page-mod-data-preset .presetmapping{text-align:center;} + +.page-mod-data-field .c0, +#page-mod-data-view #sortsearch .c0 {text-align: right;} +#page-mod-data-view .approve img.icon {width:34px;height:34px;} + +/** Styles for preset.php **/ +#page-mod-data-preset .presetmapping table {text-align: left;margin-left: auto;margin-right: auto;} +#page-mod-data-preset .overwritesettings {margin-bottom: 1em;} +#page-mod-data-preset table.presets {margin-left: auto;margin-right: auto;} + +/** Styles for field.php **/ +.page-mod-data-field .fieldadd, +.page-mod-data-field .sortdefault {margin:1em 0;} +.page-mod-data-field .fieldadd select, +.page-mod-data-field .sortdefault select {margin-left: 1em;} +.page-mod-data-field .fieldname, +.page-mod-data-field .fielddescription {width:300px;} Index: moodle/mod/data/styles.php --- moodle/mod/data/styles.php Base (1.6) +++ moodle/mod/data/styles.php Locally Deleted @@ -1,49 +0,0 @@ -#mod-data-view #sortsearch .c0 { - text-align: right; -} - -#mod-data-view .approve img.icon { - width:34px; - height:34px; -} - -#mod-data-preset .presetmapping { - text-align: center; -} - -#mod-data-preset .presetmapping table { - text-align: left; - margin-left: auto; - margin-right: auto; -} - -#mod-data-preset .overwritesettings { - margin-bottom: 1em; -} - -.mod-data-field .c0 { - text-align: right; -} - -.mod-data-field .fieldadd, -.mod-data-field .sortdefault { - margin-bottom: 1em; - margin-top: 1em; -} - -.mod-data-field .fieldadd select, -.mod-data-field .sortdefault select { - margin-left: 1em; -} - -.mod-data-field .fieldname { - width:300px; -} - -.mod-data-field .fielddescription { - width:300px; -} - -.presetcontrols form { - display: inline; -} Index: moodle/mod/feedback/styles.php --- moodle/mod/feedback/styles.php Base (1.1) +++ moodle/mod/feedback/styles.php Locally Deleted @@ -1,9 +0,0 @@ -/* styles using by feedback */ -.feedback_required_mark { - color: #FF0000; -} - -.feedback_switchrequired img{ -} - - Index: moodle/mod/forum/styles.css --- moodle/mod/forum/styles.css No Base Revision +++ moodle/mod/forum/styles.css Locally New @@ -0,0 +1,48 @@ +/** General Styles **/ +.forumpost {border-width:1px;border-style:solid;border-collapse:separate;margin-top: 10px;} +.forumpost .topic {padding: 4px;border-style:solid;border-width: 0px;border-bottom-width: 1px;} +.forumpost .commands, +.forumpost .ratings, +.forumpost .attachments, +.forumpost .footer, +.forumpost .link, +.page-mod-forum .forumolddiscuss, +#page-mod-forum-search .c0 {text-align:right;} +.forumpost .left {width: 35px;vertical-align: top;} +.page-mod-forum .indent {margin-left: 30px;} +.page-mod-forum .forumheaderlist {width: 100%;border-width:1px;border-style:solid;border-collapse:separate;margin-top: 10px;} +.page-mod-forum .forumheaderlist td {border-width:1px 0px 0px 1px;border-style:solid;} +.page-mod-forum .forumheaderlist .picture {width: 35px;} +.page-mod-forum .forumheaderlist .discussion .starter {vertical-align: middle;} +.page-mod-forum .forumheaderlist .discussion .lastpost {white-space: nowrap;text-align: right;} +.page-mod-forum .forumheaderlist .replies, +.page-mod-forum .forumheaderlist .discussion .author {white-space: nowrap;} + +/** Styles for subscribers.php */ +#page-mod-forum-subscribers .subscriberdiv, +#page-mod-forum-subscribers .subscribertable {width:100%;vertical-align:top;} +#page-mod-forum-subscribers .subscribertable tr td {vertical-align:top;} +#page-mod-forum-subscribers .subscribertable tr td.actions {width:16%;padding-top:3em;} +#page-mod-forum-subscribers .subscribertable tr td.actions .actionbutton {margin:0.3em 0;padding:0.5em 0;width:100%;} +#page-mod-forum-subscribers .subscribertable tr td.existing, +#page-mod-forum-subscribers .subscribertable tr td.potential {width:42%;} + +/** Styles for discuss.php **/ +#page-mod-forum-discuss .discussioncontrols td {width: 33%;text-align:center;} + +/** Styles for view.php **/ +#page-mod-forum-view .forumaddnew {margin-bottom: 20px;} +#page-mod-forum-view .groupmenu {float: left;text-align:left;white-space: nowrap;} +#page-mod-forum-index .subscription, +#page-mod-forum-view .subscription {float: right;text-align:right;white-space: nowrap;margin: 5px 0;} + +/** Styles for search.php */ +#page-mod-forum-search .introcontent {padding: 15px;font-weight:bold;} + +#page-mod-forum-index .unread img, +#page-mod-forum-view .unread img {margin-left: 5px;} + +/** Unknown Styles ??? */ +#user-view .forumpost, +.course .forumpost {width: 100%;} +#email .unsubscribelink {margin-top:20px;} Index: moodle/mod/glossary/styles.css --- moodle/mod/glossary/styles.css No Base Revision +++ moodle/mod/glossary/styles.css Locally New @@ -0,0 +1,24 @@ +/** General Styles **/ +.page-mod-glossary .glossarypost {border-collapse:separate;margin:5px auto;text-align: left;} +.page-mod-glossary .glossarypost.entrylist {border-width:0px;} +.page-mod-glossary .glossarypost.continuous .concept {display: inline;} +.page-mod-glossary .glossarypost .commands {width: 200px;white-space: nowrap;} +.page-mod-glossary .glossarypost .picture {width: 35px;} +.page-mod-glossary .glossarypost .entrylowersection .aliases {text-align:center;} +.page-mod-glossary .glossarypost .entrylowersection .icons {text-align:right;padding-right: 5px;} +.page-mod-glossary .glossarypost .entrylowersection .ratings {text-align:right;padding-right: 5px;padding-bottom: 2px;} + +.page-mod-glossary .glossarydisplay {margin-left:auto;margin-right:auto;} +.page-mod-glossary .glossarydisplay .tabs {width: 100%;margin-bottom: 0px;} +.page-mod-glossary .glossarydisplay .tabs .side {border-style: none;border-width: 0px;width: auto;} +.page-mod-glossary .glossarydisplay .separator {width: 4px;} + +.page-mod-glossary table.glossarypopup {width: 95%;} +.page-mod-glossary .entrybox, /** Used in tabs.php **/ +.page-mod-glossary table.glossaryapproval, +.page-mod-glossary .glossarypost .entrylowersection table{width: 100%;} + +/** Page specific styles **/ +#page-mod-glossary-view .glossarycontrol {float: right;text-align:right;white-space: nowrap;margin: 5px 0;} +#page-mod-glossary-view table.glossarycategoryheader, +#page-mod-glossary-import table.glossaryimportexport {margin-left:auto;margin-right:auto;} Index: moodle/mod/lesson/styles.css --- moodle/mod/lesson/styles.css No Base Revision +++ moodle/mod/lesson/styles.css Locally New @@ -0,0 +1,29 @@ +/** General styles (scope: all of lesson) **/ +.page-mod-lesson .contents, +.page-mod-lesson .standardtable, +.page-mod-lesson .mform .box.contents, +.page-mod-lesson .invisiblefieldset.fieldsetfix tr {text-align: left;} +.page-mod-lesson #layout-table {width: 100%;} +.page-mod-lesson .edit_buttons form, +.page-mod-lesson .edit_buttons input {display: inline;} +.page-mod-lesson .userinfotable .cell, +.page-mod-lesson .userinfotable .userpicture {vertical-align: middle;} +.page-mod-lesson .invisiblefieldset.fieldsetfix {display: block;} +.page-mod-lesson .slideshow {overflow: auto;padding: 15px;} +.page-mod-lesson .menu .menuwrapper {max-height: 400px;overflow: auto;vertical-align: top;margin-bottom: 10px;} +.page-mod-lesson .menu ul {list-style: none;padding: 5px 0px 0px 5px;margin: 0px;} +.page-mod-lesson .menu ul li {padding-bottom: 5px;} +.page-mod-lesson .skip {position: absolute;left: -1000em;width: 20em;} +.page-mod-lesson .branchbuttoncontainer.horizontal div, +.page-mod-lesson .branchbuttoncontainer.horizontal form {display: inline;} +.page-mod-lesson .firstpageoptions {width:30%;margin-left:35%;margin-top:1em;} +.page-mod-lesson .progress_bar_table, +.page-mod-lesson .progress_bar_completed, +.page-mod-lesson .progress_bar_todo {padding: 0;margin: 0;} +.page-mod-lesson .progress_bar_token {height: 20px;width: 5px;padding: 0;margin: 0;} +.page-mod-lesson .edit_pages_box .addlinks {margin:0;margin-bottom:1em;} + +/** + * Style for view.php + **/ +#page-mod-lesson-view .password-form .submitbutton {display: inline;} Index: moodle/mod/quiz/styles.css --- moodle/mod/quiz/styles.css No Base Revision +++ moodle/mod/quiz/styles.css Locally New @@ -0,0 +1,338 @@ +#page-mod-quiz-comment #manualgradingform, +#page-mod-quiz-report #manualgradingform {width: 100%;} + +/** Mixed **/ +#page-mod-quiz-attempt .submitbtns, +#page-mod-quiz-review .submitbtns, +#page-mod-quiz-summary .submitbtns {text-align: left;margin-top: 1.5em;} + +#page-mod-quiz-attempt #page .controls, +#page-mod-quiz-summary #page .controls, +#page-mod-quiz-review #page .controls {text-align: center;margin: 8px auto;} + +#page-mod-quiz-edit div.question div.content .questiontext, +#categoryquestions .questiontext {-o-text-overflow:ellipsis;text-overflow:ellipsis;position:relative;zoom:1;padding-left:0.3em;max-width:40%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;} + +#page-mod-quiz-edit div.question div.content .questionname, +#categoryquestions .questionname {white-space:nowrap;overflow:hidden;zoom:1;position:relative;max-width:20%;} + +#page-mod-quiz-edit div.editq div.question div.content .singlequestion a .questionname, +div.editq div.question div.content .singlequestion a .questiontext{text-decoration:underline;} + +#page-mod-quiz-edit.ie6 div.question div.content .questiontext, +#categoryquestions .questiontext {width:50%;} +#page-mod-quiz-edit.ie6 div.question div.content .questionname, +#categoryquestions .questionname {width:20%;} + +#page-mod-quiz-mod #reviewoptionshdr .fitem, +#adminquizreviewoptions .group {float: left;width: 33%;clear: none;} + +#page-mod-quiz-mod #reviewoptionshdr .fitemtitle, +#adminquizreviewoptions .fitemtitle {width: 100%;font-weight: bold;text-align: left;height: 2.5em;margin-left: 0;} + +#page-mod-quiz-mod #reviewoptionshdr fieldset.fgroup span, +#adminquizreviewoptions span {float: left;clear: left;} + +table#categoryquestions td, +#page-mod-quiz-edit table#categoryquestions th{overflow:hidden;white-space:nowrap;} + +/** mod quiz mod **/ +#page-mod-quiz-mod #reviewoptionshdr .fitem {width: 30%;margin-left: 10px;} +#page-mod-quiz-mod #reviewoptionshdr fieldset.fgroup {width: 100%;text-align: left;margin-left: 0;} + +/** Mod quiz view **/ +#page-mod-quiz-view .quizinfo, +#page-mod-quiz-view #page .quizgradefeedback, +#page-mod-quiz-view #page .quizattempt {text-align: center;} +#page-mod-quiz-view #page .quizattemptsummary td p {margin-top: 0;} +#page-mod-quiz-view .generalbox#feedback {width:70%;margin-left:auto;margin-right:auto;padding-bottom:15px;} +#page-mod-quiz-view .generalbox#feedback h2 {margin: 0;} +#page-mod-quiz-view .generalbox#feedback h3 {text-align: left;} +#page-mod-quiz-view .generalbox#feedback .overriddennotice {text-align: center;font-size: 0.7em;} + +/** Mod quiz summary **/ +#page-mod-quiz-summary #content {text-align: center;} +#page-mod-quiz-summary .questionflag {width: 16px;height: 16px;vertical-align: middle;} +#page-mod-quiz-summary #quiz-timer {margin-top: 1em;display: none; /* Revealed by JavaScript if applicable */} + +/** Mod quiz review **/ +#page-mod-quiz-review .pagingbar {margin: 1.5em auto;} + +/** Mod quiz report **/ +#page-mod-quiz-report h2.main {clear: both;} +#page-mod-quiz-report div#commands, +#page-mod-quiz-report .controls {text-align: center;} +#page-mod-quiz-report .dubious{background-color: #fcc;} +#page-mod-quiz-report .highlight{border :medium solid yellow;background-color:lightYellow;} +#page-mod-quiz-report .negcovar{border :medium solid pink;} +#page-mod-quiz-report #manualgradingform .que {margin-bottom: 0.7em;} +#page-mod-quiz-report table.titlesleft td.c0{font-weight: bold;} +#page-mod-quiz-report table .numcol {text-align: center;vertical-align : middle !important;} +#page-mod-quiz-report table#attempts {clear: both;width: 80%;margin: 20px auto;} +#page-mod-quiz-report table#attempts .header, +#page-mod-quiz-report table#attempts .cell{padding: 4px;} +#page-mod-quiz-report table#attempts .header .commands {display: inline;} +#page-mod-quiz-report table#attempts .picture {width: 40px;} +#page-mod-quiz-report table#attempts td {border-left-width: 1px;border-right-width: 1px;border-left-style: solid;border-right-style: solid;vertical-align: middle;} +#page-mod-quiz-report table#attempts .header {text-align: left;} +#page-mod-quiz-report table#attempts .picture {text-align: center !important;} +#page-mod-quiz-report table#itemanalysis {width: 80%;margin: 20px auto;} +#page-mod-quiz-report table#itemanalysis td {border-width: 1px;border-style: solid;} +#page-mod-quiz-report table#itemanalysis .header {text-align: left;padding: 4px;} +#page-mod-quiz-report table#itemanalysis .header .commands {display: inline;} +#page-mod-quiz-report table#itemanalysis .uncorrect {color: red;} +#page-mod-quiz-report table#itemanalysis .correct {color: blue;font-weight : bold;} +#page-mod-quiz-report table#itemanalysis .partialcorrect {color: green !important;} +#page-mod-quiz-report table#itemanalysis .cell{padding: 4px;} +#page-mod-quiz-report table#itemanalysis .qname {color: green !important;} + +/** Mod quiz grading **/ +#page-mod-quiz-grading table#grading {width: 80%;margin: 20px auto;} +#page-mod-quiz-grading table#grading .header, +#page-mod-quiz-grading table#grading .cell {padding: 4px;} +#page-mod-quiz-grading table#grading .header .commands{display: inline;} +#page-mod-quiz-grading table#grading .picture{width: 40px;} +#page-mod-quiz-grading table#grading td {border-left-width: 1px;border-right-width: 1px;border-left-style: solid;border-right-style: solid;vertical-align: bottom;} + +/** Mod quiz attempt **/ +#page-mod-quiz-attempt #quiz-timer {display: none; /* Revealed by JavaScript if applicable */} +#page-mod-quiz-attempt #quiz-time-left {font-weight: bold;} +#page-mod-quiz-attempt #quiz-timer-outer {border-color: #dddddd;background: white;} + +#categoryquestions .r1 {background: #e4e4e4;} +#categoryquestions .header {text-align: center;padding: 0 2px;border: 0 none;} +#categoryquestions th.modifiername .sorters, +#categoryquestions th.creatorname .sorters {font-weight: normal;font-size: 0.8em;} +table#categoryquestions {width: 100%;overflow: hidden;table-layout: fixed;} +#categoryquestions .iconcol {width: 15px;text-align: center;padding: 0;} +#categoryquestions .checkbox {width: 19px;text-align: center;padding: 0;} +#categoryquestions .qtype {text-align: center;} +#categoryquestions .qtype {width: 24px;padding: 0;} +#categoryquestions .questiontext p {margin: 0;} + +table.quizattemptsummary .bestrow td {background-color: #e8e8e8;} +table.quizattemptsummary .noreviewmessage {color: gray;} + +table.quizreviewsummary {width: 100%;} +table.quizreviewsummary th.cell {padding: 1px 0.5em 1px 1em;font-weight: bold;text-align: right;width: 10em;background: #f0f0f0;} +table.quizreviewsummary td.cell {padding: 1px 1em 1px 0.5em;text-align: left;background: #fafafa;} + +#quiznavigation #user-picture {margin: 0.5em 0;} +#quiznavigation #user-picture img {width: auto;height: auto;float: left;} +#quiznavigation .othernav {clear: both;} +#quiznavigation .othernav a, +#quiznavigation .othernav input {display: block;margin: 0.5em 0;} +#quiznavigation .qnbutton {display: block;float: left;width: 1.5em;height: 1.5em;overflow: hidden;margin: 0.3em 0.3em 0.3em 0;padding: 0;border: 1px solid #bbb;background: #eee no-repeat top right;text-align: center;vertical-align: middle;cursor: pointer;white-space: normal;font: inherit;line-height: 1.5em;font-weight: bold;color: #00f;border-color: #bbb;background-color: #ddd;} +#quiznavigation .qnbutton:hover {text-decoration: underline;color: #f00;} +#quiznavigation .qnbutton.flagged {background-image: url([[pix:i/ne_red_mark]]);} +#quiznavigation .qnbutton.thispage {border-color: black;} +#quiznavigation .qnbutton.open {background-color: white;} +#quiznavigation .qnbutton.correct {background-color: #cfc;} +#quiznavigation .qnbutton.partiallycorrect {background-color: #ffa;} +#quiznavigation .qnbutton.incorrect {background-color: #fcc;} + +#quiznojswarning {color: red;} +#quiznojswarning {font-size: 0.7em;line-height: 1.1;} +.jsenabled #quiznojswarning {display: none;} + +body #quizcontentsblock #repaginatedialog{display: none;} +body.jsenabled #quizcontentsblock #repaginatedialog{display: block;} +body.jsenabled #quizcontentsblock #repaginatedialog .hd{display:block;} +body.jsenabled #quizcontentsblock #repaginatedialog .bd{padding:1em;} +body.jsenabled #quizcontentsblock .repaginatecommand #repaginatecommand{display:block;} + +body#question-preview .quemodname, +body#question-preview .controls{text-align: center;} + +.quizattemptcounts {clear : left;text-align: center;margin: 6px 0;} +.generalbox#passwordbox { /* Should probably match .generalbox#intro above */width:70%;margin-left:auto;margin-right:auto;} +#passwordform {margin: 1em 0;} + +.questionbankwindow .choosecategory, +.questionbankwindow .createnewquestion {padding: 0.3em;} +.questionbankwindow .createnewquestion .singlebutton {display: inline;} +.questionbankwindow #catmenu_jump {display: block;} +.questionbank div.categoryquestionscontainer, +.questionbank .categorysortopotionscontainer, +.questionbank .categorypagingbarcontainer, +.questionbank .categoryselectallcontainer{padding-left:0.3em;padding-right:0.3em;} + +.noquestionsincategory{clear:both;padding-top:1em;padding-bottom:1em;} +.modulespecificbuttonscontainer{padding-left:0.3em;padding-right:0.3em;} + +#adminquizreviewoptions {margin-bottom: 0.5em;} +.quizquestionlistcontrols {text-align: center;} + +#randomquestiondialog_c select{width:100%;} + +.categoryinfo {padding: 0.3em;} + +.page-mod-quiz .gradingdetails {font-size: small;} +.page-mod-quiz .highlightgraded {background:yellow;} +.page-mod-quiz div.tabtree a span img.iconsmall {vertical-align: baseline;} +.ie6.page-mod-quiz div.tabtree a span img.iconsmall {margin: 0;vertical-align: baseline;position: relative;top: 1px;} +.ie7.page-mod-quiz div.tabtree a span img.iconsmall {margin: 0;vertical-align: baseline;position: relative;top: 2px;} + +/** Mod quiz edit **/ +#page-mod-quiz-edit h2.main{display:inline;padding-right:1em;clear:left;} + +#page-mod-quiz-edit div.sideblock {float:right;width:30%;right:0.3em;padding-bottom:0.5em;display:block;border-width:0;} +#page-mod-quiz-edit div.sideblock .content {padding:0;} +#page-mod-quiz-edit div.quizcontents {float:left;width:70%;display:block;clear:left;} +#page-mod-quiz-edit div.quizwhenbankcollapsed {width:100%;} +#page-mod-quiz-edit div.quizpage {display:block;clear:both;width:100%;} +#page-mod-quiz-edit div.quizpage span.pagetitle {margin-top:0.3em;float:left;display:block;color:#006;} +#page-mod-quiz-edit div.quizpage .pagecontent {margin-top:0.3em;display:block;float:left;position:relative;margin-left:0.3em;margin-bottom:0.2em;border-left:solid #777 thin;line-height:1.3em;-webkit-border-radius:0.6em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.6em;border-radius-bottomleft:0;border-radius-topleft:0;width:88%;padding:0.15em 0 0.3em;background-color:#d6d6d6;} +#page-mod-quiz-edit div.quizpage .pagecontent .pagestatus {-webkit-border-radius-bottomright:0.3em;-webkit-border-radius-topright:0.3em;border-radius-bottomright:0.3em;border-radius-topright:0.3em;margin:0.3em;padding:0.1em 0.1em 0.1em 0.3em;background-color:#eee;font-weight:bold;} +#page-mod-quiz-edit div.quizpage .pagecontent form#addquestion{background-color:#fff;} +#page-mod-quiz-edit div.quizpage .pagecontent form.randomquestionform div {/* it is a mystery why this has to be inline-table but otherwise the layout gets screwed, even if it is "inline" */display: inline-table;} +#page-mod-quiz-edit div.quizpage .pagecontent form.randomquestionform div input {display: inline;} + +#page-mod-quiz-edit .addpage{clear:both;padding-top:0.3em;float:right;margin-right:2em;} +#page-mod-quiz-edit .statusdisplay {background-color: #ffc;clear: both;margin: 0.3em 1em 0.3em 0;padding: 1px ; /* Stop margin collapse. */} +#page-mod-quiz-edit .statusdisplay p {margin: 0.4em;} + +#page-mod-quiz-edit div.reorder .reordercontrols{clear:both;padding-right:1em;margin-top:0.5em;padding-top:0.5em;padding-bottom:0.5em} +#page-mod-quiz-edit div.reorder .reordercontrols .moveselectedonpage{clear:right;float:right;padding:0.5em 0.3em;text-align:right;} +#page-mod-quiz-edit div.reorder .reordercontrols .addnewpagesafterselected, +#page-mod-quiz-edit .repaginatecommand {float:right;clear:right;padding-right:1em;} +#page-mod-quiz-edit div.reorder .reordercontrols .deleteselected{float:right;margin-right:1em;} +#page-mod-quiz-edit div.reorder div.question{padding-top:0.2em;} +#page-mod-quiz-edit div.reorder div.question div.qnum {width:2.9em;padding-top:0.1em;} +#page-mod-quiz-edit .reorder div.question div.content {width:87%;float:left;position:relative;-webkit-border-radius:0.3em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.3em;border-radius-bottomleft:0;border-radius-topleft:0;line-height:1.2em;padding:0.1em;background-color:#F9F9F9;} +#page-mod-quiz-edit .reorder .questioncontentcontainer .quiz_randomquestion {position:relative;} +#page-mod-quiz-edit .reorder div.question div.content div.quiz_randomquestion {line-height:1em;} + +#page-mod-quiz-edit .reorder .questioncontentcontainer {position:relative;overflow:hidden;white-space:nowrap;} +#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory {overflow:hidden;white-space:nowrap;display:inline;float:none;} +#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label {max-width: 25%;overflow:hidden;padding-left:0.3em;white-space:nowrap;display:inline-block;} +#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestionfromcategory label {overflow:hidden;white-space:nowrap;display:inline-block;} +#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestionfromcategory, +#page-mod-quiz-edit .reorder div.question div.content .questionpreview {display:inline;float:none;} + +#page-mod-quiz-edit .reorder fieldset{display:inline;} +#page-mod-quiz-edit div.reorder div.question div.qnum{text-align:right;font-size:1em;} + +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist {padding-left:0.2em;padding-right:0.2em;clear:both;margin:0.5em;margin-top:0.8em;} +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist .totalquestionsinrandomqcategory{overflow:auto;white-space:normal;} +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul{list-style-type:none;margin:0;padding:0;} +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul li {clear:left;width:100%;overflow:hidden;white-space:nowrap;} +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul li img{padding-right:0.3em;} +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul li span{display:inline;} +#page-mod-quiz-edit .questioncontentcontainer a {text-decoration:underline;} +#page-mod-quiz-edit .questioncontentcontainer div.singlequestion a{text-decoration:underline;} +#page-mod-quiz-edit .questioncontentcontainer .randomquestioncategory{font-weight:bold;} + +#page-mod-quiz-edit div.question {clear:left;width:100%;} +#page-mod-quiz-edit div.question div.qnum {display:block;float:left;width:1.4em;padding-right:0.3em;padding-left:0;z-index:99;text-align:right;color:#333;} +#page-mod-quiz-edit div.question div.questioncontainer{background-color:#ffc;} +#page-mod-quiz-edit div.editq div.question div.content{width:87%;float:left;position:relative;-webkit-border-radius:0.6em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.6em;border-radius-bottomleft:0;border-radius-topleft:0;line-height:1.4em;padding:0.5em;} +#page-mod-quiz-edit div.question div.content div.points{top:0.5em;border-left:#FFF solid 0.4em;width:8.5em;padding:0.2em;line-height:1em;max-width:30%;position:absolute;right:50px;-webkit-border-radius:0.2em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.2em;border-radius-bottomleft:0;border-radius-topleft:0;z-index:900;display:block;margin:0;background-color:#ddf;} +#page-mod-quiz-edit div.question div.content div.points input{width:2em;padding:0;} +#page-mod-quiz-edit div.question div.content div.points input.pointssubmitbutton{width:auto;} +#page-mod-quiz-edit div.question div.content div.qorder {line-height:1em;max-width:30%;position:absolute;right:50px;-webkit-border-radius:0.2em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.2em;border-radius-bottomleft:0;border-radius-topleft:0;z-index:900;display:block;margin:0;background-color:#ddf;} +#page-mod-quiz-edit div.question div.content .editicon {width:15px;} +#page-mod-quiz-edit div.question div.content .singlequestion .questionname, +#page-mod-quiz-edit div.question div.content .singlequestion .questiontext{display:inline-block;} +#page-mod-quiz-edit div.question div.content .singlequestion .questionpreview{background-color:#eee;} +#page-mod-quiz-edit div.question div.content .questiontype{display:block;clear:left;float:left;} +#page-mod-quiz-edit div.question div.content .questionpreview {display:block;float:left;margin-left:0.3em;padding-left:0.2em;padding-right:0.2em;} +#page-mod-quiz-edit div.question div.content .questionpreview a{background-color:#eee;} +#page-mod-quiz-edit div.question div.content div.quiz_randomquestion .questionpreview{display:inline;float:none;} +#page-mod-quiz-edit div.question div.content div.questioncontrols{float:right;width:45px;position:absolute;right:0.3em;top:0;z-index:900;display:block;padding:0.2em;background-color:#F9F9F9;text-align:right;} +#page-mod-quiz-edit div.question div.content div.questioncontrols img.upwithoutdown{padding-right:12px;display:inline;} +#page-mod-quiz-edit div.question div.content .questiontext {font-weight:bold;} +#page-mod-quiz-edit div.question div.content .questiontype{font-style:italic;} + +#page-mod-quiz-edit .editq div.question div.qnum {padding-top:0.2em;} +#page-mod-quiz-edit .editq div.question {padding-top:0.3em;} +#page-mod-quiz-edit .editq div.questioncontentcontainer div.singlequestion img {float:left;padding-top:0.3em;padding-right:0.3em;} +#page-mod-quiz-edit .editq div.question div.content {background-color:#F9F9F9;} +#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory{margin-top:0.4em;position:relative;display:inline-block;} +#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory a{display:block;max-width:15em;overflow: hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;white-space: nowrap;float:left;position:relative;} +#page-mod-quiz-edit .editq div.question div.content .questionpreview {float:left;} +#page-mod-quiz-edit .editq div.question div.content .questionpreview a{font-weight:normal;margin-left:0em;display:inline;float:none;} +#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory .questionpreview img{padding-right:0.3em;} +#page-mod-quiz-edit .editq div.question div.content .singlequestion a .questionname, +#page-mod-quiz-edit .editq div.question div.content .singlequestion a .questiontext{float:left;} +#page-mod-quiz-edit .editq div.question div.description div.content .questiontext {max-width: 75%;} +#page-mod-quiz-edit .editq div.question div.qnum{font-size:1.5em;} + +#page-mod-quiz-edit .questionbankwindow select#catmenu_jump{ +/* In Opera9, IE6 the width of the +select obeys the width of its content +by default. This prevents that. */width:100%;} + +/*this color might need to be theme-specific, +but in terms of usability, as testing showed, +http://docs.moodle.org/en/Development:Quiz_UI_redesign/usability_testing_of_August_2008/Issues#Question_bank_.2F_question_adding_controls_visibility +it must be ensured that the question +bank window's title is prominent enough*/ +#page-mod-quiz-edit .questionbankwindow div.header {background-color:#009;color:#fff;background-image:none;padding-top:0.2em;font-weight:bold;} +#page-mod-quiz-edit .questionbankwindow div.header a{text-decoration:underline;color:#FFF;} +#page-mod-quiz-edit .collapsed .container{display: none;} +#page-mod-quiz-edit .questionbankwindow #showbankcmd{display:none;} +#page-mod-quiz-edit .collapsed #showbankcmd{display:inline;} +#page-mod-quiz-edit .questionbankwindow #hidebankcmd{display:inline;} +#page-mod-quiz-edit .collapsed #hidebankcmd{display:none;} + +#page-mod-quiz-edit .quizquestionlistcontrols {display:inline;} + +#page-mod-quiz-edit .quizpagedelete{position:absolute;top:0.2em;right:0.2em;display:inline;z-index:900;} +#page-mod-quiz-edit .quizpagedelete img {background-color:#d6d6d6;padding:0.6em;} +#page-mod-quiz-edit .pagecontrols {clear:both;margin-left:0.5em;padding-top:0.5em;} +#page-mod-quiz-edit .pagecontrols .singlebutton {float:left;margin-left: 1em;} +#page-mod-quiz-edit .pagecontrols .helplink {float:left;} + +#page-mod-quiz-edit div#randomquestiondialog_c{width:90%;} +#page-mod-quiz-edit div#randomquestiondialog_c .mform, +#page-mod-quiz-edit div#repaginatedialog .mform{margin-left:auto;margin-right:auto;} +#page-mod-quiz-edit div.container div.generalbox{position:relative;display:block;border:0 none;margin:0;padding:0;} + +#page-mod-quiz-edit .questionbankwindow .createnewquestion select, +#page-mod-quiz-edit .questionbankwindow #catmenu select, +#page-mod-quiz-edit .questionbankwindow #menucategory {width: 100%;} + +#page-mod-quiz-edit .paging {margin-top:0;margin-bottom:0;display:block;background-color:#ddd;} +#page-mod-quiz-edit .pagingbottom {padding-bottom:0.3em;} +#page-mod-quiz-edit .paging a:hover{background-color:#eef;} + +#page-mod-quiz-edit #page-footer {clear:both;padding-top:1em;} + +.ie6#page-mod-quiz-edit div.question div.content .questiontext, +.ie6#page-mod-quiz-edit #categoryquestions .questionname{/*ie6 shows this as an arrow if this is not specified*/cursor: pointer;} +.ie6#page-mod-quiz-edit div.question div.content .questionname, +.ie6#page-mod-quiz-edit #categoryquestions .questiontext{/*ie6 shows this as an arrow if this is not specified*/cursor: pointer;} +.ie6#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label{width: 35%;} +.ie6#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory a{width:40%;} + +#page-mod-quiz-edit #categoryquestions .questiontext {font-weight:bold;} +#page-mod-quiz-edit .categoryinfofield{font-style:italic;} +#page-mod-quiz-edit .categorynamefield{font-weight:bold;} +#page-mod-quiz-edit a.configurerandomquestion{font-size:small;text-decoration:underline;} +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist{background-color:#eee;} +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul{color:#555;} +#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist .totalquestionsinrandomqcategory{color:#000;} +#page-mod-quiz-edit .categoryinfo {background-color:#eee;border-bottom:1px solid #bbb;} +#page-mod-quiz-edit .questionsortoptions {background-color:#ddd;} + +#page-mod-quiz-edit div.questionbank{background-color:#e6e6ff;} +#page-mod-quiz-edit div.questionbank form .invisiblefieldset{clear:both;} +#page-mod-quiz-edit div.questionbank .categorysortopotionscontainer{padding-top:0.5em;margin-top:0.3em;} +#page-mod-quiz-edit div.questionbank .categoryquestionscontainer, +.questionbank .categorysortopotionscontainer, +.questionbank .categorypagingbarcontainer, +.questionbank .categoryselectallcontainer{background-color:#FFF;} + +#categoryquestions .questiontext {width:50%;} +#categoryquestions .questionname {width:20%;} + +.ie6#page-mod-quiz-edit div.question div.content .questiontext, +.ie6#page-mod-quiz-edit #categoryquestions .questionname{/*ie6 shows this as an arrow if this is not specified*/cursor: pointer;} +.ie6#page-mod-quiz-edit div.question div.content .questionname, +.ie6#page-mod-quiz-edit #categoryquestions .questiontext{/*ie6 shows this as an arrow if this is not specified*/cursor: pointer;} +.ie6.page-mod-quiz div.tabtree a span img.iconsmall {margin: 0;vertical-align: baseline;position: relative;top: 1px;} +.ie6#page-mod-quiz-edit div.question div.content .questiontext {width:50%;} +.ie6#page-mod-quiz-edit div.question div.content .questionname {width:20%;} +.ie6#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory a{width:40%;} +.ie6#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label{width: 35%;} Index: moodle/mod/resource/styles.css --- moodle/mod/resource/styles.css No Base Revision +++ moodle/mod/resource/styles.css Locally New @@ -0,0 +1,5 @@ +#page-mod-resource-view .resourcecontent.resourcepdf {width: 100%;} +.page-mod-resource .popupnotice {text-align:center;margin:40px;} + +.resourcecontent object {height:480px;width:600px;} +.resourcecontent.resourcepdf object{height: 800px;width: 800px;} Index: moodle/mod/scorm/styles.css --- moodle/mod/scorm/styles.css No Base Revision +++ moodle/mod/scorm/styles.css Locally New @@ -0,0 +1,24 @@ +.page-mod-scorm .top {vertical-align: top;} +.page-mod-scorm .scorm-left {text-align: left;} +.page-mod-scorm .scorm-center {text-align: center;} +.page-mod-scorm .scorm-right {text-align: right;} +.page-mod-scorm .scoframe {position: relative;width: 100%;height: 100%;} + +#page-mod-scorm-player #scormobject {height: 400px;} +#page-mod-scorm-player #scormtop {position: relative;width: 100%;height: 30px;} +#page-mod-scorm-player #scormbrowse {position: absolute;left: 5px;top: 0px;} +#page-mod-scorm-player #scormnav {position: absolute;right: 5px;top: 0px;text-align: center;top: 3px;width: 100%;} +#page-mod-scorm-player #scormbox {width: 74%;position: absolute;right: 0px;top: 0px;} +#page-mod-scorm-player #scormpage {position: relative;width: 100%;} +#page-mod-scorm-player #scormpage #toctree {position:relative;width:100%;overflow-x: auto;overflow-y: auto;} +#page-mod-scorm-player #tocbox {position: relative;left: 0px;width: 24%;font-size: 0.8em;} +#page-mod-scorm-player #tochead {position: relative;text-align: center;top: 3px;height: 30px;} + +#page-mod-scorm-player .toc, +#page-mod-scorm-player .no-toc {width: 100%;} +#page-mod-scorm-player .structlist {list-style-type: none;white-space: nowrap;} +#page-mod-scorm-player .structurelist {position: relative;list-style-type: none;width: 96%;margin:0;padding:0;} +#page-mod-scorm-player .structurelist ul {padding-left: 0.5em;margin-left: 0.5em;} + +#page-mod-scorm-view .structurelist {list-style-type: none;white-space: nowrap;} +#page-mod-scorm-view .structurelist {list-style-type: none;white-space: nowrap;} Index: moodle/mod/scorm/styles.php --- moodle/mod/scorm/styles.php Base (1.16) +++ moodle/mod/scorm/styles.php Locally Deleted @@ -1,296 +0,0 @@ -.structlist { - - list-style-type: none; - - white-space: nowrap; - - font-size: small; - -} - -.orgtitle { - - font-weight: bold; - - font-size: small; - -} - -.mod-scorm .top { - - vertical-align: top; - -} - -.mod-scorm .scorm-left { - - text-align: left; - -} - -.mod-scorm .scorm-center { - - text-align: center; - -} - -.mod-scorm .scorm-right { - - text-align: right; - -} - -.mod-scorm .scoframe { - - position: relative; - - width: 100%; - - height: 100%; - - - -} - - - -#mod-scorm-player #scormpage { - - position: relative; - - width: 100%; - - - - -} - -#mod-scorm-player #tochead { - - position: relative; - - text-align: center; - - top: 3px; - - height: 30px; - - - -} - -#mod-scorm-player .toc { - - width: 80%; - - margin-left: 20%; - - - - -} - -#mod-scorm-player .no-toc { - - width: 100%; - - - -} - -#mod-scorm-player #scormobject { - - height: 400px; - - - - -} - -#mod-scorm-player #scormtop { - - position: relative; - - width: 100%; - - height: 30px; - - - -} - -#mod-scorm-player #scormbrowse { - - position: absolute; - - left: 5px; - - top: 0px; - - - - -} - -#mod-scorm-player #scormnav { - - position: absolute; - - right: 5px; - - top: 0px; - - text-align: center; - - top: 3px; - - width: 100%; - - - - -} - - - -#mod-scorm-view .structurehead { - - text-align: center; - - - -} - - - -#mod-scorm-view .structurelist { - - list-style-type: none; - - white-space: nowrap; - - - -} - - - -#mod-scorm-player #scormbox { - - width: 74%; - - position: absolute; - - right: 0px; - - top: 0px; - - - -} - - - -#mod-scorm-player #tocbox { - - position: relative; - - left: 0px; - - width: 24%; - - font-size: 0.8em; - - - -} - - - -#mod-scorm-player #tochead { - - position: relative; - - text-align: center; - - top: 3px; - - height: 30px; - - - -} - - - -#toctree { - - position:relative; - - width:100%; - - overflow-x: auto; - - overflow-y: auto; - - - -} - -.structurelist { - - list-style-type: none; - -} - -#mod-scorm-player .structurelist { - - position: relative; - - list-style-type: none; - - width: 96%; - - margin-left:0; - - padding-left: 0; - - margin-right:0; - - padding-right: 0; - - padding-top: 0; - - padding-bottom: 0; - - margin-top:0; - - margin-bottom:0; - - - - -} - - - -#mod-scorm-player .structurelist ul{ - - padding-left: 0.5em; - - margin-left: 0.5em; - -} - -#mod-scorm-view .structurelist { - - list-style-type: none; - - white-space: nowrap; - -} - -a#mod-scorm-log-toggle { - font-size: 0.7em; - font-weight: bold; -} Index: moodle/mod/survey/lib.php --- moodle/mod/survey/lib.php Base (1.90) +++ moodle/mod/survey/lib.php Locally Modified (Based On 1.90) @@ -528,7 +528,7 @@ $strresponses = get_string('responses', 'survey'); echo $OUTPUT->heading($question->text, 3, 'questiontext'); - echo "\n"; + echo "\n
"; $options = explode( ",", $question->options); $numoptions = count($options); Index: moodle/mod/survey/styles.css --- moodle/mod/survey/styles.css No Base Revision +++ moodle/mod/survey/styles.css Locally New @@ -0,0 +1,14 @@ +.page-mod-survey .smalltext {font-size: 0.75em;} + +.page-mod-survey .surveytable .rblock label {display: block;} +.page-mod-survey .surveytable .foundthat, +.page-mod-survey .surveytable .preferthat {white-space: nowrap;} +.page-mod-survey .surveytable .buttoncell {width:5%;} +.page-mod-survey .surveytable .optioncell, +.page-mod-survey .surveytable .questioncell {width:50%;vertical-align:top;} +.page-mod-survey .surveytable .whitecell {background-color:white;} + +.page-mod-survey #surveyform th {font-weight: normal;text-align: left;} +.page-mod-survey #surveyform th.hresponse {text-align: center;width: 9%;} + +#page-mod-survey-report .fullnamecell {width:10%;vertical-align:top;white-space: nowrap;} Index: moodle/mod/wiki/styles.css --- moodle/mod/wiki/styles.css No Base Revision +++ moodle/mod/wiki/styles.css Locally New @@ -0,0 +1,7 @@ +.page-mod-wiki .sideblockheading, +.page-mod-wiki .howtowiki {text-align:right;} +.page-mod-wiki .wikisearchform, +.page-mod-wiki .wikilinksblock, +.page-mod-wiki .wikiadminactions {text-align:center;} +.page-mod-wiki .wikilinkright {text-align:right;padding-bottom: 0.5em;} +.page-mod-wiki .wikiexportbox {margin-left:auto;margin-right:auto;} Index: moodle/pix/t/block_to_dock.png MIME: application/octet-stream; encoding: Base64; length: 236 iVBORw0KGgoAAAANSUhEUgAAAAsAAAALCAYAAACprHcmAAAAAXNSR0IArs4c 6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0 SU1FB9oDFwgbIodaW9kAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJ TVBXgQ4XAAAAR0lEQVQY02NkKDj3nwEGJhgxtrW1IfhogIWBgYHhcrMhg+5k hGB6ejqGwr179zIwMZAARhWTrZiRoe0/IsaqGBlXrVqFMwYB4NoRWFVMQvoA AAAASUVORK5CYII= Index: moodle/pix/t/dock_to_block.png MIME: application/octet-stream; encoding: Base64; length: 238 iVBORw0KGgoAAAANSUhEUgAAAAsAAAALCAYAAACprHcmAAAAAXNSR0IArs4c 6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0 SU1FB9oDFwgZNq+27SYAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJ TVBXgQ4XAAAASUlEQVQY02Nsa2v7zwAFVVVVjAwF5+B8dMDCwMDAkJ6ezrB3 71644OVmQwyFupMZGJgYSACjislWzKKiooISIQxihgy6k7ErBgAOOg+0pf8F QAAAAABJRU5ErkJggg== Index: moodle/tag/coursetags_edit.php --- moodle/tag/coursetags_edit.php Base (1.15) +++ moodle/tag/coursetags_edit.php Locally Modified (Based On 1.15) @@ -75,7 +75,7 @@ // Print personal tags for all courses $title = get_string('edittitle', $tagslang); - echo $OUTPUT->heading($title, 2, 'center'); + echo $OUTPUT->heading($title, 2, 'mdl-align'); $mytags = coursetag_print_cloud(coursetag_get_tags(0, $USER->id, 'default'), true); $outstr = ' @@ -99,7 +99,7 @@ // Personal tag editing if ($canedit) { $title = get_string('editmytagsfor', $tagslang, '"'.$coursefullname.' ('.$courseshortname.')"'); - echo $OUTPUT->heading($title); + echo $OUTPUT->heading($title, 2, 'main mdl-align'); // Deletion here is open to the users own tags for this course only $selectoptions = ''; Index: moodle/tag/index.php --- moodle/tag/index.php Base (1.53) +++ moodle/tag/index.php Locally Modified (Based On 1.53) @@ -69,7 +69,7 @@ tag_print_management_box($tag); tag_print_description_box($tag); -echo '

'.get_string('courses'). +echo '

'.get_string('courses'). ' | '.get_string('relatedblogs', 'tag'). ' | '.get_string('users').'

'; Index: moodle/tag/manage.php --- moodle/tag/manage.php Base (1.29) +++ moodle/tag/manage.php Locally Modified (Based On 1.29) @@ -137,8 +137,6 @@ break; } -echo '
'; - if ($err_notice) { echo $OUTPUT->notification($err_notice, 'red'); } Index: moodle/theme/anomaly/layout/general.php --- moodle/theme/anomaly/layout/general.php Base (1.2) +++ moodle/theme/anomaly/layout/general.php Locally Modified (Based On 1.2) @@ -13,7 +13,7 @@ } if (!$properties->sidepost && !$properties->sidepre) { - $bodyclasses[] = 'noblocks'; + $bodyclasses[] = 'content-only'; } if (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()) { $bodyclasses[] = 'hasnavbar'; @@ -30,8 +30,7 @@ standard_top_of_body_html(); ?>
- -
+

heading ?>

@@ -49,29 +48,27 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
sidepre) { echo $OUTPUT->blocks_for_region('side-pre'); } ?>
-
-
+
sidepost) { echo $OUTPUT->blocks_for_region('side-post'); } ?> @@ -82,7 +79,7 @@
layout_options['nofooter'])) { ?> -
+

Index: moodle/theme/anomaly/style/base.css --- moodle/theme/anomaly/style/base.css Base (1.1) +++ moodle/theme/anomaly/style/base.css Locally Modified (Based On 1.1) @@ -6,47 +6,12 @@ .generalbox {padding:10px;margin-bottom:15px;} .generaltable, .userinfobox {margin-left:auto;margin-right:auto;} #notice.generalbox {margin-left: auto;margin-right: auto;width: 60%;} -.notifytiny {font-size:0.7em;color:#333;} -.notifytiny li, .notifytiny td {font-size:100%;} -.notifyproblem {text-align:center;} -.notifysuccess {text-align:center;} +.notifyproblem {padding:10px;color:#660000;text-align:center;} +.notifysuccess {padding:10px;color:#006600;text-align:center;} -.sideblock .list, -.unlist, .inline-list, -.sideblock .list li, -.unlist li, .inline-list li, -.sitetopic .section li, -.course-content .section, -.course-content .section li, -.tabtree li {list-style: none;margin:0px;padding:0px;} - -.jsenabled .collapsibleregion {overflow:hidden;} - .paging {text-align:center;} /** - * Mforms - */ -.mform {margin:0px auto;width:80%;} -.mform fieldset {width:100%;border:1px solid #000;} -.mform fieldset fieldset {border-width:0px;} -.mform fieldset legend {font-weight:bold;margin-left:0.5em;} -.mform fieldset div {margin:0px 10px 10px 10px;} -.mform fieldset div div {margin:0px;} -.mform fieldset .advancedbutton {text-align:right;} -.mform fieldset.hidden {border-width:0px;} -.mform .fitem {width:100%;overflow:hidden;margin-top:5px;margin-bottom:1px;clear:right;} -.mform .fitem .fitemtitle {width:30%;text-align:right;float:left;} -.mform .fitem .felement {width:60%;margin-left:31%;} -.mform .fitem fieldset.felement {margin-left:0px;padding-left:1%;} /** Fix fieldset margin issue **/ -.mform .required label {color:#A00;} -.mform .fdescription.required {color:#A00;text-align:right;} -.mform .fpassword .unmask {display:inline;margin-left:0.5em;} - -.ie .mform .fitem .felement {margin-left:0px;text-align:left;float:left;} /** Fix IE double margin + float bugs **/ -.ie .mform .fitem .fitemtitle {padding-right:1em;} - -/** * Tabs */ .tabtree {position:relative;margin-bottom:3.5em;} @@ -65,14 +30,6 @@ .tabtree .tabrow1 li a span, .tabtree .tabrow1 li a:hover span {background-image:none !important;} -/** phpinfo styles **/ -.phpinfo .center {text-align: center;} -.phpinfo .center table {margin-left: auto;margin-right: auto;text-align: left;border-collapse: collapse;} -.phpinfo .center th {text-align: center;} -.phpinfo .e,.phpinfo .v,.phpinfo .h {border: 1px solid #000000;font-size: 0.8em;vertical-align: baseline;color: #000000;background-color: #cccccc;} -.phpinfo .e {background-color: #ccccff;font-weight: bold;} -.phpinfo .h {background-color: #9999cc;font-weight: bold;} - .groupmanagementtable {width:90%;} .groupmanagementtable td {vertical-align:top;border-width:0px;} .groupmanagementtable td p {margin:0px;} Index: moodle/theme/anomaly/style/browser.css --- moodle/theme/anomaly/style/browser.css Base (1.1) +++ moodle/theme/anomaly/style/browser.css Locally Modified (Based On 1.1) @@ -5,20 +5,20 @@ */ .rounded-corner {display:block;width:11px;height:11px;font-size:1pt;margin:0px;padding:0px;} -.page-header .rounded-corner {background-image:url([[pix:theme|corners_header]]);clear:both;} -.page-header .rounded-corner.top-left {background-position:0px 0px;float:left;} -.page-header .rounded-corner.top-right {background-position:11px 0px;float:right;} +#page-header .rounded-corner {background-image:url([[pix:theme|corners_header]]);clear:both;} +#page-header .rounded-corner.top-left {background-position:0px 0px;float:left;} +#page-header .rounded-corner.top-right {background-position:11px 0px;float:right;} /** Fix IE8 + Opera positioning issue **/ -.ie8 .page-header .rounded-corner.top-right, -.opera .page-header .rounded-corner.top-right {position:relative;top:-11px;} +.ie8 #page-header .rounded-corner.top-right, +.opera #page-header .rounded-corner.top-right {position:relative;top:-11px;} -.page-footer {position:relative;} -.page-footer .rounded-corner {position:absolute;background-image:url([[pix:theme|corners_header]]);clear:both;} -.page-footer .rounded-corner.bottom-left {background-position:0px 11px;bottom:0px;left:0px;float:left;} -.page-footer .rounded-corner.bottom-right {background-position:11px 11px;bottom:0px;right:-1px;float:right;} +#page-footer {position:relative;} +#page-footer .rounded-corner {position:absolute;background-image:url([[pix:theme|corners_header]]);clear:both;} +#page-footer .rounded-corner.bottom-left {background-position:0px 11px;bottom:0px;left:0px;float:left;} +#page-footer .rounded-corner.bottom-right {background-position:11px 11px;bottom:0px;right:-1px;float:right;} -.block-region .sideblock {border-width:0px;background-color:white;} +.sideblock {border-width:0px;background-color:white;} .sideblock .corner-box {border:1px solid #C8C9C7;margin-bottom:10px;padding-bottom:10px;background-color:#E3E3E3;} .sideblock .corner-box .rounded-corner {background-image:url([[pix:theme|corners_sideblock]]);position:relative;} .sideblock .corner-box .rounded-corner.top-left {background-position:0px 0px;float:left;top:-1px;left:-1px;} @@ -50,12 +50,12 @@ .gecko .sideblock .corner-box {-webkit-border-radius: 10px;-moz-border-radius: 10px;} .safari .sideblock .corner-box .header, -.safari .page-header, +.safari #page-header, .gecko .sideblock .corner-box .header, -.gecko .page-header {-moz-border-radius: 10px 10px 0px 0px;-webkit-border-top-left-radius:10px;-webkit-border-top-right-radius:10px;} +.gecko #page-header {-moz-border-radius: 10px 10px 0px 0px;-webkit-border-top-left-radius:10px;-webkit-border-top-right-radius:10px;} -.safari .page-footer, -.gecko .page-footer {-moz-border-radius: 0px 0px 10px 10px;-webkit-border-bottom-left-radius:10px;-webkit-border-bottom-right-radius:10px;} +.safari #page-footer, +.gecko #page-footer {-moz-border-radius: 0px 0px 10px 10px;-webkit-border-bottom-left-radius:10px;-webkit-border-bottom-right-radius:10px;} .gecko .forumpost, .gecko .forumpost .side {-moz-border-radius-bottomleft:20px} Index: moodle/theme/anomaly/style/general.css --- moodle/theme/anomaly/style/general.css Base (1.1) +++ moodle/theme/anomaly/style/general.css Locally Modified (Based On 1.1) @@ -6,18 +6,18 @@ img.iconhelp {vertical-align:middle;} html, body {background-color:#C8C9C7;} -#page .page-middle {background-color:#FFF;} -.page-header {background-color: #222; color:#FFF;border-bottom:5px solid #697F55;} -.hasnavbar .page-header {border-bottom-width:0px;} -.page-footer {background-color: #222; color:#FFF;} -.page-header .headermain span {color:#C8C9C7;} +#page #page-content {background-color:#FFF;} +#page-header {background-color: #222; color:#FFF;border-bottom:5px solid #697F55;} +.hasnavbar #page-header {border-bottom-width:0px;} +#page-footer {background-color: #222; color:#FFF;} +#page-header .headermain span {color:#C8C9C7;} -.page-header .navbar {background-color:#697F55;width:100%;} -.page-header .navbar {color:#000;} -.page-header .navbar a:link {color:#fff;} -.page-header .navbar a:visited {color:#fff;} -.page-header .navbar .breadcrumb {margin:5px 1em;float:left;} -.page-header .navbar .navbutton {float:right;margin:5px 1em;} +#page-header .navbar {background-color:#697F55;width:100%;} +#page-header .navbar {color:#000;} +#page-header .navbar a:link {color:#fff;} +#page-header .navbar a:visited {color:#fff;} +#page-header .navbar .breadcrumb {margin:5px 1em;float:left;} +#page-header .navbar .navbutton {float:right;margin:5px 1em;} /** General **/ .generalbox {border: 1px solid #DDDDDD;} @@ -65,13 +65,13 @@ .loginbox .guestsub {margin-left:10%;margin-right:10%;padding:10px;margin-bottom:5px;border-top:1px solid #DDD;} /** Blocks **/ -.block-region .sideblock {border:1px solid #C8C9C7;background-color: #E3E3E3;margin-bottom:10px;overflow:hidden;} -.block-region .sideblock h1, -.block-region .sideblock h2, -.block-region .sideblock h3, -.block-region .sideblock h4 {margin:0px;} -.block-region .sideblock .header {margin:10px 6px 3px 6px;} -.block-region .sideblock .content {margin:10px 6px 3px 6px;} +.sideblock {border:1px solid #C8C9C7;background-color: #E3E3E3;margin-bottom:10px;overflow:hidden;} +.sideblock h1, +.sideblock h2, +.sideblock h3, +.sideblock h4 {margin:0px;} +.sideblock .header {margin:10px 6px 3px 6px;} +.sideblock .content {margin:10px 6px 3px 6px;} /** Admin **/ .box.adminwarning {text-align:center;border:1px solid #C8C9C7;background-color:#E3E3E3;margin-bottom:1em;padding:10px 10%;} @@ -191,10 +191,10 @@ #calendar .filters table {padding:2px;background-color: #EEE;border:1px solid #DDD;border-spacing:2px;border-collapse: separate;} #calendar .filters table td {font-size:100%;width:auto;} #calendar .filters .eventskey {border:1px solid #444;overflow:hidden;} -#calendar .event_global {background-color: #D6F8CD;} -#calendar .event_course {background-color: #FFD3BD;} -#calendar .event_group {background-color: #FEE7AE;} -#calendar .event_user {background-color: #DCE7EC;} +#calendar .calendar_event_global {background-color: #D6F8CD;} +#calendar .calendar_event_course {background-color: #FFD3BD;} +#calendar .calendar_event_group {background-color: #FEE7AE;} +#calendar .calendar_event_user {background-color: #DCE7EC;} #calendar .maincalendar .calendarmonth {border-collapse: separate;} #calendar .maincalendar .calendarmonth th {font-size:0.9em;border-bottom:2px solid #444;} #calendar .maincalendar .calendarmonth td {border:1px solid #EEE;border-bottom-color:#CCC;border-right-color:#CCC;height:6em;} Index: moodle/theme/anomaly/style/layout.css --- moodle/theme/anomaly/style/layout.css Base (1.1) +++ moodle/theme/anomaly/style/layout.css Locally Modified (Based On 1.1) @@ -1,41 +1,3 @@ /** Main Page Layout - Both side have blocks**/ body {margin:25px 3%;} -#page {width:100%;min-width:600px;overflow:hidden;} -.page-header {float:left;margin:0;padding:0;width:100%;} -.page-header .headermain {float:left;margin:15px;font-size:2.3em;line-height:0.7;clear:left;} -.page-header .headermenu {float:right;margin:15px;font-size:0.8em;clear:right;} -.page-header .navbar {clear:both;} -.page-middle {clear:both;float:left;overflow:hidden;position:relative;width:100%;} -.page-middle .column-container {float:left;left:220px;position:relative;width:200%;} -.page-middle .column-container .column-mask {float:left;left:50%;margin-left:-440px;position:relative;width:100%;} -.page-middle .column-container .column-mask .column-centre {float:right;position:relative;right:100%;width:50%;} -.page-middle .column-container .column-mask .column-centre .column-wrap {margin:0 10px 0 430px;overflow:hidden;} -.page-middle .column-container .column-mask .column-left {float:left;left:220px;margin-left:-50%;overflow:hidden;position:relative;width:200px;} -.page-middle .column-container .column-mask .column-right {float:left;left:15px;overflow:hidden;position:relative;width:200px;} -.page-middle .column-container .column-content {overflow:hidden;margin:10px;} -.page-footer {clear:both;float:left;margin:0;padding:0;width:100%;} -.page-footer .logininfo {float:right;margin:0px 10px;} -.page-footer .sitelink {float:left;margin:0px 10px;} -.page-footer .helplink {float:left;margin:0px 10px;} -.page-footer .performanceinfo {text-align:center;margin:10px 20%;} -.page-footer .performanceinfo span {display:block;} - -/** Only side pre **/ -.side-pre-only .page-middle .column-container .column-mask {margin-left:-220px;} -.side-pre-only .page-middle .column-container .column-mask .column-centre .column-wrap {margin:0 10px 0 210px;} -.side-pre-only .page-middle .column-container .column-mask .column-left {left:10px;} -.side-pre-only .page-middle .column-container .column-mask .column-right {width:0px;} - -/** Only side post **/ -.side-post-only .page-middle .column-container {left:0px;} -.side-post-only .page-middle .column-container .column-mask {margin-left:-220px;} -.side-post-only .page-middle .column-container .column-mask .column-centre .column-wrap {margin:0 10px 0 210px;} -.side-post-only .page-middle .column-container .column-mask .column-left {width:0px;} -.has_dock.side-post-only .page-middle .column-container .column-mask .column-centre .column-wrap {margin-left:240px;} - -/** No blocks whatsoever **/ -.noblocks .page-middle .column-container {left:20px;} -.noblocks .page-middle .column-container .column-mask {margin-left:-30px;} -.noblocks .page-middle .column-container .column-mask .column-centre .column-wrap {margin:0 10px 0 30px;} -.noblocks .page-middle .column-container .column-mask .column-left {left:20px;width:0px;} -.noblocks .page-middle .column-container .column-mask .column-right {width:0px;} +#page {min-width:600px;} Index: moodle/theme/base/config.php --- moodle/theme/base/config.php Base (1.7) +++ moodle/theme/base/config.php Locally Modified (Based On 1.7) @@ -15,7 +15,6 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - /** * Configuration for Moodle's standard theme. * @@ -33,15 +32,21 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +$THEME->name = 'base'; $THEME->parents = array(); $THEME->sheets = array( - 'pagelayout', - 'core', + 'pagelayout', /** Must come first: Page layout **/ + 'core', /** Must come second: General styles **/ + 'admin', 'blocks', + 'calendar', 'course', - 'block_calendar_month', + 'grade', + 'message', + 'question', + 'user' ); $THEME->editor_sheets = array(); @@ -151,4 +156,4 @@ /** List of javascript files that need to included on each page */ $THEME->javascripts = array(); -$THEME->javascripts_footer = array('navigation'); +$THEME->javascripts_footer = array(); Index: moodle/theme/base/javascript/navigation.js --- moodle/theme/base/javascript/navigation.js Base (1.3) +++ moodle/theme/base/javascript/navigation.js Locally Deleted @@ -1,116 +0,0 @@ -/** - * So you want to override the navigation huh ?? - * Make it look like your own and totally customise it to be way cool !! - * - * Well now you can by following the instructions in this file. - * - * It will be essential to have a clear idea about what it is you want to acheive, - * whilst it is possible to override nearly all of the navbar settings/methods it's - * not nesecarily going to be an easy task. - * - * To begin you must understand the structure of the blocks and particually the navbar - * object. The following outlines the basic structure: - * - * - Namespace: blocks - * - Func: setup_generic_block Creates a new generic block instance - * - Class: genericblock Generic block class - * - Namespace: navbar - * - Var: count The # of items that have EVER existed on the navbar - * - Var: exists True if the navbar exists - * - Var: items An array of items on the navbar - * - Var: node The node that is the navbar - * - Var: strings An object containing strings for the navbar - * - Namespace: cfg - * - Var: buffer The space buffer around panels - * - Var: position The position of the navbar - * - Var: orientation The orientation of the navbar - * - Namespace: display - * ............ A series of display parameters - * - Namespace: css - * ............ A series of CSS class names - * - Namespace: panel - * ............ A series of conf options for YUI panels - * - Func: add Adds an item to the navbar - * - Func: draw Creates the navbar and adds it to the page - * - Func: remove Removes an item from the navbar - * - Func: remove_all Removes all items from the navbar - * - Func: resize Calls the navbar to resize its active item - * - Func: hide_all Calls the navbar to hide all active items - * - Class: item A navbar item class - * - Namespace: abstract_block_class A namespace containing all of the properties - * ............. and methods that will be used as the default - * ............. methods for the generic block class. - * - Namespace: abstract_item_class A namespace containing all of the properties - * ............. and methods for the navbar item class - * - * From the structure above you are able to immediatly override any of the vars - * that are associated with the navigation by simply assigning them a value as - * shown below: - * - * blocks.navbar.cfg.buffer = 20; // or - * - * You are also able to override all of the properties and methods of the two - * abstract classes that manage all of the interaction for the blocks and navbar - * items thanks to the prototyping method that is being used to build the classes. - * - * To override a method simply copy the following style of coding: - * - * blocks.genericblock.prototype.init = function(uid) { - * // The code for the new init method which will be executed in the - * // objects scope and override the old init method. - * } - * - * // OR if the following is easier for you to understand - * - * function new_init_method(uid) { - * // The code for the new init method which will be executed in the - * // objects scope and override the old init method. - * } - * blocks.genericblock.prototype.init = new_init_method() - * - * Alternativily for the navbar items class the there are a series of actions that - * get fired that you may want to listen to. The events defined are as follows: - * - * navbaritem:drawstart draw is called - * navbaritem:drawcomplete draw is complete - * navbaritem:showstart show is called - * navbaritem:showcomplete show is complete - * navbaritem:hidestart hide is called - * navbaritem:hidecomplete hide is complete - * navbaritem:resizestart resize is called - * navbaritem:resizecomplete resize is complete - * navbaritem:itemremoved item is removed from the navbar - * - * You can listen to any of these events by first finding the appropriate item within - * the navbar.items array and then calling the following on it: - * - * var uid = x; - * blocks.navbar.items[uid].on('navbaritem:showstart', callback, scope); - * function callback(navbaritem) { - * // What ever you want to do can go here - * } - * - */ - -// If this isn't set we don't need an override at all -if (typeof(blocks)=='object' && blocks.genericblock) { - - /** - * Override the default resize_block_space method so that we can ensure - * it works for this template - * @param {Y.Node} blocknode - */ - blocks.genericblock.prototype.resize_block_space = function(blocknode) { - var blockregion = blocknode.ancestor('#block-region'); - if (blockregion) { - if (blockregion.all('.sideblock').size() === 0 && this.blockspacewidth === null) { - // Some spiffy code to reduce the template sideblock to 0 width - this.blockspacewidth = blockregion.getStyle('width'); - } else if (this.blockspacewidth !== null) { - // Some spiffy code to set the sideblock width back to the original width - this.blockspacewidth = null; - } - } - } - -} Index: moodle/theme/base/layout/embedded.php --- moodle/theme/base/layout/embedded.php Base (1.2) +++ moodle/theme/base/layout/embedded.php Locally Modified (Based On 1.2) @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
Index: moodle/theme/base/layout/frontpage.php --- moodle/theme/base/layout/frontpage.php Base (1.2) +++ moodle/theme/base/layout/frontpage.php Locally Modified (Based On 1.2) @@ -1,12 +1,16 @@ blocks->region_has_content('side-pre', $OUTPUT)) { - $regionsinfo .= '-pre'; +$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT); +$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT); + +$bodyclasses = array(); +if ($hassidepre && !$hassidepost) { + $bodyclasses[] = 'side-pre-only'; +} else if ($hassidepost && !$hassidepre) { + $bodyclasses[] = 'side-post-only'; +} else if (!$hassidepost && !$hassidepre) { + $bodyclasses[] = 'content-only'; } -if ($PAGE->blocks->region_has_content('side-post', $OUTPUT)) { - $regionsinfo .= '-post'; -} echo $OUTPUT->doctype() ?> htmlattributes() ?>> @@ -16,12 +20,12 @@ standard_head_html() ?> - + standard_top_of_body_html() ?> -
+
-
+

heading ?>

login_info(); @@ -31,30 +35,36 @@
-
+
-
-
-
+
+
+
+
- blocks->region_has_content('side-pre', $OUTPUT)) { ?> -
+
+ +
+
blocks_for_region('side-pre') ?>
+
- blocks->region_has_content('side-post', $OUTPUT)) { ?> -
+ +
+
blocks_for_region('side-post') ?>
+
-
'; +echo '
'; echo ''; echo '
'; echo $OUTPUT->user_picture($user, array('courseid'=>$course->id, 'size'=>100));