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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.87 and 1.96

version 1.87, 2004/08/17 19:02:57 version 1.96, 2004/11/19 19:31:13
Line 117  sub store_recent { Line 117  sub store_recent {
  time.'&'.&Apache::lonnet::escape($value) });   time.'&'.&Apache::lonnet::escape($value) });
 }  }
   
   sub remove_recent {
       my ($area,$names)=@_;
       my $file=&recent_filename($area);
       return &Apache::lonnet::del($file,$names);
   }
   
 sub select_recent {  sub select_recent {
     my ($area,$fieldname,$event)=@_;      my ($area,$fieldname,$event)=@_;
     my %recent=&Apache::lonnet::dump(&recent_filename($area));      my %recent=&Apache::lonnet::dump(&recent_filename($area));
     my $return="\n<select name='$fieldname'".      my $return="\n<select name='$fieldname'".
  ($event?" onChange='$event'":'').   ($event?" onchange='$event'":'').
  ">\n<option value=''>--- ".&mt('Recent')." ---</option>";   ">\n<option value=''>--- ".&mt('Recent')." ---</option>";
     foreach (sort keys %recent) {      foreach (sort keys %recent) {
  unless ($_=~/^error\:/) {   unless ($_=~/^error\:/) {
     $return.="\n<option value='$_'>".      my $escaped = &Apache::loncommon::escape_url($_);
       $return.="\n<option value='$escaped'>".
  &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).   &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
  '</option>';   '</option>';
  }   }
Line 280  sub date_setter { Line 287  sub date_setter {
             document.$formname.$dname\_day.value = 30;              document.$formname.$dname\_day.value = 30;
         }          }
     }      }
       
     function $dname\_disable() {      function $dname\_disable() {
         document.$formname.$dname\_month.disabled=true;          document.$formname.$dname\_month.disabled=true;
         document.$formname.$dname\_day.disabled=true;          document.$formname.$dname\_day.disabled=true;
Line 312  document.$formname.$dname\_year.value, Line 319  document.$formname.$dname\_year.value,
     }      }
 </script>  </script>
 ENDJS  ENDJS
     $result .= "  <nobr><select name=\"$dname\_month\" ".$special.' '.      $result .= '  <nobr>';
         $state.' '.      my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
         "onChange=\"javascript:$dname\_checkday()\" >\n";  
     # Month      # Month
     my @Months = qw/January February  March     April   May      June       my @Months = qw/January February  March     April   May      June 
                     July    August    September October November December/;                      July    August    September October November December/;
     # Pad @Months with a bogus value to make indexing easier      # Pad @Months with a bogus value to make indexing easier
     unshift(@Months,'If you can read this an error occurred');      unshift(@Months,'If you can read this an error occurred');
     if ($includeempty) { $result.="<option value=''></option>"; }      if ($includeempty) { $monthselector.="<option value=''></option>"; }
     for(my $m = 1;$m <=$#Months;$m++) {      for(my $m = 1;$m <=$#Months;$m++) {
         $result .= "      <option value=\"$m\" ";          $monthselector .= qq{      <option value="$m" };
         $result .= "selected " if ($m-1 eq $month);          $monthselector .= "selected " if ($m-1 eq $month);
         $result .= "> ".&mt($Months[$m])." </option>\n";          $monthselector .= '> '.&mt($Months[$m]).' </option>';
     }      }
     $result .= "  </select>\n";      $monthselector.= '  </select>';
     # Day      # Day
     $result .= "  <input type=\"text\" name=\"$dname\_day\" ".$state.' '.      my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" />};
             "value=\"$mday\" size=\"3\" ".$special.' '.  
             "onChange=\"javascript:$dname\_checkday()\" />\n";  
     # Year      # Year
     $result .= "  <input type=\"year\" name=\"$dname\_year\" ".$state.' '.      my $yearselector = qq{<input type="year" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};
             "value=\"$year\" size=\"5\" ".$special.' '.      #
             "onChange=\"javascript:$dname\_checkday()\" />\n";      my $hourselector = qq{<select name="$dname\_hour" $special $state >};
     $result .= "&nbsp;&nbsp;";      if ($includeempty) { 
     if (! $no_hh_mm_ss) {          $hourselector.=qq{<option value=''></option>};
         # Hours      }
         $result .= "  <select name=\"$dname\_hour\" ".$special." ".$state.' '.      for (my $h = 0;$h<24;$h++) {
             ">\n";          $hourselector .= qq{<option value="$h" };
         if ($includeempty) { $result.="<option value=''></option>"; }          $hourselector .= "selected " if (defined($hour) && $hour == $h);
         for (my $h = 0;$h<24;$h++) {          $hourselector .= ">";
             $result .= "      <option value=\"$h\" ";          my $timest='';
             $result .= "selected " if (defined($hour) && $hour == $h);          if ($h == 0) {
             $result .= "> ";              $timest .= "12 am";
             my $timest='';          } elsif($h == 12) {
             if ($h == 0) {              $timest .= "12 noon";
                 $timest .= "12 am";          } elsif($h < 12) {
             } elsif($h == 12) {              $timest .= "$h am";
                 $timest .= "12 noon";          } else {
             } elsif($h < 12) {              $timest .= $h-12 ." pm";
                 $timest .= "$h am";          }
             } else {          $timest=&mt($timest);
                 $timest .= $h-12 ." pm";          $hourselector .= $timest." </option>\n";
             }      }
             $timest=&mt($timest);      $hourselector .= "  </select>\n";
             $result .= $timest." </option>\n";      my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
         }       my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
         $result .= "  </select>\n";      my $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
         $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".      #
             $special.' '.      if ($no_hh_mm_ss) {
             $state.' '.          $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]',
             "value=\"$min\" size=\"3\" /> m\n";                         $monthselector,$dayselector,$yearselector,
         $result .= "  <input type=\"text\" name=\"$dname\_second\" ".                         $cal_link,'</a>');
             $special.' '.      } else {
             $state.' '.          $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]',
             "value=\"$sec\" size=\"3\" /> s\n";                         $monthselector,$dayselector,$yearselector,
                          $hourselector,$minuteselector,$secondselector,
                          $cal_link,'</a>');
     }      }
     $result .= "<a href=\"javascript:$dname\_opencalendar()\">".      $result .= "</nobr>\n<!-- end $dname date setting form -->\n";
     &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";  
     return $result;      return $result;
 }  }
   
