From 90723839ca88d09fe0b75a499bdea88367e737fc Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Thu, 25 Mar 2010 06:38:21 +0000 Subject: [PATCH] themes MDL-21862 Implements base theme and standard theme. Very big theme changes, standardold theme has been split into two themes base and standard. Base theme contains only CSS that is absolutly required (e.g. layout, white space rules, specific widths) and standard (which now looks like standardwhite) contains all the frills. The following noteable changes have also been made: * Plugin CSS has been pushed back into the plugin directories as styles.css files. * Install_print_header has been corrected. * Redundant or deprecated rules have been removed. * Several minor class changes throughout Moodle. * CSS is now single line rules not multiline indented. * Installs with theme=standardold automatically switch to standard. * body classes / id now have prefixes to make it clearer what they are and avoid conflicts. Also worth noting: * There is still alot of tweaking that is required to get everything looking as it is supposed to, please be patient or better yet help out. * I am currently working on the documentation for the themes system... it will be here soon. --- admin/blocks.php | 8 +- admin/enrol.php | 2 +- admin/report/capability/index.php | 2 +- blocks/admin_tree/styles.css | 5 + blocks/blog_tags/styles.css | 20 + blocks/calendar_month/styles.css | 11 + blocks/calendar_month/styles.php | 23 - blocks/calendar_upcoming/styles.css | 1 + blocks/course_list/styles.css | 1 + blocks/course_summary/styles.css | 2 + blocks/course_summary/styles.php | 7 - blocks/dock.js | 15 +- blocks/global_navigation_tree/styles.css | 22 + blocks/messages/styles.css | 4 + blocks/online_users/styles.css | 3 + blocks/quiz_results/styles.css | 6 + blocks/recent_activity/styles.css | 2 + blocks/rss_client/styles.php | 54 -- blocks/search_forums/styles.css | 4 + blocks/settings_navigation_tree/styles.css | 22 + blocks/tag_flickr/styles.css | 1 + blocks/tag_youtube/styles.css | 2 + blocks/tags/styles.css | 11 + blocks/tags/styles.php | 116 ---- calendar/event.php | 2 +- calendar/export.php | 2 +- calendar/lib.php | 71 +- calendar/view.php | 33 +- course/format/topics/styles.css | 6 + course/format/weeks/styles.css | 6 + course/lib.php | 6 +- grade/edit/outcome/import.php | 2 +- grade/edit/tree/index.php | 2 +- grade/report/user/styles.css | 36 + grade/report/user/styles.php | 121 ---- lib/adminlib.php | 2 +- lib/db/upgrade.php | 16 + lib/installlib.php | 23 +- lib/outputlib.php | 3 +- lib/pagelib.php | 18 +- mod/assignment/styles.css | 30 + mod/chat/styles.css | 32 + mod/choice/styles.css | 10 + mod/data/styles.css | 22 + mod/data/styles.php | 49 -- mod/feedback/styles.php | 9 - mod/forum/styles.css | 48 ++ mod/glossary/styles.css | 24 + mod/lesson/styles.css | 29 + mod/quiz/styles.css | 338 +++++++++ mod/resource/styles.css | 5 + mod/scorm/styles.css | 24 + mod/scorm/styles.php | 296 -------- mod/survey/lib.php | 2 +- mod/survey/styles.css | 14 + mod/wiki/styles.css | 7 + mod/wiki/wiki_styles.php | 108 --- pix/t/block_to_dock.png | Bin 246 -> 236 bytes pix/t/dock_to_block.png | Bin 248 -> 238 bytes tag/coursetags_edit.php | 4 +- tag/index.php | 2 +- tag/manage.php | 2 - theme/anomaly/layout/general.php | 35 +- theme/anomaly/style/base.css | 47 +- theme/anomaly/style/browser.css | 28 +- theme/anomaly/style/general.css | 44 +- theme/anomaly/style/layout.css | 40 +- theme/base/config.php | 15 +- theme/base/javascript/navigation.js | 116 ---- theme/base/layout/embedded.php | 2 +- theme/base/layout/frontpage.php | 52 +- theme/base/layout/general.php | 82 ++- theme/base/style/admin.css | 151 ++++ theme/base/style/block_calendar_month.css | 29 - theme/base/style/blocks.css | 149 +--- theme/base/style/calendar.css | 39 ++ theme/base/style/core.css | 651 +++++++++++++----- theme/base/style/course.css | 88 +++ theme/base/style/grade.css | 31 + theme/base/style/message.css | 32 + theme/base/style/pagelayout.css | 215 ++---- theme/base/style/question.css | 76 ++ theme/base/style/user.css | 43 ++ theme/standard/config.php | 19 + theme/standard/javascript/navigation.js | 43 ++ theme/standard/pix/favicon.ico | Bin 0 -> 894 bytes theme/standard/pix/hgradient.jpg | Bin 0 -> 346 bytes theme/standard/pix/tab/left.gif | Bin 0 -> 293 bytes theme/standard/pix/tab/left_active.gif | Bin 0 -> 178 bytes theme/standard/pix/tab/left_active_hover.gif | Bin 0 -> 206 bytes theme/standard/pix/tab/left_hover.gif | Bin 0 -> 292 bytes theme/standard/pix/tab/right.gif | Bin 0 -> 3297 bytes theme/standard/pix/tab/right_active.gif | Bin 0 -> 905 bytes theme/standard/pix/tab/right_active_hover.gif | Bin 0 -> 803 bytes theme/standard/pix/tab/right_end.gif | Bin 0 -> 69 bytes theme/standard/pix/tab/right_hover.gif | Bin 0 -> 2730 bytes theme/standard/pix/tab/right_last.gif | Bin 0 -> 2381 bytes theme/standard/pix/tab/rtlbg.gif | Bin 0 -> 770 bytes theme/standard/pix/tab/tabrow1.gif | Bin 0 -> 269 bytes theme/standard/pix/vgradient.jpg | Bin 0 -> 342 bytes theme/standard/style/admin.css | 145 ++++ theme/standard/style/blocks.css | 84 +++ theme/standard/style/calendar.css | 60 ++ theme/standard/style/core.css | 355 ++++++++++ theme/standard/style/course.css | 87 +++ theme/standard/style/css3.css | 239 +++++++ theme/standard/style/dock.css | 50 ++ theme/standard/style/grade.css | 34 + theme/standard/style/message.css | 31 + theme/standard/style/modules.css | 193 ++++++ theme/standard/style/question.css | 31 + user/view.php | 2 +- version.php | 2 +- 113 files changed, 3425 insertions(+), 1663 deletions(-) create mode 100644 blocks/admin_tree/styles.css create mode 100644 blocks/blog_tags/styles.css create mode 100644 blocks/calendar_month/styles.css delete mode 100644 blocks/calendar_month/styles.php create mode 100644 blocks/calendar_upcoming/styles.css create mode 100644 blocks/course_list/styles.css create mode 100644 blocks/course_summary/styles.css delete mode 100644 blocks/course_summary/styles.php create mode 100644 blocks/global_navigation_tree/styles.css create mode 100644 blocks/messages/styles.css create mode 100644 blocks/online_users/styles.css create mode 100644 blocks/quiz_results/styles.css create mode 100644 blocks/recent_activity/styles.css delete mode 100644 blocks/rss_client/styles.php create mode 100644 blocks/search_forums/styles.css create mode 100644 blocks/settings_navigation_tree/styles.css create mode 100644 blocks/tag_flickr/styles.css create mode 100644 blocks/tag_youtube/styles.css create mode 100644 blocks/tags/styles.css delete mode 100644 blocks/tags/styles.php create mode 100644 course/format/topics/styles.css create mode 100644 course/format/weeks/styles.css create mode 100644 grade/report/user/styles.css delete mode 100644 grade/report/user/styles.php create mode 100644 mod/assignment/styles.css create mode 100644 mod/chat/styles.css create mode 100644 mod/choice/styles.css create mode 100644 mod/data/styles.css delete mode 100644 mod/data/styles.php delete mode 100644 mod/feedback/styles.php create mode 100644 mod/forum/styles.css create mode 100644 mod/glossary/styles.css create mode 100644 mod/lesson/styles.css create mode 100644 mod/quiz/styles.css create mode 100644 mod/resource/styles.css create mode 100644 mod/scorm/styles.css delete mode 100644 mod/scorm/styles.php create mode 100644 mod/survey/styles.css create mode 100644 mod/wiki/styles.css delete mode 100644 mod/wiki/wiki_styles.php delete mode 100644 theme/base/javascript/navigation.js create mode 100644 theme/base/style/admin.css delete mode 100644 theme/base/style/block_calendar_month.css create mode 100644 theme/base/style/calendar.css create mode 100644 theme/base/style/course.css create mode 100644 theme/base/style/grade.css create mode 100644 theme/base/style/message.css create mode 100644 theme/base/style/question.css create mode 100644 theme/base/style/user.css create mode 100644 theme/standard/config.php create mode 100644 theme/standard/javascript/navigation.js create mode 100644 theme/standard/pix/favicon.ico create mode 100644 theme/standard/pix/hgradient.jpg create mode 100644 theme/standard/pix/tab/left.gif create mode 100644 theme/standard/pix/tab/left_active.gif create mode 100644 theme/standard/pix/tab/left_active_hover.gif create mode 100644 theme/standard/pix/tab/left_hover.gif create mode 100644 theme/standard/pix/tab/right.gif create mode 100644 theme/standard/pix/tab/right_active.gif create mode 100644 theme/standard/pix/tab/right_active_hover.gif create mode 100644 theme/standard/pix/tab/right_end.gif create mode 100644 theme/standard/pix/tab/right_hover.gif create mode 100755 theme/standard/pix/tab/right_last.gif create mode 100755 theme/standard/pix/tab/rtlbg.gif create mode 100755 theme/standard/pix/tab/tabrow1.gif create mode 100644 theme/standard/pix/vgradient.jpg create mode 100644 theme/standard/style/admin.css create mode 100644 theme/standard/style/blocks.css create mode 100644 theme/standard/style/calendar.css create mode 100644 theme/standard/style/core.css create mode 100644 theme/standard/style/course.css create mode 100644 theme/standard/style/css3.css create mode 100644 theme/standard/style/dock.css create mode 100644 theme/standard/style/grade.css create mode 100644 theme/standard/style/message.css create mode 100644 theme/standard/style/modules.css create mode 100644 theme/standard/style/question.css diff --git a/admin/blocks.php b/admin/blocks.php index 66789755edb..a8718a6c58a 100644 --- a/admin/blocks.php +++ b/admin/blocks.php @@ -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(); diff --git a/admin/enrol.php b/admin/enrol.php index 91af6759716..63f655aa28c 100644 --- a/admin/enrol.php +++ b/admin/enrol.php @@ -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 enrolplugintable'; $table->data = array(); $enabledplugins = explode(',', $CFG->enrol_plugins_enabled); diff --git a/admin/report/capability/index.php b/admin/report/capability/index.php index c349528ad9e..d9171da82fb 100644 --- a/admin/report/capability/index.php +++ b/admin/report/capability/index.php @@ -67,7 +67,7 @@ if (count($cleanedroleids) == count($allroles)) { } // 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') , '

