--- loncom/interface/lonhtmlcommon.pm 2006/11/09 20:43:07 1.154
+++ loncom/interface/lonhtmlcommon.pm 2007/01/05 17:55:41 1.156
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.154 2006/11/09 20:43:07 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.156 2007/01/05 17:55:41 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,7 +60,6 @@ use Time::Local;
use Time::HiRes;
use Apache::lonlocal;
use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
##############################################
@@ -78,7 +77,7 @@ use LONCAPA;
sub authorbombs {
my $url=shift;
$url=&Apache::lonnet::declutter($url);
- my ($udom,$uname)=($url=~/^(\w+)\/(\w+)\//);
+ my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/});
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
foreach (keys %bombs) {
if ($_=~/^$udom\/$uname\//) {
@@ -1203,7 +1202,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
@@ -1253,13 +1253,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'}));