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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.247 and 1.251

version 1.247, 2009/11/21 22:36:23 version 1.251, 2009/11/30 06:32:26
Line 232  sub select_recent { Line 232  sub select_recent {
  unless ($value =~/^error\:/) {   unless ($value =~/^error\:/) {
     my $escaped = &Apache::loncommon::escape_url($value);      my $escaped = &Apache::loncommon::escape_url($value);
     &Apache::loncommon::inhibit_menu_check(\$escaped);      &Apache::loncommon::inhibit_menu_check(\$escaped);
               if ($area eq 'residx') {
                   next if ((!&Apache::lonnet::allowed('bre',$value)) && (!&Apache::lonnet::allowed('bro',$value)));
               }
     $return.="\n<option value='$escaped'>".      $return.="\n<option value='$escaped'>".
  &unescape((split(/\&/,$recent{$value}))[1]).   &unescape((split(/\&/,$recent{$value}))[1]).
  '</option>';   '</option>';
Line 1138  sub crumbs { Line 1141  sub crumbs {
     my $output='';      my $output='';
     unless ($noformat) { $output.='<br /><tt><b>'; }      unless ($noformat) { $output.='<br /><tt><b>'; }
     $output.='<font size="'.$size.'">'.$prefix.'/';      $output.='<font size="'.$size.'">'.$prefix.'/';
     if (($env{'user.adv'}) | ($env{'user.author'})) {      if (($env{'user.adv'}) || ($env{'user.author'})) {
  my $path=$prefix.'/';   my $path=$prefix.'/';
  foreach my $dir (split('/',$uri)) {   foreach my $dir (split('/',$uri)) {
             if (! $dir) { next; }              if (! $dir) { next; }
Line 1501  returns: nothing Line 1504  returns: nothing
                 $item =~ s/<span(.*?)\/span>//;                  $item =~ s/<span(.*?)\/span>//;
                 $html .= "<li>$item</li>";                  $html .= "<li>$item</li>";
             }              }
             $html .= '</li></ul>';              $html .= '</ul></li>';
             if ($category eq 'A') { $html .= "<li>$$links</li>"; }              if ($category eq 'A') { $html .= "<li>$$links</li>"; }
         }          }
         $$links = $html.'</ul>';          $$links = $html.'</ul>';
Line 1881  sub course_custom_roles { Line 1884  sub course_custom_roles {
   
 # topic_bar  # topic_bar
 #  #
 # Generates a div containing an (optional) numbered (static) image followed by a   # Generates a div containing an (optional) number with a white background followed by a 
 # title with a background color defined in the corresponding CSS: LC_topic_bar  # title with a background color defined in the corresponding CSS: LC_topic_bar
 # Inputs:  # Inputs:
 # 1. number to display (corresponding static image should exist).  # 1. number to display.
 #    img tag will be included if arg is an integer in the range 1 to 9.   #    If input for number is empty only the title will be displayed. 
 # 2. title text to display.  # 2. title text to display.
 # Outputs - a scalar containing html mark-up for the div.  # Outputs - a scalar containing html mark-up for the div.
   
 sub topic_bar {  sub topic_bar {
     my ($imgnum,$title) = @_;      my ($num,$title) = @_;
     my $imgtag;      my $number = '';
     if ($imgnum =~ /^[1-9]$/) {      if ($num ne '') {
         $imgtag = '<img src="/res/adm/pages/bl_step'.$imgnum.'.gif"'.           $number = '<span>'.$num.'</span>';
                   ' alt="'.&mt('Step [_1]',$imgnum).'" /> ';  
     }      }
     return '<div class="LC_topic_bar">'.$imgtag.$title.'</div>';      return '<div class="LC_topic_bar">'.$number.$title.'</div>';
 }  }
   
 ##############################################  ##############################################
Removed from v.1.247  
changed lines
  Added in v.1.251

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