--- loncom/interface/lonhtmlcommon.pm 2006/12/05 02:55:53 1.155
+++ loncom/interface/lonhtmlcommon.pm 2007/03/12 18:09:36 1.157
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.155 2006/12/05 02:55:53 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.157 2007/03/12 18:09:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1002,13 +1002,14 @@ sub crumbs {
}
} else {
$path.='/';
- }
+ }
my $linkpath = &Apache::loncommon::escape_single($path);
if ($form) {
$linkpath=
qq{javascript:$form.action='$linkpath';$form.submit();};
}
- $output.=qq{$dir/};
+ my $href_path = &HTML::Entities::encode($path,'<>&"');
+ $output.=qq{$dir/};
}
} else {
foreach my $dir (split('/',$uri)) {
@@ -1202,7 +1203,8 @@ Pushes a breadcrumb on the stack of crum
input: $breadcrumb, a hash reference. The keys 'href','title', and 'text'
are required. If present the keys 'faq' and 'bug' will be used to provide
-links to the FAQ and bug sites.
+links to the FAQ and bug sites. If the key 'no_mt' is present the 'title'
+and 'text' values won't be sent through &mt()
returns: nothing
@@ -1252,13 +1254,22 @@ returns: nothing
if (defined($_->{'target'}) && $_->{'target'} ne '') {
$result .= 'target="'.$_->{'target'}.'" ';
}
- $result .='title="'.&mt($_->{'title'}).'">'.
- &mt($_->{'text'}).'';
+ if ($_->{'no_mt'}) {
+ $result .='title="'.$_->{'title'}.'">'.
+ $_->{'text'}.'';
+ } else {
+ $result .='title="'.&mt($_->{'title'}).'">'.
+ &mt($_->{'text'}).'';
+ }
$result;
} @Crumbs
);
$links .= '->' if ($links ne '');
- $links .= ''.&mt($last->{'text'}).'';
+ if ($last->{'no_mt'}) {
+ $links .= ''.$last->{'text'}.'';
+ } else {
+ $links .= ''.&mt($last->{'text'}).'';
+ }
#
my $icons = '';
$faq = $last->{'faq'} if (exists($last->{'faq'}));