diff --git a/course/format/weekscss/format.php b/course/format/weekscss/format.php index 6718b6dcd76..708e3c0a86c 100644 --- a/course/format/weekscss/format.php +++ b/course/format/weekscss/format.php @@ -80,7 +80,7 @@ /// Layout the whole page as three big columns. - echo '
'; + echo '
'; /// The left column ... @@ -96,17 +96,20 @@ print_heading_block(get_string('weeklyoutline'), 'outline'); - echo ''; + //--echo '
'; + echo "'; - echo ''; + //echo ''; - echo ''; + echo "\n"; + //echo ''; + //--echo ''; } /// Print Section 0 with general activities @@ -115,9 +118,12 @@ $thissection = $sections[$section]; if ($thissection->summary or $thissection->sequence or isediting($course->id)) { - echo ''; + /*--echo ''; echo ''; echo ''; + /*--echo ''; echo ''; echo ''; - //TODO (nfreear): Accessibility: how to get rid of the 'separator' row?? echo ''; - + */ + echo '
 
'; + echo "\n"; } @@ -201,10 +208,14 @@ $sectionstyle = ''; } - echo ''; + /*--echo ''; echo ''; echo ''; + /*--echo ''; echo ''; - //TODO (nfreear): Accessibility: how to get rid of the 'separator' row?? + /*--echo ''; echo ''; + */ + echo '
'; + echo "\n"; } $section++; $weekdate = $nextweekdate; } - echo '
'; + //--echo '
'; + echo '
  • '; echo $stractivityclipboard.'  ('.$strcancel.')'; - echo '
  •  '; + */ + echo '
  • '; //'
     
    + echo '
    '; echo '
    '; $summaryformatoptions->noclean = true; @@ -136,12 +142,13 @@ print_section_add_menus($course, $section, $modnames); } - echo '
  •  
     '; + */ + echo '
  • '; //'
     
    '; + + echo '
    '; if (!isteacher($course->id) and !$thissection->visible) { // Hidden for students echo '
    '.$weekday.' - '.$endweekday.' ('.get_string('notavailable').')
    '; @@ -227,10 +238,12 @@ print_section_add_menus($course, $section, $modnames); } } - echo '
  • '; - + */ + echo '
    '; + if ($displaysection == $section) { echo ''. ''.$strshowallweeks.'
    '; @@ -259,15 +272,18 @@ } } - echo '
    '; + //--echo ''; + echo "\n"; if (!empty($sectionmenu)) { echo '
    '; diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css index e009288d4d2..dd54b6d345c 100644 --- a/theme/standard/styles_color.css +++ b/theme/standard/styles_color.css @@ -415,13 +415,11 @@ table.minicalendar { border-color:#DDDDDD; } +#course-view li.section, #course-view .section td { border-color:#DDDDDD; } -#course-view .section .content { -} - #course-view .section .side { } @@ -431,10 +429,15 @@ table.minicalendar { #course-view .section .right { } -#course-view .current .side{ +#course-view .weekscss .current, +#course-view .weeks .current .side{ background: #FFD991; } +#course-view .current .content { + background: white; +} + #course-view .topics { } diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index f84fd032024..5257fc54b87 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -822,7 +822,7 @@ span.current { vertical-align:top; } -#course-view .section .content { +#course-view .weeks .section .content { padding:5px; border-style:solid; border-width:1px; @@ -834,19 +834,19 @@ span.current { clear: both; } -#course-view .section .side { +#course-view .weeks .section .side { padding:5px; border-style:solid; border-width:1px; } -#course-view .section .left { +#course-view .weeks .section .left { border-right:0px; text-align:center; width: 1.5em; } -#course-view .section .right { +#course-view .weeks .section .right { border-left:0px; text-align:center; width: 1.5em; @@ -862,6 +862,36 @@ span.current { #course-view .section .weekdates { } + +/*Accessibility: No-tables course format. */ +#course-view ul.weekscss, .weekscss li { + margin: 0; + padding: 0; + text-indent: 0; + list-style: none; +} +.weekscss li.section { + margin-bottom: 0.5em; + width: 100%; + border-style:solid; + border-width:1px; +} +.weekscss .content, .weekscss .side { + padding: 5px; +} +.weekscss .content { + margin-left: 4%; /* Why? Firefox 8%; IE 4% */ + width: 80%; + float: left; +} +.weekscss .side { + width: 8%; + float: left; +} +.weekscss .clearer { + height: 0; +} + .section .activity img.activityicon { vertical-align:middle; height:16px;