--- loncom/interface/loncommon.pm 2008/07/10 22:07:18 1.668 +++ loncom/interface/loncommon.pm 2008/07/23 10:07:25 1.672 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.668 2008/07/10 22:07:18 raeburn Exp $ +# $Id: loncommon.pm,v 1.672 2008/07/23 10:07:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -913,6 +913,8 @@ sub general_help { $helptopic='Authoring_Intro'; } elsif ($env{'request.role'}=~/^cc/) { $helptopic='Course_Coordination_Intro'; + } elsif ($env{'request.role'}=~/^dc/) { + $helptopic='Domain_Coordination_Intro'; } return $helptopic; } @@ -6810,6 +6812,10 @@ sub instrule_disallow_msg { } 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."); } + } 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 { 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'}."); @@ -7239,7 +7245,6 @@ sub check_for_upload { } } } - my $getpropath = 1; if (($current_disk_usage + $filesize) > $disk_quota){ my $msg = ''. &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.',''.$fname.'',$filesize).''. @@ -8505,7 +8510,7 @@ sub assign_categories_table { } $output .= '