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

Diff for /loncom/homework/structuretags.pm between versions 1.391 and 1.396

version 1.391, 2007/08/18 00:31:35 version 1.396, 2007/09/11 23:36:39
Line 211  sub get_resource_name { Line 211  sub get_resource_name {
  $name = $Apache::lonhomework::name;   $name = $Apache::lonhomework::name;
     } else {      } else {
  my ($symb)=&Apache::lonnet::whichuser();   my ($symb)=&Apache::lonnet::whichuser();
  my $name=&Apache::lonnet::gettitle($symb);   $name=&Apache::lonnet::gettitle($symb);
  if ($name eq '') {   if ($name eq '') {
     $name=&Apache::lonnet::EXT('resource.title');      $name=&Apache::lonnet::EXT('resource.title');
     if ($name eq 'con_lost') { $name = ''; }      if ($name eq 'con_lost') { $name = ''; }
Line 765  sub start_problem { Line 765  sub start_problem {
     $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';      $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
  }   }
  if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {   if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
     $msg.='The problem '.$accessmsg;      $msg.=&mt('The problem ').$accessmsg;
  } elsif ($status eq 'UNCHECKEDOUT') {   } elsif ($status eq 'UNCHECKEDOUT') {
     $msg.=&checkout_msg();      $msg.=&checkout_msg();
  } elsif ($status eq 'NOT_YET_VIEWED') {   } elsif ($status eq 'NOT_YET_VIEWED') {
Line 1070  sub start_definetag { Line 1070  sub start_definetag {
   
     my $name = $token->[2]->{'name'};      my $name = $token->[2]->{'name'};
     my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style);      my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style);
     if ($name=~/^\//) {      if ($target eq 'web') {
  $result=   if ($name=~/^\//) {
  '<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>';      $result=
     } else {   '<br /><table class="LC_sty_end"><tr><th>'.
  $result=   &mt('END [_1]'.'<tt>'.$name.'</tt>').'</th></tr>';
  '<br /><table bgcolor="#BBFFBB"><tr><th>BEGIN <tt>'.$name.'</tt></th></tr>';   } else {
       $result=
    '<br /><table class="LC_sty_begin"><tr><th>'.
    &mt('BEGIN [_1]'.'<tt>'.$name.'</tt>').'</th></tr>';
    }
    $skip = &HTML::Entities::encode($skip, '<>&"');
    $result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';
     }      }
     $skip=~s/\</\&lt\;/gs;  
     $skip=~s/\>/\&gt\;/gs;  
     $result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';  
     return $result;      return $result;
 }  }
   
Line 1140  sub start_languageblock { Line 1143  sub start_languageblock {
  $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {   $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
  my $include = $token->[2]->{'include'};   my $include = $token->[2]->{'include'};
  my $exclude = $token->[2]->{'exclude'};   my $exclude = $token->[2]->{'exclude'};
         my %languages=&Apache::loncommon::display_languages();          my $preferred_language=(&Apache::loncommon::preferred_languages)[0];
   # This should not even happen, since we should at least have the server language
           if (!$preferred_language) { $preferred_language='en'; }
   # If the languageblock has no arguments, show the contents
         $result='1';          $result='1';
   # Do we have an include argument?
  if ($include) {   if ($include) {
   # If include is specified, by default, don't render the block
             $result='';              $result='';
             foreach (split(/\,/,$include)) {              foreach my $included_language (split(/\,/,$include)) {
                 if ($languages{$_}) { $result='1'; }  # ... but if my preferred language is included, render it
                   if ($included_language eq $preferred_language) { $result='1'; }
             }              }
  }   }
   # Do we have an exclude argument?
         if ($exclude) {          if ($exclude) {
             foreach (split(/\,/,$exclude)) {              $result='1';
                 if ($languages{$_}) { $result='0'; }              foreach my $excluded_language (split(/\,/,$exclude)) {
                   if ($excluded_language eq $preferred_language) { $result='0'; }
             }              }
  }   }
  if ( ! $result ) {   if ( ! $result ) {
Removed from v.1.391  
changed lines
  Added in v.1.396

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