Line 519  sub javascript_nothing { Line 524  sub javascript_nothing {
     return $nothing;      return $nothing;
 }  }
   
   ##############################################
   ##############################################
   sub javascript_docopen {
       # safari does not understand document.open() and loads "text/html"
       my $nothing = "''";
       my $user_browser;
       my $user_os;
       $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
       $user_os      = $ENV{'browser.os'}   if (exists($ENV{'browser.os'}));
       if (! defined($user_browser) || ! defined($user_os)) {
           (undef,$user_browser,undef,undef,undef,$user_os) = 
                              &Apache::loncommon::decode_user_agent();
       }
       if ($user_browser eq 'safari' && $user_os =~ 'mac') {
           $nothing = "document.clear()";
       } else {
    $nothing = "document.open('text/html','replace')";
       }
       return $nothing;
   }
   
   
 ##############################################  ##############################################
 ##############################################  ##############################################
Line 777  sub Increment_PrgWin { Line 803  sub Increment_PrgWin {
     my $sec = $time_est % 60;      my $sec = $time_est % 60;
     #       # 
     my $str;      my $str;
     if ($min == 1 && $sec > 1) {      if ($min == 0 && $sec > 1) {
         $str = '[_2] seconds';          $str = '[_2] seconds';
       } elsif ($min == 1 && $sec > 1) {
           $str = '1 minute [_2] seconds';
     } elsif ($min == 1 && $sec < 2) {      } elsif ($min == 1 && $sec < 2) {
         $str = '1 minute';          $str = '1 minute';
     } elsif ($min < 10 && $sec > 1) {      } elsif ($min < 10 && $sec > 1) {
Line 858  sub crumbs { Line 886  sub crumbs {
     unless ($path eq $uri) { $path.='/'; }      unless ($path eq $uri) { $path.='/'; }
     my $linkpath=$path;      my $linkpath=$path;
     if ($form) {      if ($form) {
  $linkpath="javascript:$form.action='$path';$form.submit();";   my $escaped_path = &Apache::loncommon::escape_single($path);
    $linkpath="javascript:$form.action='$escaped_path';$form.submit();";
     }      }
     $output.='<a href="'.$linkpath.'"'.($target?' target="'.$target.'"':'').'>'.$_.'</a>/';      my $escaped_linkpath = &Apache::loncommon::escape_single($linkpath);
       my $escaped_target   = &Apache::loncommon::escape_single($target);
       $output.='<a href="'.$escaped_linkpath.'"'.($target?' target="'.$escaped_target.'"':'').'>'.$_.'</a>/';
  }   }
     } else {      } else {
  $output.=$uri;   $output.=$uri;
Line 875  sub spellheader { Line 906  sub spellheader {
     my $nothing = &javascript_nothing();      my $nothing = &javascript_nothing();
     return (<<ENDCHECK);      return (<<ENDCHECK);
 <script type="text/javascript">   <script type="text/javascript"> 
 // BEGIN LON-CAPA Internal  //<!-- BEGIN LON-CAPA Internal
 var checkwin;  var checkwin;
   
 function spellcheckerwindow() {  function spellcheckerwindow() {
Line 883  function spellcheckerwindow() { Line 914  function spellcheckerwindow() {
     checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');      checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
     checkwin.document.close();      checkwin.document.close();
 }  }
 // END LON-CAPA Internal  // END LON-CAPA Internal -->
 </script>  </script>
 ENDCHECK  ENDCHECK
 }  }
Line 926  sub htmlareaaddbuttons { Line 957  sub htmlareaaddbuttons {
     config.registerButton('ed_math','LaTeX Inline',      config.registerButton('ed_math','LaTeX Inline',
   '/htmlarea/images/ed_math.gif',false,    '/htmlarea/images/ed_math.gif',false,
     function(editor,id) {      function(editor,id) {
       editor.surroundHTML('<m>\$','\$</m>');        editor.surroundHTML('&nbsp;<m>\$','\$</m>&nbsp;');
     }      }
   );    );
     config.registerButton('ed_math_eqn','LaTeX Equation',      config.registerButton('ed_math_eqn','LaTeX Equation',
   '/htmlarea/images/ed_math_eqn.gif',false,    '/htmlarea/images/ed_math_eqn.gif',false,
     function(editor,id) {      function(editor,id) {
       editor.surroundHTML(        editor.surroundHTML(
      '<center><m>\\\\[','\\\\]</m></center>');       '&nbsp;\\n<center><m>\\\\[','\\\\]</m></center>\\n&nbsp;');
     }      }
   );    );
     config.toolbar.push(['ed_math','ed_math_eqn']);      config.toolbar.push(['ed_math','ed_math_eqn']);
Line 947  sub disablelink { Line 978  sub disablelink {
     if (defined($#fields)) {      if (defined($#fields)) {
  unless ($#fields>=0) { return ''; }   unless ($#fields>=0) { return ''; }
     }      }
     return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';      return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
 }  }
   
 sub enablelink {  sub enablelink {
Line 955  sub enablelink { Line 986  sub enablelink {
     if (defined($#fields)) {      if (defined($#fields)) {
  unless ($#fields>=0) { return ''; }   unless ($#fields>=0) { return ''; }
     }      }
     return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';      return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
 }  }
   
 # ----------------------------------------- Script to activate only some fields  # ----------------------------------------- Script to activate only some fields
Removed from v.1.87  
changed lines
  Added in v.1.96

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