'; diff --git a/blocks/admin_tree/styles.css b/blocks/admin_tree/styles.css new file mode 100644 index 00000000000..80221ef5060 --- /dev/null +++ b/blocks/admin_tree/styles.css @@ -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;} \ No newline at end of file diff --git a/blocks/blog_tags/styles.css b/blocks/blog_tags/styles.css new file mode 100644 index 00000000000..5df71654d46 --- /dev/null +++ b/blocks/blog_tags/styles.css @@ -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;} \ No newline at end of file diff --git a/blocks/calendar_month/styles.css b/blocks/calendar_month/styles.css new file mode 100644 index 00000000000..db2657e7e95 --- /dev/null +++ b/blocks/calendar_month/styles.css @@ -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;} \ No newline at end of file diff --git a/blocks/calendar_month/styles.php b/blocks/calendar_month/styles.php deleted file mode 100644 index 9ae6d96e69f..00000000000 --- a/blocks/calendar_month/styles.php +++ /dev/null @@ -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; -} diff --git a/blocks/calendar_upcoming/styles.css b/blocks/calendar_upcoming/styles.css new file mode 100644 index 00000000000..bd104119d87 --- /dev/null +++ b/blocks/calendar_upcoming/styles.css @@ -0,0 +1 @@ +.block_calendar_upcoming .event .date {text-align:right;} \ No newline at end of file diff --git a/blocks/course_list/styles.css b/blocks/course_list/styles.css new file mode 100644 index 00000000000..26b2428c080 --- /dev/null +++ b/blocks/course_list/styles.css @@ -0,0 +1 @@ +.block_course_list .footer {margin-top: 5px;} \ No newline at end of file diff --git a/blocks/course_summary/styles.css b/blocks/course_summary/styles.css new file mode 100644 index 00000000000..7c58b8d3615 --- /dev/null +++ b/blocks/course_summary/styles.css @@ -0,0 +1,2 @@ +.block_course_summary .content {padding:10px;} +.block_course_summary .editbutton {text-align:right;} \ No newline at end of file diff --git a/blocks/course_summary/styles.php b/blocks/course_summary/styles.php deleted file mode 100644 index 0c71c3d38f8..00000000000 --- a/blocks/course_summary/styles.php +++ /dev/null @@ -1,7 +0,0 @@ -.block_course_summary .content { - padding:10px; -} - -.block_course_summary .editbutton { - text-align:right; -} diff --git a/blocks/dock.js b/blocks/dock.js index 295958d20f4..811c27b99fd 100644 --- a/blocks/dock.js +++ b/blocks/dock.js @@ -369,6 +369,12 @@ M.core_dock = { 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 @@ M.core_dock = { 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 @@ M.core_dock = { 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 @@ M.core_dock.genericblock.prototype.fix_title_orientation = M.core_dock.abstrac * @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 @@ M.core_dock.item = function(Y, uid, title, contents, commands){ 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.active = M.core_dock.abstract_item_class. 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 **/ diff --git a/blocks/global_navigation_tree/styles.css b/blocks/global_navigation_tree/styles.css new file mode 100644 index 00000000000..066e25f6ee1 --- /dev/null +++ b/blocks/global_navigation_tree/styles.css @@ -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%;} \ No newline at end of file diff --git a/blocks/messages/styles.css b/blocks/messages/styles.css new file mode 100644 index 00000000000..da66e10ff9c --- /dev/null +++ b/blocks/messages/styles.css @@ -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;} \ No newline at end of file diff --git a/blocks/online_users/styles.css b/blocks/online_users/styles.css new file mode 100644 index 00000000000..26640042994 --- /dev/null +++ b/blocks/online_users/styles.css @@ -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;} \ No newline at end of file diff --git a/blocks/quiz_results/styles.css b/blocks/quiz_results/styles.css new file mode 100644 index 00000000000..1a3fabc0cb7 --- /dev/null +++ b/blocks/quiz_results/styles.css @@ -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;} \ No newline at end of file diff --git a/blocks/recent_activity/styles.css b/blocks/recent_activity/styles.css new file mode 100644 index 00000000000..93625406be7 --- /dev/null +++ b/blocks/recent_activity/styles.css @@ -0,0 +1,2 @@ +.block_recent_activity .activitydate, +.block_recent_activity .activityhead {text-align:center;} \ No newline at end of file diff --git a/blocks/rss_client/styles.php b/blocks/rss_client/styles.php deleted file mode 100644 index 35298cfd207..00000000000 --- a/blocks/rss_client/styles.php +++ /dev/null @@ -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; -} diff --git a/blocks/search_forums/styles.css b/blocks/search_forums/styles.css new file mode 100644 index 00000000000..f424ebf641d --- /dev/null +++ b/blocks/search_forums/styles.css @@ -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;} \ No newline at end of file diff --git a/blocks/settings_navigation_tree/styles.css b/blocks/settings_navigation_tree/styles.css new file mode 100644 index 00000000000..ab56a3b1e42 --- /dev/null +++ b/blocks/settings_navigation_tree/styles.css @@ -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%;} \ No newline at end of file diff --git a/blocks/tag_flickr/styles.css b/blocks/tag_flickr/styles.css new file mode 100644 index 00000000000..7351ce80eb4 --- /dev/null +++ b/blocks/tag_flickr/styles.css @@ -0,0 +1 @@ +.block_tag_flickr .flickr-photos {padding:3px;} \ No newline at end of file diff --git a/blocks/tag_youtube/styles.css b/blocks/tag_youtube/styles.css new file mode 100644 index 00000000000..1def4e3d0f7 --- /dev/null +++ b/blocks/tag_youtube/styles.css @@ -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;} \ No newline at end of file diff --git a/blocks/tags/styles.css b/blocks/tags/styles.css new file mode 100644 index 00000000000..59b1afcca48 --- /dev/null +++ b/blocks/tags/styles.css @@ -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 {} \ No newline at end of file diff --git a/blocks/tags/styles.php b/blocks/tags/styles.php deleted file mode 100644 index e7344b18445..00000000000 --- a/blocks/tags/styles.php +++ /dev/null @@ -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%; -} diff --git a/calendar/event.php b/calendar/event.php index f484c223bd0..e59819b59d7 100644 --- a/calendar/event.php +++ b/calendar/event.php @@ -208,7 +208,7 @@ $PAGE->set_heading($strcalendar); echo $OUTPUT->header(); -echo ''; +echo '
'; echo '
'; echo $OUTPUT->heading($title); $mform->display(); diff --git a/calendar/export.php b/calendar/export.php index e4aeca27b70..0fb11f8579d 100644 --- a/calendar/export.php +++ b/calendar/export.php @@ -139,7 +139,7 @@ $PAGE->set_focuscontrol('eventform.name'); echo $OUTPUT->header(); // Layout the whole page as three big columns. -echo ''; +echo '
'; echo ''; // START: Main column diff --git a/calendar/lib.php b/calendar/lib.php index 8aebe110ae8..8392b892985 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -194,7 +194,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y $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 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y 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,34 +275,31 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y // Class and cell content if(isset($typesbyday[$day]['startglobal'])) { - $class .= ' event_global'; - } - 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'; + $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'; } $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'; - } - else if(isset($typesbyday[$day]['durationgroup'])) { - $class .= ' duration_group'; - } - else if(isset($typesbyday[$day]['durationuser'])) { - $class .= ' duration_user'; + if ($durationclass) { + $class .= ' duration '.$durationclass; } // 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 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses 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 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses $content .= ''."\n"; } if($SESSION->cal_show_user) { - $content .= ''; + $content .= ''; $content .= ''."\n"; } else { $content .= ''; @@ -1092,22 +1089,22 @@ function calendar_events_by_day($events, $month, $year, &$eventsbyday, &$duratio 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'; } } diff --git a/calendar/view.php b/calendar/view.php index edd5cd10878..dce28d88ef5 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -157,7 +157,7 @@ $PAGE->set_button($prefsbutton); echo $OUTPUT->header(); // Layout the whole page as three big columns. -echo '
tag @@ -515,18 +512,18 @@ function calendar_add_event_metadata($event) { } 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 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses $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 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course 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,17 +480,18 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course } // 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'; - } - else if(isset($typesbyday[$day]['durationgroup'])) { - $class .= ' duration_group'; - } - else if(isset($typesbyday[$day]['durationuser'])) { - $class .= ' duration_user'; + if ($durationclass) { + $class .= ' duration '.$durationclass; } // Special visual fx for today @@ -543,7 +544,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course // 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 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course // 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 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course 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 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course } // 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').': '; diff --git a/course/format/topics/styles.css b/course/format/topics/styles.css new file mode 100644 index 00000000000..5342d30e2af --- /dev/null +++ b/course/format/topics/styles.css @@ -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;} \ No newline at end of file diff --git a/course/format/weeks/styles.css b/course/format/weeks/styles.css new file mode 100644 index 00000000000..a4c802a8b11 --- /dev/null +++ b/course/format/weeks/styles.css @@ -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;} \ No newline at end of file diff --git a/course/lib.php b/course/lib.php index 7322f7a0644..d3f6b0c720e 100644 --- a/course/lib.php +++ b/course/lib.php @@ -346,7 +346,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per 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 @@ function print_course($course, $highlightterms = '') { 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 diff --git a/grade/edit/outcome/import.php b/grade/edit/outcome/import.php index d73214370b4..8b49ac7e17f 100644 --- a/grade/edit/outcome/import.php +++ b/grade/edit/outcome/import.php @@ -133,7 +133,7 @@ if ($handle = fopen($imported_file['userfile']['tmp_name'], 'r')) { } } 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(); diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php index 4ce042cdfd5..2e033060b1a 100644 --- a/grade/edit/tree/index.php +++ b/grade/edit/tree/index.php @@ -336,7 +336,7 @@ echo '
'; 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'); diff --git a/grade/report/user/styles.css b/grade/report/user/styles.css new file mode 100644 index 00000000000..3a44289ff67 --- /dev/null +++ b/grade/report/user/styles.css @@ -0,0 +1,36 @@ +.path-grade-report-user table.user-grade .datesubmitted {font-size: 0.7em;} +.path-grade-report-user table.user-grade .courseitem, +.path-grade-report-user table.user-grade .categoryitem {font-weight: bold;} +.path-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 */ +.path-grade-report-user table.user-grade .hidden, +.path-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;} \ No newline at end of file diff --git a/grade/report/user/styles.php b/grade/report/user/styles.php deleted file mode 100644 index 87786c32ef1..00000000000 --- a/grade/report/user/styles.php +++ /dev/null @@ -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; -} - - diff --git a/lib/adminlib.php b/lib/adminlib.php index a5c5d72e887..178e84c73df 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -4769,8 +4769,8 @@ class admin_setting_manageauths extends admin_setting { $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'].""; diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 409291b3208..50ab40abc47 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3097,6 +3097,22 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL"); unset_config('regenloginsession'); upgrade_main_savepoint($result, 2010031900); } + + if ($result && $oldversion < 2010032400) { + // Upgrade all of those using the standardold theme to the use the standard + // theme instead + if ($CFG->theme == 'standardold') { + // The config setting that affects the whole site + set_config('theme', 'standard'); + } + // Course Categories + $DB->execute('UPDATE {course_categories} SET theme=? WHERE theme=?', array('standard', 'standardold')); + // Course + $DB->execute('UPDATE {course} SET theme=? WHERE theme=?', array('standard', 'standardold')); + // User + $DB->execute('UPDATE {user} SET theme=? WHERE theme=?', array('standard', 'standardold')); + upgrade_main_savepoint($result, 2010032400); + } return $result; } diff --git a/lib/installlib.php b/lib/installlib.php index c28ec18ee91..0e095641335 100644 --- a/lib/installlib.php +++ b/lib/installlib.php @@ -281,14 +281,14 @@ function install_print_header($config, $stagename, $heading, $stagetext) { '; - $sheets = array('styles_layout', 'styles_fonts', 'styles_color', 'styles_moz'); + $sheets = array('pagelayout','core'); $csss = array(); foreach ($sheets as $sheet) { - $csss[] = $CFG->wwwroot.'/theme/standard/'.$sheet.'.css'; + $csss[] = $CFG->wwwroot.'/theme/base/style/'.$sheet.'.css'; } - $sheets = array('gradients'); + $sheets = array('core', 'css3'); foreach ($sheets as $sheet) { - $csss[] = $CFG->wwwroot.'/theme/standardwhite/'.$sheet.'.css'; + $csss[] = $CFG->wwwroot.'/theme/standard/style/'.$sheet.'.css'; } foreach ($csss as $css) { echo ''."\n"; @@ -302,12 +302,17 @@ function install_print_header($config, $stagename, $heading, $stagetext) { echo '
-

'.get_string('installation','install').'

-
 
-
-
  • '.$stagename.'
+
+
+

'.get_string('installation','install').'

+
 
+
+
+
+
  • '.$stagename.'
+
+
 
-
 
'; diff --git a/lib/outputlib.php b/lib/outputlib.php index 885d064baf1..1f6b16c11dc 100644 --- a/lib/outputlib.php +++ b/lib/outputlib.php @@ -96,9 +96,8 @@ function theme_get_revision() { 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 diff --git a/lib/pagelib.php b/lib/pagelib.php index 8f2b30519df..95e57e2ed13 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -149,6 +149,7 @@ class moodle_page { 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 @@ class moodle_page { /** * 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)) { @@ -327,6 +328,14 @@ class moodle_page { return $this->_pagetype; } + /** + * 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'. @@ -1211,11 +1220,14 @@ class moodle_page { $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;$iadd_body_class('path-'.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()); diff --git a/mod/assignment/styles.css b/mod/assignment/styles.css new file mode 100644 index 00000000000..9a9b74aa9cc --- /dev/null +++ b/mod/assignment/styles.css @@ -0,0 +1,30 @@ +/** General Styles **/ +.path-mod-assignment .userpicture, +.path-mod-assignment .picture.user, +.path-mod-assignment .picture.teacher {width:35px;height: 35px;vertical-align:top;} +.path-mod-assignment .feedback .files, +.path-mod-assignment .feedback .grade, +.path-mod-assignment .feedback .outcome, +.path-mod-assignment .feedback .finalgrade {float: right;} +.path-mod-assignment .feedback .disabledfeedback {width: 500px;height: 250px;} +.path-mod-assignment .feedback .from {float: left;} +.path-mod-assignment .files img {margin-right: 4px;} +.path-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;} \ No newline at end of file diff --git a/mod/chat/styles.css b/mod/chat/styles.css new file mode 100644 index 00000000000..4c6cc499979 --- /dev/null +++ b/mod/chat/styles.css @@ -0,0 +1,32 @@ +/** General Styles **/ +.path-mod-chat .chat-event .picture, +.path-mod-chat .chat-message .picture {width:40px;vertical-align:top;} +.path-mod-chat .chat-event .text, +.path-mod-chat .chat-message .text {text-align: left;} +.path-mod-chat #messages-list, +.path-mod-chat #users-list {list-style-type:none;padding:0;margin:0} +.path-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 **/ +.path-mod-chat .yui-layout-unit-top {background: #FFE39D;} +.path-mod-chat .yui-layout-unit-right {border-top: 5px solid white;background: #FFD46B;} +.path-mod-chat .yui-layout-unit-bottom {border-top: 5px solid white;background: #FFCB44;} +.path-mod-chat .yui-layout .yui-layout-hd {border:0;} +.path-mod-chat .yui-layout .yui-layout-unit div.yui-layout-bd {border:0;background: transparent;} +.path-mod-chat .yui-layout .yui-layout-unit div.yui-layout-unit-right {background: white;} +.path-mod-chat .yui-layout-doc .yui-layout-unit .yui-layout-wrap .yui-layout-hd h2 {font-size:100%;padding:0px;font-weight:normal;} \ No newline at end of file diff --git a/mod/choice/styles.css b/mod/choice/styles.css new file mode 100644 index 00000000000..5cf1ef789d7 --- /dev/null +++ b/mod/choice/styles.css @@ -0,0 +1,10 @@ +.path-mod-choice .results {border-collapse: separate;} +.path-mod-choice .results .data {vertical-align:top;white-space: nowrap;} +.path-mod-choice .button {text-align:center;} +.path-mod-choice .attemptcell {width:5px;white-space: nowrap;} +.path-mod-choice .anonymous, +.path-mod-choice .names {margin-left:auto;margin-right:auto;} +.path-mod-choice .downloadreport {border-width:0;margin-left:auto;margin-right:auto;} +.path-mod-choice .choiceresponse {width:100%;} +.path-mod-choice .choiceresponse .picture {width:10px;white-space: nowrap;} +.path-mod-choice .choiceresponse .fullname {width:100%;white-space: nowrap;} \ No newline at end of file diff --git a/mod/data/styles.css b/mod/data/styles.css new file mode 100644 index 00000000000..33c672065d5 --- /dev/null +++ b/mod/data/styles.css @@ -0,0 +1,22 @@ +.path-mod-data .fieldadd, +.path-mod-data .sortdefault, +.path-mod-data .defaulttemplate, +#page-mod-data-view .datapreferences, +#page-mod-data-preset .presetmapping{text-align:center;} + +.path-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 **/ +.path-mod-data-field .fieldadd, +.path-mod-data-field .sortdefault {margin:1em 0;} +.path-mod-data-field .fieldadd select, +.path-mod-data-field .sortdefault select {margin-left: 1em;} +.path-mod-data-field .fieldname, +.path-mod-data-field .fielddescription {width:300px;} \ No newline at end of file diff --git a/mod/data/styles.php b/mod/data/styles.php deleted file mode 100644 index 2772b4f98b3..00000000000 --- a/mod/data/styles.php +++ /dev/null @@ -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; -} diff --git a/mod/feedback/styles.php b/mod/feedback/styles.php deleted file mode 100644 index 2cfc1968d8b..00000000000 --- a/mod/feedback/styles.php +++ /dev/null @@ -1,9 +0,0 @@ -/* styles using by feedback */ -.feedback_required_mark { - color: #FF0000; -} - -.feedback_switchrequired img{ -} - - diff --git a/mod/forum/styles.css b/mod/forum/styles.css new file mode 100644 index 00000000000..4e50e1980bb --- /dev/null +++ b/mod/forum/styles.css @@ -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, +.path-mod-forum .forumolddiscuss, +#page-mod-forum-search .c0 {text-align:right;} +.forumpost .left {width: 35px;vertical-align: top;} +.path-mod-forum .indent {margin-left: 30px;} +.path-mod-forum .forumheaderlist {width: 100%;border-width:1px;border-style:solid;border-collapse:separate;margin-top: 10px;} +.path-mod-forum .forumheaderlist td {border-width:1px 0px 0px 1px;border-style:solid;} +.path-mod-forum .forumheaderlist .picture {width: 35px;} +.path-mod-forum .forumheaderlist .discussion .starter {vertical-align: middle;} +.path-mod-forum .forumheaderlist .discussion .lastpost {white-space: nowrap;text-align: right;} +.path-mod-forum .forumheaderlist .replies, +.path-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;} \ No newline at end of file diff --git a/mod/glossary/styles.css b/mod/glossary/styles.css new file mode 100644 index 00000000000..a66c50ccba5 --- /dev/null +++ b/mod/glossary/styles.css @@ -0,0 +1,24 @@ +/** General Styles **/ +.path-mod-glossary .glossarypost {border-collapse:separate;margin:5px auto;text-align: left;} +.path-mod-glossary .glossarypost.entrylist {border-width:0px;} +.path-mod-glossary .glossarypost.continuous .concept {display: inline;} +.path-mod-glossary .glossarypost .commands {width: 200px;white-space: nowrap;} +.path-mod-glossary .glossarypost .picture {width: 35px;} +.path-mod-glossary .glossarypost .entrylowersection .aliases {text-align:center;} +.path-mod-glossary .glossarypost .entrylowersection .icons {text-align:right;padding-right: 5px;} +.path-mod-glossary .glossarypost .entrylowersection .ratings {text-align:right;padding-right: 5px;padding-bottom: 2px;} + +.path-mod-glossary .glossarydisplay {margin-left:auto;margin-right:auto;} +.path-mod-glossary .glossarydisplay .tabs {width: 100%;margin-bottom: 0px;} +.path-mod-glossary .glossarydisplay .tabs .side {border-style: none;border-width: 0px;width: auto;} +.path-mod-glossary .glossarydisplay .separator {width: 4px;} + +.path-mod-glossary table.glossarypopup {width: 95%;} +.path-mod-glossary .entrybox, /** Used in tabs.php **/ +.path-mod-glossary table.glossaryapproval, +.path-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;} \ No newline at end of file diff --git a/mod/lesson/styles.css b/mod/lesson/styles.css new file mode 100644 index 00000000000..00fc038fc4a --- /dev/null +++ b/mod/lesson/styles.css @@ -0,0 +1,29 @@ +/** General styles (scope: all of lesson) **/ +.path-mod-lesson .contents, +.path-mod-lesson .standardtable, +.path-mod-lesson .mform .box.contents, +.path-mod-lesson .invisiblefieldset.fieldsetfix tr {text-align: left;} +.path-mod-lesson #layout-table {width: 100%;} +.path-mod-lesson .edit_buttons form, +.path-mod-lesson .edit_buttons input {display: inline;} +.path-mod-lesson .userinfotable .cell, +.path-mod-lesson .userinfotable .userpicture {vertical-align: middle;} +.path-mod-lesson .invisiblefieldset.fieldsetfix {display: block;} +.path-mod-lesson .slideshow {overflow: auto;padding: 15px;} +.path-mod-lesson .menu .menuwrapper {max-height: 400px;overflow: auto;vertical-align: top;margin-bottom: 10px;} +.path-mod-lesson .menu ul {list-style: none;padding: 5px 0px 0px 5px;margin: 0px;} +.path-mod-lesson .menu ul li {padding-bottom: 5px;} +.path-mod-lesson .skip {position: absolute;left: -1000em;width: 20em;} +.path-mod-lesson .branchbuttoncontainer.horizontal div, +.path-mod-lesson .branchbuttoncontainer.horizontal form {display: inline;} +.path-mod-lesson .firstpageoptions {width:30%;margin-left:35%;margin-top:1em;} +.path-mod-lesson .progress_bar_table, +.path-mod-lesson .progress_bar_completed, +.path-mod-lesson .progress_bar_todo {padding: 0;margin: 0;} +.path-mod-lesson .progress_bar_token {height: 20px;width: 5px;padding: 0;margin: 0;} +.path-mod-lesson .edit_pages_box .addlinks {margin:0;margin-bottom:1em;} + +/** + * Style for view.php + **/ +#page-mod-lesson-view .password-form .submitbutton {display: inline;} \ No newline at end of file diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css new file mode 100644 index 00000000000..5832958b11b --- /dev/null +++ b/mod/quiz/styles.css @@ -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;} + +.path-mod-quiz .gradingdetails {font-size: small;} +.path-mod-quiz .highlightgraded {background:yellow;} +.path-mod-quiz div.tabtree a span img.iconsmall {vertical-align: baseline;} +.ie6.path-mod-quiz div.tabtree a span img.iconsmall {margin: 0;vertical-align: baseline;position: relative;top: 1px;} +.ie7.path-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.path-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%;} \ No newline at end of file diff --git a/mod/resource/styles.css b/mod/resource/styles.css new file mode 100644 index 00000000000..8990c811a70 --- /dev/null +++ b/mod/resource/styles.css @@ -0,0 +1,5 @@ +#page-mod-resource-view .resourcecontent.resourcepdf {width: 100%;} +.path-mod-resource .popupnotice {text-align:center;margin:40px;} + +.resourcecontent object {height:480px;width:600px;} +.resourcecontent.resourcepdf object{height: 800px;width: 800px;} diff --git a/mod/scorm/styles.css b/mod/scorm/styles.css new file mode 100644 index 00000000000..ebdf20ca1f7 --- /dev/null +++ b/mod/scorm/styles.css @@ -0,0 +1,24 @@ +.path-mod-scorm .top {vertical-align: top;} +.path-mod-scorm .scorm-left {text-align: left;} +.path-mod-scorm .scorm-center {text-align: center;} +.path-mod-scorm .scorm-right {text-align: right;} +.path-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;} \ No newline at end of file diff --git a/mod/scorm/styles.php b/mod/scorm/styles.php deleted file mode 100644 index 0efa2aa21f1..00000000000 --- a/mod/scorm/styles.php +++ /dev/null @@ -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; -} diff --git a/mod/survey/lib.php b/mod/survey/lib.php index dc8b8c7bd7d..b045ce6dab9 100644 --- a/mod/survey/lib.php +++ b/mod/survey/lib.php @@ -528,7 +528,7 @@ function survey_print_multi($question) { $strresponses = get_string('responses', 'survey'); echo $OUTPUT->heading($question->text, 3, 'questiontext'); - echo "\n"; + echo "\n
"; $options = explode( ",", $question->options); $numoptions = count($options); diff --git a/mod/survey/styles.css b/mod/survey/styles.css new file mode 100644 index 00000000000..cdd3ea52389 --- /dev/null +++ b/mod/survey/styles.css @@ -0,0 +1,14 @@ +.path-mod-survey .smalltext {font-size: 0.75em;} + +.path-mod-survey .surveytable .rblock label {display: block;} +.path-mod-survey .surveytable .foundthat, +.path-mod-survey .surveytable .preferthat {white-space: nowrap;} +.path-mod-survey .surveytable .buttoncell {width:5%;} +.path-mod-survey .surveytable .optioncell, +.path-mod-survey .surveytable .questioncell {width:50%;vertical-align:top;} +.path-mod-survey .surveytable .whitecell {background-color:white;} + +.path-mod-survey #surveyform th {font-weight: normal;text-align: left;} +.path-mod-survey #surveyform th.hresponse {text-align: center;width: 9%;} + +#page-mod-survey-report .fullnamecell {width:10%;vertical-align:top;white-space: nowrap;} \ No newline at end of file diff --git a/mod/wiki/styles.css b/mod/wiki/styles.css new file mode 100644 index 00000000000..b29bc4c178d --- /dev/null +++ b/mod/wiki/styles.css @@ -0,0 +1,7 @@ +.path-mod-wiki .sideblockheading, +.path-mod-wiki .howtowiki {text-align:right;} +.path-mod-wiki .wikisearchform, +.path-mod-wiki .wikilinksblock, +.path-mod-wiki .wikiadminactions {text-align:center;} +.path-mod-wiki .wikilinkright {text-align:right;padding-bottom: 0.5em;} +.path-mod-wiki .wikiexportbox {margin-left:auto;margin-right:auto;} \ No newline at end of file diff --git a/mod/wiki/wiki_styles.php b/mod/wiki/wiki_styles.php deleted file mode 100644 index 2b656bf7ccc..00000000000 --- a/mod/wiki/wiki_styles.php +++ /dev/null @@ -1,108 +0,0 @@ - - -.wiki { - background-color: #FFFFFF; - padding: 6px; -} - - -.view { -} - -.edit { -} - -.info { -} - -.links { -} - - -.wiki_backlinks { - border-top: 2px #EEEEEE solid; -} - -.indent { -} - - -h2.page.title { - border-bottom: 2px #EEEEEE solid; -} - - -.version-info { -} - - -.action-links { -} - - -.control-links { -} - - -.page-version { -} - - -.page-author { -} - - -.page-created { -} - - -.page-lastmodified { -} - - -.page-refs { -} - - -.page-flags { -} - - -.page-meta { -} - - -.chunked-result { -} - - -.edit-box { - text-align:center; -} - - -.image-upload { -} - - -.preview { -} - - -.NotFound { -} - - -.ewiki_page_todolist { -} - - -.diff { -} diff --git a/pix/t/block_to_dock.png b/pix/t/block_to_dock.png index d72690c8701624caec7f00726cc7c1fbb2a1056a..c982c867053764cddbdfd5ba533217f558fa70f3 100644 GIT binary patch delta 148 zcmeyy_=ZujGr-TCmrII^fq{Y7)59eQNOOZQ2OE%Fxu#rgqM|L=EoN~JX{Gk4=$jKW zG-BL6T^vIsE+?mGSbU$)$fhP?xNYlJ#UB|Bt&NS14~sS{Hor@0NvNu_YCE*I`n!>V x;RFUZ(aCFPOkDWZUg_8>3CZxaQLV;oj1O)JMuhq}{Q_FV;OXk;vd$@?2>|%uGI#(0 delta 158 zcmaFE_>EDqGr-TCmrII^fq{Y7)59eQNb`U&2OE$KD~)+RQPGy`CWi#Gm_^o;gl7{o zG|~b+T^vI+&L<}*2pSj}0D;Jy-~8e;6OP=tcI}(|>_@9sX}O6>JTKa;*!(V~C8es$ zs_W6->hEBs1`}T`3FJM(;9=9T@K|G47njW)O*V%0cLhpcoNE^VTFKz)>gTe~DWM4f DH8wX& diff --git a/pix/t/dock_to_block.png b/pix/t/dock_to_block.png index 5ace5af1c626bedc7e6142c7ef6fdd3fad12a81f..380f4acd80eddfd5d7a035865088cfdf65225cf2 100644 GIT binary patch delta 150 zcmeyt_>NJrGr-TCmrII^fq{Y7)59eQNOOZQ2OE%Fxu#rgqM|L=EoN~JNwf9a-l|Q^ z(1`Q&ba4!kxSX7mo&Ebf18Zn#Xb%tT^9MC02M!%LaA3l`dFM8izmMDT;AxsOPwTG9 zk`gl{JQx;toeVp(Xwjl3Aw`~~HlAIRH)^vn@LBP1S^A&V0caJ2r>mdKI;Vst04bC; A8UO$Q delta 160 zcmaFI_=8cgGr-TCmrII^fq{Y7)59eQNb`U&2OE$KD~)+RQPGy`CWi#Gm?lGrgUG}T zjf`MV7sn8d^T`Pcf(Awg1_oQUZvETN84?<5Xe2V{cYo+t7G*av32R&1xry)Z?Jd}O z`fQs@3kGd2JK diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php index 01d58964c0a..c70d94a2a05 100644 --- a/tag/coursetags_edit.php +++ b/tag/coursetags_edit.php @@ -75,7 +75,7 @@ echo $OUTPUT->header(); // 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 @@ echo $OUTPUT->header(); // 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 = ''; diff --git a/tag/index.php b/tag/index.php index 763a516b886..a9a85112204 100644 --- a/tag/index.php +++ b/tag/index.php @@ -69,7 +69,7 @@ echo $OUTPUT->heading($tagname, 2, 'headingblock header tag-heading'); 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').'

'; diff --git a/tag/manage.php b/tag/manage.php index 492622ea0bd..f87e2ed4ff4 100644 --- a/tag/manage.php +++ b/tag/manage.php @@ -137,8 +137,6 @@ switch($action) { break; } -echo '
'; - if ($err_notice) { echo $OUTPUT->notification($err_notice, 'red'); } diff --git a/theme/anomaly/layout/general.php b/theme/anomaly/layout/general.php index b4c1ed39e4d..8d6ad58b024 100644 --- a/theme/anomaly/layout/general.php +++ b/theme/anomaly/layout/general.php @@ -13,7 +13,7 @@ if ($properties->sidepre && !$properties->sidepost) { } 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 @@ echo $OUTPUT->doctype() ?> standard_top_of_body_html(); ?>
- -
+

heading ?>

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

diff --git a/theme/anomaly/style/base.css b/theme/anomaly/style/base.css index 953fb779fb2..35f677e2668 100644 --- a/theme/anomaly/style/base.css +++ b/theme/anomaly/style/base.css @@ -6,46 +6,11 @@ h1.main, h2.main, h3.main, h4.main, h5.main, h6.main {text-align:center;} .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;} - -.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;} +.notifyproblem {padding:10px;color:#660000;text-align:center;} +.notifysuccess {padding:10px;color:#006600;text-align:center;} .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 */ @@ -65,14 +30,6 @@ h1.main, h2.main, h3.main, h4.main, h5.main, h6.main {text-align:center;} .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;} \ No newline at end of file diff --git a/theme/anomaly/style/browser.css b/theme/anomaly/style/browser.css index 69cffb334cb..33a11c90133 100644 --- a/theme/anomaly/style/browser.css +++ b/theme/anomaly/style/browser.css @@ -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} diff --git a/theme/anomaly/style/general.css b/theme/anomaly/style/general.css index 3c064b85c4e..ad38d31873d 100644 --- a/theme/anomaly/style/general.css +++ b/theme/anomaly/style/general.css @@ -6,18 +6,18 @@ img.icon, 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 @@ html, body {background-color:#C8C9C7;} .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 @@ html, body {background-color:#C8C9C7;} #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;} diff --git a/theme/anomaly/style/layout.css b/theme/anomaly/style/layout.css index 0f8669d7f06..272afe073fe 100644 --- a/theme/anomaly/style/layout.css +++ b/theme/anomaly/style/layout.css @@ -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;} \ No newline at end of file +#page {min-width:600px;} \ No newline at end of file diff --git a/theme/base/config.php b/theme/base/config.php index 03070d7e5ba..48afe4b755a 100644 --- a/theme/base/config.php +++ b/theme/base/config.php @@ -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 @@ $THEME->layouts = array( /** List of javascript files that need to included on each page */ $THEME->javascripts = array(); -$THEME->javascripts_footer = array('navigation'); \ No newline at end of file +$THEME->javascripts_footer = array(); \ No newline at end of file diff --git a/theme/base/javascript/navigation.js b/theme/base/javascript/navigation.js deleted file mode 100644 index 9bd934d2172..00000000000 --- a/theme/base/javascript/navigation.js +++ /dev/null @@ -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; - } - } - } - -} \ No newline at end of file diff --git a/theme/base/layout/embedded.php b/theme/base/layout/embedded.php index c305cfb428a..5d222025429 100644 --- a/theme/base/layout/embedded.php +++ b/theme/base/layout/embedded.php @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/base/layout/frontpage.php b/theme/base/layout/frontpage.php index fb827d9ada7..4734fd63d0d 100644 --- a/theme/base/layout/frontpage.php +++ b/theme/base/layout/frontpage.php @@ -1,11 +1,15 @@ blocks->region_has_content('side-pre', $OUTPUT)) { - $regionsinfo .= '-pre'; -} -if ($PAGE->blocks->region_has_content('side-post', $OUTPUT)) { - $regionsinfo .= '-post'; +$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'; } echo $OUTPUT->doctype() ?> @@ -16,12 +20,12 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?> -
+
-
+

heading ?>

login_info(); @@ -31,22 +35,28 @@ echo $OUTPUT->doctype() ?>
-
+
-
-
-
- +
+
+
+
+ +
- blocks->region_has_content('side-pre', $OUTPUT)) { ?> -
- blocks_for_region('side-pre') ?> + +
+
+ blocks_for_region('side-pre') ?> +
- blocks->region_has_content('side-post', $OUTPUT)) { ?> -
- blocks_for_region('side-post') ?> + +
+
+ blocks_for_region('side-post') ?> +
@@ -54,7 +64,7 @@ echo $OUTPUT->doctype() ?>
-
'; +echo '
'; echo ''; echo '
'; echo $OUTPUT->user_picture($user, array('courseid'=>$course->id, 'size'=>100)); diff --git a/version.php b/version.php index 25f7647af18..c4fbe1c195d 100644 --- a/version.php +++ b/version.php @@ -6,7 +6,7 @@ // This is compared against the values stored in the database to determine // whether upgrades should be performed (see lib/db/*.php) - $version = 2010031900; // YYYYMMDD = date of the last version bump + $version = 2010032400; // YYYYMMDD = date of the last version bump // XX = daily increments $release = '2.0 dev (Build: 20100325)'; // Human-friendly version name