--- loncom/interface/lonhtmlcommon.pm 2010/02/15 17:02:47 1.182.4.12 +++ loncom/interface/lonhtmlcommon.pm 2009/07/02 17:22:33 1.226 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.182.4.12 2010/02/15 17:02:47 raeburn Exp $ +# $Id: lonhtmlcommon.pm,v 1.226 2009/07/02 17:22:33 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,21 +62,6 @@ use Apache::lonlocal; use Apache::lonnet; use LONCAPA; -sub coursepreflink { - my ($text,$category)=@_; - if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { - return ''.$text.''; - } else { - return ''; - } -} - -sub raw_href_to_link { - my ($message)=@_; - $message=~s/(https?\:\/\/[^\s\'\"\<]+)([\s\<]|$)/$1<\/tt><\/a>$2/gi; - return $message; -} - ############################################## ############################################## @@ -91,13 +76,13 @@ Successful completion of an operation me sub confirm_success { my ($message,$failure)=@_; if ($failure) { - return ''."\n" + return ''."\n" .''.&mt('Error').' '."\n" .$message."\n" .''."\n"; } else { return ''."\n" - .''.&mt('OK').' '."\n" + .''.&mt('Ok').' '."\n" .$message."\n" .''."\n"; } @@ -178,7 +163,7 @@ sub authorbombs { foreach (keys %bombs) { if ($_=~/^$udom\/$uname\//) { return ''. + '">'.&mt('Bomb').''. &Apache::loncommon::help_open_topic('About_Bombs'); } } @@ -237,9 +222,6 @@ sub select_recent { unless ($value =~/^error\:/) { my $escaped = &Apache::loncommon::escape_url($value); &Apache::loncommon::inhibit_menu_check(\$escaped); - if ($area eq 'residx') { - next if ((!&Apache::lonnet::allowed('bre',$value)) && (!&Apache::lonnet::allowed('bro',$value))); - } $return.="\n'; @@ -436,8 +418,8 @@ sub date_setter { ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($currentvalue); } unless ($wasdefined) { + ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now); if (($defhour) || ($defmin) || ($defsec)) { - ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now); $sec=($defsec?$defsec:0); $min=($defmin?$defmin:0); $hour=($defhour?$defhour:0); @@ -514,7 +496,7 @@ document.$formname.$dname\_year.value, // ]]> ENDJS - $result .= ' '; + $result .= ' '; my $monthselector = qq{'; # Day @@ -538,8 +520,8 @@ ENDJS $hourselector.=qq{}; } for (my $h = 0;$h<24;$h++) { - $hourselector .= qq{