# 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/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,8 @@ +.block_calendar_month table.minicalendar {width:100%;margin:10px auto;} +.block_calendar_month table.minicalendar th, +.block_calendar_month table.minicalendar td {padding:2px;width:14%;font-size:0.8em;text-align:center;} +.block_calendar_month table.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%;} 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/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;} +.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 @@ +.sideblock .content .list li.listentry {clear:both;} 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 @@ +.sideblock .content .list li.listentry {clear:both;} 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/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,3 @@ +.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;} 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;} +.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/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/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,5 @@ +.course-content ul.weeks {margin:0;} +.course-content ul.weeks li.section {} +.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;} Index: moodle/course/lib.php --- moodle/course/lib.php Base (1.720) +++ moodle/course/lib.php Locally Modified (Based On 1.720) @@ -2169,9 +2169,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/tree/index.php --- moodle/grade/edit/tree/index.php Base (1.61) +++ moodle/grade/edit/tree/index.php Locally Modified (Based On 1.61) @@ -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/lib/pagelib.php --- moodle/lib/pagelib.php Base (1.173) +++ moodle/lib/pagelib.php Locally Modified (Based On 1.173) @@ -1230,6 +1230,7 @@ } if (!empty($this->_cm)) { + $this->add_body_class('mod-'.$this->cm->modname); $this->add_body_class('cmid-' . $this->_cm->id); } 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 **/ +.mod-assignment .userpicture, +.mod-assignment .picture.user, +.mod-assignment .picture.teacher {width:35px;height: 35px;vertical-align:top;} +.mod-assignment .feedback .files, +.mod-assignment .feedback .grade, +.mod-assignment .feedback .outcome, +.mod-assignment .feedback .finalgrade {float: right;} +.mod-assignment .feedback .disabledfeedback {width: 500px;height: 250px;} +.mod-assignment .feedback .from {float: left;} +.mod-assignment .files img {margin-right: 4px;} +.mod-assignment .files a {white-space:nowrap;} + +/** Styles for submissions.php **/ +#mod-assignment-submissions form#options div {text-align:right;margin-left:auto;margin-right:20px;} +#mod-assignment-submissions .header .commands {display: inline;} +#mod-assignment-submissions .picture {width: 35px;} +#mod-assignment-submissions .fullname, +#mod-assignment-submissions .timemodified, +#mod-assignment-submissions .timemarked {text-align: left;} +#mod-assignment-submissions .submissions .grade, +#mod-assignment-submissions .submissions .outcome, +#mod-assignment-submissions .submissions .finalgrade {text-align: right;} +#mod-assignment-submissions .qgprefs #optiontable {text-align:right;margin-left:auto;} + +/** Styles for view.php **/ +#mod-assignment-view .feedback {margin:10px auto;} +#mod-assignment-view .feedback .grade {text-align: right;} +#mod-assignment-view #online .singlebutton {text-align: center;} +#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 **/ +.mod-chat .chat-event .picture, +.mod-chat .chat-message .picture {width:40px;vertical-align:top;} +.mod-chat .chat-event .text, +.mod-chat .chat-message .text {text-align: left;} +.mod-chat #messages-list, +.mod-chat #users-list {list-style-type:none;padding:0;margin:0} +.mod-chat #chat-header {overflow: hidden;} + +/** styles for view.php **/ +#mod-chat-view #chatcurrentusers .chatuserdetails {vertical-align: middle;} + +/** Styles for basic chat **/ +#mod-chat-gui_basic #participants ul {margin:0;padding:0;list-style-type:none;} +#mod-chat-gui_basic #participants ul li {display:inline;margin-right:10px;} +#mod-chat-gui_basic #participants ul li .userinfo {display:inline;} +#mod-chat-gui_basic #messages dl {padding:0;margin:1px;} +#mod-chat-gui_basic #messages dd, +#mod-chat-gui_basic #messages dt {margin-left:0;margin-right:5px;padding:0;display:inline;} + +/** Styles for header **/ +#mod-chat-gui_header_js-jsupdate .chat-event, +#mod-chat-gui_header_js-jsupdate .chat-message {width:100%;} + +/** YUI Overrides **/ +.mod-chat .yui-layout-unit-top {background: #FFE39D;} +.mod-chat .yui-layout-unit-right {border-top: 5px solid white;background: #FFD46B;} +.mod-chat .yui-layout-unit-bottom {border-top: 5px solid white;background: #FFCB44;} +.mod-chat .yui-layout .yui-layout-hd {border:0;} +.mod-chat .yui-layout .yui-layout-unit div.yui-layout-bd {border:0;background: transparent;} +.mod-chat .yui-layout .yui-layout-unit div.yui-layout-unit-right {background: white;} +.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 @@ +.mod-choice .results {border-collapse: separate;} +.mod-choice .results .data {vertical-align:top;white-space: nowrap;} +.mod-choice .button {text-align:center;} +.mod-choice .attemptcell {width:5px;white-space: nowrap;} +.mod-choice .anonymous, +.mod-choice .names {margin-left:auto;margin-right:auto;} +.mod-choice .downloadreport {border-width:0;margin-left:auto;margin-right:auto;} +.mod-choice .choiceresponse {width:100%;} +.mod-choice .choiceresponse .picture {width:10px;white-space: nowrap;} +.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 @@ +.mod-data .fieldadd, +.mod-data .sortdefault, +.mod-data .defaulttemplate, +#mod-data-view .datapreferences, +#mod-data-preset .presetmapping{text-align:center;} + +.mod-data-field .c0, +#mod-data-view #sortsearch .c0 {text-align: right;} +#mod-data-view .approve img.icon {width:34px;height:34px;} + +/** Styles for preset.php **/ +#mod-data-preset .presetmapping table {text-align: left;margin-left: auto;margin-right: auto;} +#mod-data-preset .overwritesettings {margin-bottom: 1em;} +#mod-data-preset table.presets {margin-left: auto;margin-right: auto;} + +/** Styles for field.php **/ +.mod-data-field .fieldadd, +.mod-data-field .sortdefault {margin:1em 0;} +.mod-data-field .fieldadd select, +.mod-data-field .sortdefault select {margin-left: 1em;} +.mod-data-field .fieldname, +.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 **/ +.mod-forum .forumpost {border-width:1px;border-style:solid;border-collapse:separate;margin-top: 10px;} +.mod-forum .forumpost .topic {padding: 4px;border-style:solid;border-width: 0px;border-bottom-width: 1px;} +.mod-forum .forumpost .commands, +.mod-forum .forumpost .ratings, +.mod-forum .forumpost .attachments, +.mod-forum .forumpost .footer, +.mod-forum .forumpost .link, +.mod-forum .forumolddiscuss, +#mod-forum-search .c0 {text-align:right;} +.mod-forum .forumpost .left {width: 35px;vertical-align: top;} +.mod-forum .indent {margin-left: 30px;} +.mod-forum .forumheaderlist {width: 100%;border-width:1px;border-style:solid;border-collapse:separate;margin-top: 10px;} +.mod-forum .forumheaderlist td {border-width:1px 0px 0px 1px;border-style:solid;} +.mod-forum .forumheaderlist .picture {width: 35px;} +.mod-forum .forumheaderlist .discussion .starter {vertical-align: middle;} +.mod-forum .forumheaderlist .discussion .lastpost {white-space: nowrap;text-align: right;} +.mod-forum .forumheaderlist .replies, +.mod-forum .forumheaderlist .discussion .author {white-space: nowrap;} + +/** Styles for subscribers.php */ +#mod-forum-subscribers .subscriberdiv, +#mod-forum-subscribers .subscribertable {width:100%;vertical-align:top;} +#mod-forum-subscribers .subscribertable tr td {vertical-align:top;} +#mod-forum-subscribers .subscribertable tr td.actions {width:16%;padding-top:3em;} +#mod-forum-subscribers .subscribertable tr td.actions .actionbutton {margin:0.3em 0;padding:0.5em 0;width:100%;} +#mod-forum-subscribers .subscribertable tr td.existing, +#mod-forum-subscribers .subscribertable tr td.potential {width:42%;} + +/** Styles for discuss.php **/ +#mod-forum-discuss .discussioncontrols td {width: 33%;text-align:center;} + +/** Styles for view.php **/ +#mod-forum-view .forumaddnew {margin-bottom: 20px;} +#mod-forum-view .groupmenu {float: left;text-align:left;white-space: nowrap;} +#mod-forum-index .subscription, +#mod-forum-view .subscription {float: right;text-align:right;white-space: nowrap;margin: 5px 0;} + +/** Styles for search.php */ +#mod-forum-search .introcontent {padding: 15px;font-weight:bold;} + +#mod-forum-index .unread img, +#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 **/ +.mod-glossary .glossarypost {border-collapse:separate;margin:5px auto;text-align: left;} +.mod-glossary .glossarypost.entrylist {border-width:0px;} +.mod-glossary .glossarypost.continuous .concept {display: inline;} +.mod-glossary .glossarypost .commands {width: 200px;white-space: nowrap;} +.mod-glossary .glossarypost .picture {width: 35px;} +.mod-glossary .glossarypost .entrylowersection .aliases {text-align:center;} +.mod-glossary .glossarypost .entrylowersection .icons {text-align:right;padding-right: 5px;} +.mod-glossary .glossarypost .entrylowersection .ratings {text-align:right;padding-right: 5px;padding-bottom: 2px;} + +.mod-glossary .glossarydisplay {margin-left:auto;margin-right:auto;} +.mod-glossary .glossarydisplay .tabs {width: 100%;margin-bottom: 0px;} +.mod-glossary .glossarydisplay .tabs .side {border-style: none;border-width: 0px;width: auto;} +.mod-glossary .glossarydisplay .separator {width: 4px;} + +.mod-glossary table.glossarypopup {width: 95%;} +.mod-glossary .entrybox, /** Used in tabs.php **/ +.mod-glossary table.glossaryapproval, +.mod-glossary .glossarypost .entrylowersection table{width: 100%;} + +/** Page specific styles **/ +#mod-glossary-view .glossarycontrol {float: right;text-align:right;white-space: nowrap;margin: 5px 0;} +#mod-glossary-view table.glossarycategoryheader, +#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) **/ +.mod-lesson .contents, +.mod-lesson .standardtable, +.mod-lesson .mform .box.contents, +.mod-lesson .invisiblefieldset.fieldsetfix tr {text-align: left;} +.mod-lesson #layout-table {width: 100%;} +.mod-lesson .edit_buttons form, +.mod-lesson .edit_buttons input {display: inline;} +.mod-lesson .userinfotable .cell, +.mod-lesson .userinfotable .userpicture {vertical-align: middle;} +.mod-lesson .invisiblefieldset.fieldsetfix {display: block;} +.mod-lesson .slideshow {overflow: auto;padding: 15px;} +.mod-lesson .menu .menuwrapper {max-height: 400px;overflow: auto;vertical-align: top;margin-bottom: 10px;} +.mod-lesson .menu ul {list-style: none;padding: 5px 0px 0px 5px;margin: 0px;} +.mod-lesson .menu ul li {padding-bottom: 5px;} +.mod-lesson .skip {position: absolute;left: -1000em;width: 20em;} +.mod-lesson .branchbuttoncontainer.horizontal div, +.mod-lesson .branchbuttoncontainer.horizontal form {display: inline;} +.mod-lesson .firstpageoptions {width:30%;margin-left:35%;margin-top:1em;} +.mod-lesson .progress_bar_table, +.mod-lesson .progress_bar_completed, +.mod-lesson .progress_bar_todo {padding: 0;margin: 0;} +.mod-lesson .progress_bar_token {height: 20px;width: 5px;padding: 0;margin: 0;} +.mod-lesson .edit_pages_box .addlinks {margin:0;margin-bottom:1em;} + +/** + * Style for view.php + **/ +#mod-lesson-view .password-form .submitbutton {display: inline;} 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 @@ +#mod-resource-view .resourcecontent.resourcepdf {width: 100%;} +.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 @@ +.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 #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-player #scormbox {width: 74%;position: absolute;right: 0px;top: 0px;} +#mod-scorm-player #scormpage {position: relative;width: 100%;} +#mod-scorm-player #scormpage #toctree {position:relative;width:100%;overflow-x: auto;overflow-y: auto;} +#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;} + +#mod-scorm-player .toc, +#mod-scorm-player .no-toc {width: 100%;} +#mod-scorm-player .structlist {list-style-type: none;white-space: nowrap;} +#mod-scorm-player .structurelist {position: relative;list-style-type: none;width: 96%;margin:0;padding: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;} +#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.88) +++ moodle/mod/survey/lib.php Locally Modified (Based On 1.88) @@ -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 @@ +.mod-survey .smalltext {font-size: 0.75em;} + +.mod-survey .surveytable .rblock label {display: block;} +.mod-survey .surveytable .foundthat, +.mod-survey .surveytable .preferthat {white-space: nowrap;} +.mod-survey .surveytable .buttoncell {width:5%;} +.mod-survey .surveytable .optioncell, +.mod-survey .surveytable .questioncell {width:50%;vertical-align:top;} +.mod-survey .surveytable .whitecell {background-color:white;} + +.mod-survey #surveyform th {font-weight: normal;text-align: left;} +.mod-survey #surveyform th.hresponse {text-align: center;width: 9%;} + +#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 @@ +.mod-wiki .sideblockheading, +.mod-wiki .howtowiki {text-align:right;} +.mod-wiki .wikisearchform, +.mod-wiki .wikilinksblock, +.mod-wiki .wikiadminactions {text-align:center;} +.mod-wiki .wikilinkright {text-align:right;padding-bottom: 0.5em;} +.mod-wiki .wikiexportbox {margin-left:auto;margin-right:auto;} 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/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%;} 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) @@ -41,6 +41,8 @@ 'core', 'blocks', 'course', + 'module', + 'browser', 'block_calendar_month', ); 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') ?>
+
-