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

Diff for /loncom/interface/loncommon.pm between versions 1.666 and 1.670

version 1.666, 2008/07/08 00:49:18 version 1.670, 2008/07/13 19:36:50
Line 878  sub help_open_topic { Line 878  sub help_open_topic {
   
     # Add the graphic      # Add the graphic
     my $title = &mt('Online Help');      my $title = &mt('Online Help');
     my $helpicon=&lonhttpdurl("/res/adm/pages/help.png");      my $helpicon=&lonhttpdurl("/adm/help/help.png");
     $template .= <<"ENDTEMPLATE";      $template .= <<"ENDTEMPLATE";
  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>   <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
 ENDTEMPLATE  ENDTEMPLATE
Line 6810  sub instrule_disallow_msg { Line 6810  sub instrule_disallow_msg {
         } elsif ($checkitem eq 'id') {          } elsif ($checkitem eq 'id') {
             $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");              $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");
         }          }
       } elsif ($mode eq 'selfcreate') {
           if ($checkitem eq 'id') {
               $response .= &mt("You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank.");
           }
     } else {      } else {
         if ($checkitem eq 'username') {          if ($checkitem eq 'username') {
             $response .= &mt("You must choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");              $response .= &mt("You must choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
Line 6838  sub sorted_inst_types { Line 6842  sub sorted_inst_types {
     my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);      my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
     my $othertitle = &mt('All users');      my $othertitle = &mt('All users');
     if ($env{'request.course.id'}) {      if ($env{'request.course.id'}) {
         $othertitle  = 'any';          $othertitle  = &mt('Any users');
     }      }
     my @types;      my @types;
     if (ref($order) eq 'ARRAY') {      if (ref($order) eq 'ARRAY') {
Line 6851  sub sorted_inst_types { Line 6855  sub sorted_inst_types {
     }      }
     if (keys(%{$usertypes}) > 0) {      if (keys(%{$usertypes}) > 0) {
         $othertitle = &mt('Other users');          $othertitle = &mt('Other users');
         if ($env{'request.course.id'}) {  
             $othertitle = 'other';  
         }  
     }      }
     return ($othertitle,$usertypes,\@types);      return ($othertitle,$usertypes,\@types);
 }  }
Line 8508  sub assign_categories_table { Line 8509  sub assign_categories_table {
                     }                      }
                     $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'                      $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
                                .'<input type="checkbox" name="usecategory" value="'.                                 .'<input type="checkbox" name="usecategory" value="'.
                                $item.'"'.$checked.' />'.&escape($parent).'</span></td>';                                 $item.'"'.$checked.' />'.$parent.'</span></td>';
                     my $depth = 1;                      my $depth = 1;
                     push(@path,$parent);                      push(@path,$parent);
                     $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);                      $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
Removed from v.1.666  
changed lines
  Added in v.1.670

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