MDL-1149 Accessibility: Current week/topic is NOT indicated non-visually, only in styling. Merged.

This commit is contained in:
nfreear
2007-09-25 12:45:29 +00:00
parent bf4fe92223
commit 247958fbe9
5 changed files with 15 additions and 6 deletions
+3 -1
View File
@@ -238,17 +238,19 @@ while ($section <= $course->numsections) {
$currenttopic = ($course->marker == $section);
$currenttext = '';
if (!$thissection->visible) {
$sectionstyle = ' hidden';
} else if ($currenttopic) {
$sectionstyle = ' current';
$currenttext = get_accesshide(get_string('currenttopic','access'));
} else {
$sectionstyle = '';
}
echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
echo '<td class="left side">&nbsp;</td>';
echo '<td class="left side">&nbsp;'.$currenttext.'</td>';
echo '<td class="content">';
if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students
+3 -1
View File
@@ -171,16 +171,18 @@
$currenttopic = ($course->marker == $section);
$currenttext = '';
if (!$thissection->visible) {
$sectionstyle = ' hidden';
} else if ($currenttopic) {
$sectionstyle = ' current';
$currenttext = get_accesshide(get_string('currenttopic','access'));
} else {
$sectionstyle = '';
}
echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
echo '<td class="left side">'.$section.'</td>';
echo '<td class="left side">'.$currenttext.$section.'</td>';
echo '<td class="content">';
if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students
+3 -2
View File
@@ -162,19 +162,20 @@
$currentweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate));
$currenttext = '';
if (!$thissection->visible) {
$sectionstyle = ' hidden';
} else if ($currentweek) {
$sectionstyle = ' current';
$currenttext = get_accesshide(get_string('currentweek','access'));
} else {
$sectionstyle = '';
}
echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
echo '<td class="left side">&nbsp;</td>';
echo '<td class="left side">&nbsp;'.$currenttext.'</td>';
$weekperiod = $weekday.' - '.$endweekday;
echo '<td class="content">';
if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students
+3 -1
View File
@@ -190,10 +190,12 @@
$currentweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate));
$currenttext = '';
if (!$thissection->visible) {
$sectionstyle = ' hidden';
} else if ($currentweek) {
$sectionstyle = ' current';
$currenttext = get_accesshide(get_string('currentweek','access'));
} else {
$sectionstyle = '';
}
@@ -201,7 +203,7 @@
echo '<li id="section-'.$section.'" class="section main'.$sectionstyle.'" >'; //'<div class="left side">&nbsp;</div>';
// Note, 'right side' is BEFORE content.
echo '<div class="right side">';
echo '<div class="right side">'.$currenttext;
if ($displaysection == $section) {
echo '<a href="view.php?id='.$course->id.'&amp;week=0#section-'.$section.'" title="'.$strshowallweeks.'">'.
+3 -1
View File
@@ -1,6 +1,6 @@
<?PHP // $Id$
// access.php - created with Moodle 1.7 beta + (2006101003)
// Accessibility, usability and navigation language file.
$string['access'] = 'Accessibility';
$string['accesshelp'] = 'Accessibility help';
@@ -9,6 +9,8 @@ $string['accessstatement'] = 'Accessibility statement';
$string['activitynext'] = 'Next activity';
$string['activityprev'] = 'Previous activity';
$string['breadcrumb'] = 'Breadcrumb trail';
$string['currentweek'] = 'Current week ';
$string['currenttopic'] = 'Current topic ';
$string['monthnext'] = 'Next month';
$string['monthprev'] = 'Previous month';
$string['showhideblock'] = 'Show or hide block';