Index: lang/en_utf8/access.php =================================================================== RCS file: /cvsroot/moodle/moodle/lang/en_utf8/access.php,v retrieving revision 1.4 diff -u -r1.4 access.php --- lang/en_utf8/access.php 9 Jun 2006 14:21:25 -0000 1.4 +++ lang/en_utf8/access.php 25 Aug 2006 16:54:52 -0000 @@ -15,6 +15,8 @@ $string['accesshelp'] = 'Accessibility help'; $string['accesskey'] = 'Access key, $a'; $string['accessstatement'] = 'Accessibility statement'; +$string['activitynext'] = 'Next activity'; +$string['activityprev'] = 'Previous activity'; $string['breadcrumb'] = 'Breadcrumb trail'; $string['monthnext'] = 'Next month'; $string['monthprev'] = 'Previous month'; Index: blocks/search_forums/block_search_forums.php =================================================================== RCS file: /cvsroot/moodle/moodle/blocks/search_forums/block_search_forums.php,v retrieving revision 1.16 diff -u -r1.16 block_search_forums.php --- blocks/search_forums/block_search_forums.php 16 Mar 2006 11:47:38 -0000 1.16 +++ blocks/search_forums/block_search_forums.php 25 Aug 2006 16:54:51 -0000 @@ -10,7 +10,7 @@ } function get_content() { - global $CFG; + global $CFG, $THEME; if($this->content !== NULL) { return $this->content; @@ -27,11 +27,13 @@ $advancedsearch = get_string('advancedsearch', 'block_search_forums'); //Accessibility: replaced with button-embedded image. + check_theme_arrows(); + $this->content->text = '
'; $this->content->text .= '
'; $this->content->text .= ''; // course $this->content->text .= ''; - $this->content->text .= '
'; + $this->content->text .= '
'; $this->content->text .= ''.$advancedsearch.''; $this->content->text .= helpbutton('search', $advancedsearch, 'moodle', true, false, '', true); $this->content->text .= '
'; Index: calendar/lib.php =================================================================== RCS file: /cvsroot/moodle/moodle/calendar/lib.php,v retrieving revision 1.145 diff -u -r1.145 lib.php --- calendar/lib.php 24 Jul 2006 00:15:54 -0000 1.145 +++ calendar/lib.php 25 Aug 2006 16:54:52 -0000 @@ -602,7 +602,7 @@ } function calendar_top_controls($type, $data) { - global $CFG, $CALENDARDAYS; + global $CFG, $CALENDARDAYS, $THEME; $content = ''; if(!isset($data['d'])) { $data['d'] = 1; @@ -620,8 +620,9 @@ $data['y'] = $date['year']; //Accessibility: calendar block controls, replaced with
. - $nexttext = ''.get_string('monthnext','access').''; - $prevtext = ''.get_string('monthprev','access').''; + check_theme_arrows(); + $nexttext = $THEME->rarrow .''.get_string('monthnext','access').''; + $prevtext = $THEME->larrow .''.get_string('monthprev','access').''; switch($type) { case 'frontpage': @@ -658,9 +659,9 @@ $prevdate = make_timestamp($prevyear, $prevmonth, 1); $nextdate = make_timestamp($nextyear, $nextmonth, 1); $content .= '
'; - $content .= '< '.userdate($prevdate, get_string('strftimemonthyear')).''; + $content .= ' $THEME->larrow ".userdate($prevdate, get_string('strftimemonthyear')).''; $content .= ' | '.userdate($time, get_string('strftimemonthyear'))."\n"; - $content .= ' | '.userdate($nextdate, get_string('strftimemonthyear'))." >\n"; + $content .= ' | '.userdate($nextdate, get_string('strftimemonthyear'))." $THEME->rarrow\n"; $content .= "
\n"; break; case 'day': @@ -670,7 +671,7 @@ $prevname = calendar_wday_name($CALENDARDAYS[$prevdate['wday']]); $nextname = calendar_wday_name($CALENDARDAYS[$nextdate['wday']]); $content .= '
'; - $content .= '< '.$prevname."\n"; + $content .= '$THEME->larrow ".$prevname."\n"; // Get the format string $text = get_string('strftimedaydate'); @@ -684,7 +685,7 @@ // Print the actual thing $content .= ' | '.$text.''; - $content .= ' | '.$nextname." >\n"; + $content .= ' | '.$nextname." $THEME->rarrow\n"; $content .= "
\n"; break; } Index: theme/standard/styles_color.css =================================================================== RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v retrieving revision 1.101 diff -u -r1.101 styles_color.css --- theme/standard/styles_color.css 8 Aug 2006 05:13:21 -0000 1.101 +++ theme/standard/styles_color.css 25 Aug 2006 16:54:53 -0000 @@ -196,6 +196,10 @@ *** Header ***/ +.breadcrumb li span { + color:#aaa; +} + .headerskip a:link, .headerskip a:visited, .headerskip a:hover { Index: theme/standard/config.php =================================================================== RCS file: /cvsroot/moodle/moodle/theme/standard/config.php,v retrieving revision 1.18 diff -u -r1.18 config.php --- theme/standard/config.php 29 Mar 2005 14:20:11 -0000 1.18 +++ theme/standard/config.php 25 Aug 2006 16:54:53 -0000 @@ -121,9 +121,21 @@ /// files from the moodle/pix directory, plus a /// "pix/mod" directory containing all the icons /// for all the activity modules. -//////////////////////////////////////////////////////////////////////////////// +///$THEME->rarrow = '►' //OR '→'; +///$THEME->larrow = '◄' //OR '←'; +/// +/// Accessibility: Right and left arrow-like characters are +/// used in the breadcrumb trail, course navigation menu +/// (previous/next activity), calendar, and search forum block. +/// +/// If the theme does not set characters, appropriate defaults +/// are set by (lib/weblib.php:check_theme_arrows). The suggestions +/// above are 'silent' in a screen-reader like JAWS. Please DO NOT +/// use < > » - these are confusing for blind users. +//////////////////////////////////////////////////////////////////////////////// + // These colours are not used anymore, so I've set them to // bright green to help identify where they should be removed Index: lib/weblib.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v retrieving revision 1.614 diff -u -r1.614 weblib.php --- lib/weblib.php 18 Aug 2006 07:29:19 -0000 1.614 +++ lib/weblib.php 25 Aug 2006 16:54:53 -0000 @@ -2498,25 +2498,53 @@ } /** - * Prints breadcrumbs links + * Tests whether $THEME->rarrow, $THEME->larrow have been set (theme/-/config.php). + * If not it applies sensible defaults. + * + * Accessibility: right and left arrow Unicode characters for breadcrumb, calendar, + * search forum block, etc. Important: these are 'silent' in a screen-reader + * (unlike > »), and must be accompanied by text. + * @uses $THEME + */ +function check_theme_arrows() { + global $THEME; + + if (!isset($THEME->rarrow) and !isset($THEME->larrow)) { + $THEME->rarrow = '►'; + $THEME->larrow = '◄'; + if (FALSE !== strpos($_SERVER['HTTP_USER_AGENT'], 'Opera')) { + $THEME->rarrow = '▶'; + $THEME->larrow = '◀'; + } + } +} + +/** + * Prints breadcrumb trail of links, called in theme/-/header.html * * @uses $CFG - * @param string $navigation The breadcrumbs string to be printed + * @param string $navigation The breadcrumb navigation string to be printed + * @param boolean $return False to echo the breadcrumb string (default), true to return it. + * @param string $separator The breadcrumb trail separator. The default 0 leads to the use + * of $THEME->rarrow, themes could use '→', '/', or '' for a style-sheet solution. */ -function print_navigation ($navigation, $return=false) { - global $CFG, $USER; +function print_navigation ($navigation, $return=false, $separator=0) { + global $CFG, $THEME; + check_theme_arrows(); + if (0 == $separator) { + $separator = ''. $THEME->rarrow .''; + } $output = ''; if ($navigation) { - //Accessibility: breadcrumb links now in a list, » replaced with image. + //Accessibility: breadcrumb links now in a list, » replaced with a 'silent' character. $nav_text = get_string('youarehere','access'); - $output .= '

'.$nav_text.",

"; + "pixpath/i/log.gif\" alt=\"$logstext\" />"; } if ($backmod) { + $backtext= get_string('activityprev', 'access'); $backmod = "wwwroot/mod/$backmod->mod/view.php\" target=\"$CFG->framename\">". "cm\" />". - ""; + ""; } if ($nextmod) { + $nexttext= get_string('activitynext', 'access'); $nextmod = "wwwroot/mod/$nextmod->mod/view.php\" target=\"$CFG->framename\">". "cm\" />". - ""; + ""; } - return '
framename\" href=". + $logstext = get_string('alllogs'); + $logslink = "framename\" href=". "\"$CFG->wwwroot/course/report/log/index.php?chooselog=1&user=0&date=0&id=$course->id&modid=$selectmod->cm\">". - "pixpath/i/log.gif\" alt=\"\" />
'.$logslink .'\n
'. $backmod .'' . + return "\n
".$logslink .''. $backmod .'' . popup_form($CFG->wwwroot .'/mod/', $menu, 'navmenu', $selected, $strjumpto, '', '', true, $targetwindow). - ''. $nextmod .'
'; + '
'. $nextmod ."
"; } /**