[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonhtmlcommon.pm

[raeburn]

raeburn		Mon Feb 15 17:02:47 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  - Backport 1.262, 1.264, 1.265.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.182.4.11 loncom/interface/lonhtmlcommon.pm:1.182.4.12
--- loncom/interface/lonhtmlcommon.pm:1.182.4.11	Sat Jan 23 22:23:53 2010
+++ loncom/interface/lonhtmlcommon.pm	Mon Feb 15 17:02:47 2010
@@ -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.12 2010/02/15 17:02:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@
 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 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 @@
 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";
@@ -1290,7 +1290,7 @@
     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) {