version 1.536, 2007/05/29 17:48:44
|
version 1.540, 2007/06/27 22:44:03
|
Line 378 sub coursebrowser_javascript {
|
Line 378 sub coursebrowser_javascript {
|
my ($domainfilter,$sec_element,$formname)=@_; |
my ($domainfilter,$sec_element,$formname)=@_; |
my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role'); |
my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role'); |
my $output = ' |
my $output = ' |
<script type="text/javascript" language="Javascript" > |
<script type="text/javascript"> |
var stdeditbrowser;'."\n"; |
var stdeditbrowser;'."\n"; |
$output .= <<"ENDSTDBRW"; |
$output .= <<"ENDSTDBRW"; |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
Line 2054 if $first is set to 'lastname' then it r
|
Line 2054 if $first is set to 'lastname' then it r
|
############################################################### |
############################################################### |
sub plainname { |
sub plainname { |
my ($uname,$udom,$first)=@_; |
my ($uname,$udom,$first)=@_; |
|
return if (!defined($uname) || !defined($udom)); |
my %names=&getnames($uname,$udom); |
my %names=&getnames($uname,$udom); |
my $name=&Apache::lonnet::format_name($names{'firstname'}, |
my $name=&Apache::lonnet::format_name($names{'firstname'}, |
$names{'middlename'}, |
$names{'middlename'}, |
Line 2085 if the user does not
|
Line 2086 if the user does not
|
|
|
sub nickname { |
sub nickname { |
my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
|
return if (!defined($uname) || !defined($udom)); |
my %names=&getnames($uname,$udom); |
my %names=&getnames($uname,$udom); |
my $name=$names{'nickname'}; |
my $name=$names{'nickname'}; |
if ($name) { |
if ($name) { |
Line 2100 sub nickname {
|
Line 2102 sub nickname {
|
|
|
sub getnames { |
sub getnames { |
my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
|
return if (!defined($uname) || !defined($udom)); |
if ($udom eq 'public' && $uname eq 'public') { |
if ($udom eq 'public' && $uname eq 'public') { |
return ('lastname' => &mt('Public')); |
return ('lastname' => &mt('Public')); |
} |
} |
Line 2663 sub get_student_answers {
|
Line 2666 sub get_student_answers {
|
$moreenv{'grade_target'}='answer'; |
$moreenv{'grade_target'}='answer'; |
%moreenv=(%form,%moreenv); |
%moreenv=(%form,%moreenv); |
$feedurl = &Apache::lonnet::clutter($feedurl); |
$feedurl = &Apache::lonnet::clutter($feedurl); |
&Apache::lonenc::check_encrypt(\$feedurl); |
|
my $userview=&Apache::lonnet::ssi($feedurl,%moreenv); |
my $userview=&Apache::lonnet::ssi($feedurl,%moreenv); |
return $userview; |
return $userview; |
} |
} |
Line 3250 sub domainlogo {
|
Line 3252 sub domainlogo {
|
# See if there is a logo |
# See if there is a logo |
if ($designhash{$domain.'.login.domlogo'} ne '') { |
if ($designhash{$domain.'.login.domlogo'} ne '') { |
my $imgsrc = $designhash{$domain.'.login.domlogo'}; |
my $imgsrc = $designhash{$domain.'.login.domlogo'}; |
if ($imgsrc =~ /^\/(adm|res)/) { |
if ($imgsrc =~ m{^/(adm|res)/}) { |
$imgsrc = &lonhttpdurl($imgsrc); |
if ($imgsrc =~ m{^/res/}) { |
|
my $local_name = &Apache::lonnet::filelocation('',$imgsrc); |
|
&Apache::lonnet::repcopy($local_name); |
|
} |
|
$imgsrc = &lonhttpdurl($imgsrc); |
} |
} |
return '<img src="'.$imgsrc.'" alt="'.$domain.'" />'; |
return '<img src="'.$imgsrc.'" alt="'.$domain.'" />'; |
} elsif (defined(&Apache::lonnet::domain($domain,'description'))) { |
} elsif (defined(&Apache::lonnet::domain($domain,'description'))) { |
Line 3300 sub designparm {
|
Line 3306 sub designparm {
|
} |
} |
if (($which =~ /^(student|coordinator|author|admin)\.img$/) || |
if (($which =~ /^(student|coordinator|author|admin)\.img$/) || |
($which =~ /login\.(img|logo|domlogo)/)) { |
($which =~ /login\.(img|logo|domlogo)/)) { |
if ($output =~ /^\/(adm|res)\//) { |
if ($output =~ m{^/(adm|res)/}) { |
|
if ($output =~ m{^/res/}) { |
|
my $local_name = &Apache::lonnet::filelocation('',$output); |
|
&Apache::lonnet::repcopy($local_name); |
|
} |
$output = &lonhttpdurl($output); |
$output = &lonhttpdurl($output); |
} |
} |
} |
} |
Line 3726 form, .inline { display: inline; }
|
Line 3736 form, .inline { display: inline; }
|
.LC_icon { |
.LC_icon { |
border: 0px; |
border: 0px; |
} |
} |
|
.LC_indexer_icon { |
|
border: 0px; |
|
height: 22px; |
|
} |
|
|
.LC_internal_info { |
.LC_internal_info { |
color: #999; |
color: #999; |