[BACK]Return to lonhtmlcommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.182.4.10 and 1.182.4.12

version 1.182.4.10, 2010/01/22 14:24:16 version 1.182.4.12, 2010/02/15 17:02:47
Line 65  use LONCAPA; Line 65  use LONCAPA;
 sub coursepreflink {  sub coursepreflink {
     my ($text,$category)=@_;      my ($text,$category)=@_;
     if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {      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 {      } else {
         return '';          return '';
     }      }
Line 73  sub coursepreflink { Line 73  sub coursepreflink {
   
 sub raw_href_to_link {  sub raw_href_to_link {
     my ($message)=@_;      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;      return $message;
 }  }
   
Line 91  Successful completion of an operation me Line 91  Successful completion of an operation me
 sub confirm_success {  sub confirm_success {
    my ($message,$failure)=@_;     my ($message,$failure)=@_;
    if ($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"              .'<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.&mt('Error').'" /> '."\n"
             .$message."\n"              .$message."\n"
             .'</span>'."\n";              .'</span>'."\n";
Line 436  sub date_setter { Line 436  sub date_setter {
         ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($currentvalue);           ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($currentvalue); 
     }      }
     unless ($wasdefined) {      unless ($wasdefined) {
         ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now);  
  if (($defhour) || ($defmin) || ($defsec)) {   if (($defhour) || ($defmin) || ($defsec)) {
               ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now);
     $sec=($defsec?$defsec:0);      $sec=($defsec?$defsec:0);
     $min=($defmin?$defmin:0);      $min=($defmin?$defmin:0);
     $hour=($defhour?$defhour:0);      $hour=($defhour?$defhour:0);
Line 1290  sub htmlareaselectactive { Line 1290  sub htmlareaselectactive {
     my @fields=@_;      my @fields=@_;
     unless (&htmlareabrowser()) { return ''; }      unless (&htmlareabrowser()) { return ''; }
     if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }      if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
     my $output='<script type="text/javascript" defer="1">'.      my $output='<script type="text/javascript" defer="defer">'.
                '// <![CDATA[';                 '// <![CDATA[';
     my $lang = &htmlarea_lang();      my $lang = &htmlarea_lang();
     foreach my $field (@fields) {      foreach my $field (@fields) {
Removed from v.1.182.4.10  
changed lines
  Added in v.1.182.4.12

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