--- loncom/interface/lonhtmlcommon.pm	2010/01/23 22:23:53	1.182.4.11
+++ loncom/interface/lonhtmlcommon.pm	2010/03/19 22:34:23	1.182.4.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.182.4.11 2010/01/23 22:23:53 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.182.4.13 2010/03/19 22:34:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@ use LONCAPA;
 sub coursepreflink {
     my ($text,$category)=@_;
     if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
-        return '<a href="/adm/courseprefs?phase=display&actions='.$category.'">'.$text.'</a>';
+        return '<a href="/adm/courseprefs?phase=display&amp;actions='.$category.'">'.$text.'</a>';
     } else {
         return '';
     }
@@ -73,7 +73,7 @@ sub coursepreflink {
 
 sub raw_href_to_link {
     my ($message)=@_;
-    $message=~s/(https?\:\/\/[^\s\'\"]+)(\s|$)/<a href="$1"><tt>$1<\/tt><\/a>$2/gi;
+    $message=~s/(https?\:\/\/[^\s\'\"\<]+)([\s\<]|$)/<a href="$1"><tt>$1<\/tt><\/a>$2/gi;
     return $message;
 }
 
@@ -91,7 +91,7 @@ Successful completion of an operation me
 sub confirm_success {
    my ($message,$failure)=@_;
    if ($failure) {
-      return '<span class="LC_error">'."\n"
+      return '<span class="LC_error" style="font-size: inherit;">'."\n"
             .'<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.&mt('Error').'" /> '."\n"
             .$message."\n"
             .'</span>'."\n";
@@ -1068,7 +1068,7 @@ sub Increment_PrgWin {
     # 
     my $str;
     if ($min == 0 && $sec > 1) {
-        $str = '[_2] seconds';
+        $str = '[_1] seconds';
     } elsif ($min == 1 && $sec > 1) {
         $str = '1 minute [_2] seconds';
     } elsif ($min == 1 && $sec < 2) {
@@ -1290,7 +1290,7 @@ sub htmlareaselectactive {
     my @fields=@_;
     unless (&htmlareabrowser()) { return ''; }
     if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
-    my $output='<script type="text/javascript" defer="1">'.
+    my $output='<script type="text/javascript" defer="defer">'.
                '// <![CDATA[';
     my $lang = &htmlarea_lang();
     foreach my $field (@fields) {
@@ -1389,8 +1389,9 @@ returns: nothing
         if ($menulink) {
             my $description = 'Menu';
             my $no_mt_descr = 0;
-            if (exists($env{'request.course.id'}) && 
-                $env{'request.course.id'} ne '') {
+            if ((exists($env{'request.course.id'})) &&
+                ($env{'request.course.id'} ne '') &&
+                ($env{'course.'.$env{'request.course.id'}.'.description'} ne '')) {
                 $description = 
                     $env{'course.'.$env{'request.course.id'}.'.description'};
                 $no_mt_descr = 1;