--- loncom/interface/loncommon.pm 2010/12/30 19:35:28 1.991
+++ loncom/interface/loncommon.pm 2011/01/05 18:39:38 1.994
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.991 2010/12/30 19:35:28 raeburn Exp $
+# $Id: loncommon.pm,v 1.994 2011/01/05 18:39:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4486,7 +4486,7 @@ Returns: HTML div with $content
sub head_subbox {
my ($content)=@_;
my $output =
- '
'
+ '
'
.$content
.'
'
}
@@ -5091,7 +5091,7 @@ td.LC_table_cell_checkbox {
padding: 0;
}
-#LC_head_subbox {
+.LC_head_subbox {
clear:both;
background: #F8F8F8; /* $sidebg; */
border: 1px solid $sidebg;
@@ -7676,7 +7676,7 @@ sub get_secgrprole_info {
}
sub user_picker {
- my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
+ my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_;
my $currdom = $dom;
my %curr_selected = (
srchin => 'dom',
@@ -7767,10 +7767,15 @@ sub user_picker {
$srchtypesel .= "\n \n";
my ($newuserscript,$new_user_create);
-
+ my $context_dom = $env{'request.role.domain'};
+ if ($context eq 'requestcrs') {
+ if ($env{'form.coursedom'} ne '') {
+ $context_dom = $env{'form.coursedom'};
+ }
+ }
if ($forcenewuser) {
if (ref($srch) eq 'HASH') {
- if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) {
+ if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $context_dom) {
if ($cancreate) {
$new_user_create = '
&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" />
';
} else {
@@ -7809,7 +7814,7 @@ function setSearch(createnew,callingForm
}
}
for (var i=0; i
'.$fname.'',
$filesize).' '.
- &mt('Either the file you uploaded was empty, or your web browser was unable to read its contents.').' ';
+ &mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').' ';
'';
return ('zero_bytes',$msg);
}