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

Diff for /loncom/interface/loncommon.pm between versions 1.669 and 1.679

version 1.669, 2008/07/12 14:16:32 version 1.679, 2008/09/04 22:06:27
Line 904  sub helpLatexCheatsheet { Line 904  sub helpLatexCheatsheet {
  .'</td><td>'.   .'</td><td>'.
  &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),   &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
     undef,undef,600)      undef,undef,600)
    .'</td><td>'.
    &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
                                       undef,undef,600)
  .'</td></tr></table>';   .'</td></tr></table>';
 }  }
   
Line 913  sub general_help { Line 916  sub general_help {
  $helptopic='Authoring_Intro';   $helptopic='Authoring_Intro';
     } elsif ($env{'request.role'}=~/^cc/) {      } elsif ($env{'request.role'}=~/^cc/) {
  $helptopic='Course_Coordination_Intro';   $helptopic='Course_Coordination_Intro';
       } elsif ($env{'request.role'}=~/^dc/) {
           $helptopic='Domain_Coordination_Intro';
     }      }
     return $helptopic;      return $helptopic;
 }  }
Line 5355  hr.LC_edit_problem_divide { Line 5360  hr.LC_edit_problem_divide {
   height: 3px;    height: 3px;
   border: 0px;    border: 0px;
 }  }
   img.stift{
     border-width:0;
     vertical-align:middle;
   }
 END  END
 }  }
   
Line 6803  sub instrule_disallow_msg { Line 6812  sub instrule_disallow_msg {
             $text{'action'} = 'IDs';              $text{'action'} = 'IDs';
         }          }
     }      }
     $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for <span class=\"LC_cusr_emph\">[_1]</span>, but the $text{'item'} $text{'do'} not exist in the institutional directory.",$domdesc).'<br />';      $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for [_1], but the $text{'item'} $text{'do'} not exist in the institutional directory.",'<span class="LC_cusr_emph">'.$domdesc.'</span>').'<br />';
     if ($mode eq 'upload') {      if ($mode eq 'upload') {
         if ($checkitem eq 'username') {          if ($checkitem eq 'username') {
             $response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");              $response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
         } 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 Student/Employee ID field.");
         }          }
     } elsif ($mode eq 'selfcreate') {      } elsif ($mode eq 'selfcreate') {
         if ($checkitem eq 'id') {          if ($checkitem eq 'id') {
Line 7243  sub check_for_upload { Line 7252  sub check_for_upload {
             }              }
         }          }
     }      }
     my $getpropath = 1;  
     if (($current_disk_usage + $filesize) > $disk_quota){      if (($current_disk_usage + $filesize) > $disk_quota){
         my $msg = '<span class="LC_error">'.          my $msg = '<span class="LC_error">'.
                 &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.                  &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
Line 8507  sub assign_categories_table { Line 8515  sub assign_categories_table {
                             $checked = ' checked="checked" ';                              $checked = ' checked="checked" ';
                         }                          }
                     }                      }
                     $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>'.
                                  '<input type="hidden" name="catname" value="'.$parent.'" /></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);
Line 8575  sub assign_category_rows { Line 8584  sub assign_category_rows {
                     }                      }
                     $text .= '<tr><td><span class="LC_nobreak"><label>'.                      $text .= '<tr><td><span class="LC_nobreak"><label>'.
                              '<input type="checkbox" name="usecategory" value="'.                               '<input type="checkbox" name="usecategory" value="'.
                              $item.'"'.$checked.' />'.$name.'</label></span></td><td>';                               $item.'"'.$checked.' />'.$name.'</label></span>'.
                                '<input type="hidden" name="catname" value="'.$name.'" />'.
                                '</td><td>';
                     if (ref($path) eq 'ARRAY') {                      if (ref($path) eq 'ARRAY') {
                         push(@{$path},$name);                          push(@{$path},$name);
                         $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);                          $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);
Line 9373  sub init_user_environment { Line 9384  sub init_user_environment {
   
 sub _add_to_env {  sub _add_to_env {
     my ($idf,$env_data,$prefix) = @_;      my ($idf,$env_data,$prefix) = @_;
     while (my ($key,$value) = each(%$env_data)) {      if (ref($env_data) eq 'HASH') {
  $idf->{$prefix.$key} = $value;          while (my ($key,$value) = each(%$env_data)) {
  $env{$prefix.$key}   = $value;      $idf->{$prefix.$key} = $value;
       $env{$prefix.$key}   = $value;
           }
     }      }
 }  }
   
Removed from v.1.669  
changed lines
  Added in v.1.679

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