Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.285 and 1.285.2.3

version 1.285, 2011/01/03 13:10:12 version 1.285.2.3, 2011/10/23 00:50:58
Line 60  use Time::Local; Line 60  use Time::Local;
 use Time::HiRes;  use Time::HiRes;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use HTML::Entities();
 use LONCAPA;  use LONCAPA;
   
 sub java_not_enabled {  sub java_not_enabled {
Line 83  sub raw_href_to_link { Line 84  sub raw_href_to_link {
    return $message;     return $message;
 }  }
   
   sub entity_encode {
       my ($text)=@_;
       return &HTML::Entities::encode($text, '<>&"');
   }
   
 ##############################################  ##############################################
 ##############################################  ##############################################
   
Line 1227  sub htmlareaheaders { Line 1233  sub htmlareaheaders {
 ENDEDITOR  ENDEDITOR
  }   }
     $s.=(<<ENDJQUERY);      $s.=(<<ENDJQUERY);
 <script type="text/javascript" src="/adm/jQuery/js/jquery-1.3.2.min.js"></script>  <script type="text/javascript" src="/adm/jQuery/js/jquery-1.6.2.min.js"></script>
 <script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.7.2.custom.min.js"></script>  <script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.8.16.custom.min.js"></script>
 <link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.7.2.custom.css" />  <link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.8.16.custom.css" />
 ENDJQUERY  ENDJQUERY
  return $s;   return $s;
 }  }
Line 1611  returns: nothing Line 1617  returns: nothing
         @html = grep {defined $_ && $_ ne ''} @html;          @html = grep {defined $_ && $_ ne ''} @html;
         for (@html) {           for (@html) { 
             s/align="(right|left)"//;               s/align="(right|left)"//; 
             s/<span.*?\/span>// if $category ne 'advtools';               if (($category ne 'advtools') && ($category ne 'tools')) {
                   s/<span.*?\/span>//;
               }
         }           } 
   
         push @{$tools{$category}}, @html;          push @{$tools{$category}}, @html;

Removed from v.1.285  
changed lines
  Added in v.1.285.2.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>