version 1.692.4.10, 2009/08/14 08:25:33
|
version 1.692.4.20, 2009/10/24 03:32:49
|
Line 482 ENDAUTHORBRW
|
Line 482 ENDAUTHORBRW
|
|
|
sub coursebrowser_javascript { |
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 Community - 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 Community - for which you wish to add/modify a user role.'); |
my $id_functions = &javascript_index_functions(); |
my $id_functions = &javascript_index_functions(); |
my $output = ' |
my $output = ' |
<script type="text/javascript" language="JavaScript"> |
<script type="text/javascript" language="JavaScript"> |
Line 492 sub coursebrowser_javascript {
|
Line 492 sub coursebrowser_javascript {
|
$output .= <<"ENDSTDBRW"; |
$output .= <<"ENDSTDBRW"; |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
var url = '/adm/pickcourse?'; |
var url = '/adm/pickcourse?'; |
|
var formid = getFormIdByName(formname); |
var domainfilter = getDomainFromSelectbox(formname,udom); |
var domainfilter = getDomainFromSelectbox(formname,udom); |
if (domainfilter != null) { |
if (domainfilter != null) { |
if (domainfilter != '') { |
if (domainfilter != '') { |
Line 597 sub userbrowser_javascript {
|
Line 598 sub userbrowser_javascript {
|
my $id_functions = &javascript_index_functions(); |
my $id_functions = &javascript_index_functions(); |
return <<"ENDUSERBRW"; |
return <<"ENDUSERBRW"; |
|
|
function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom) { |
function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom,caller) { |
var url = '/adm/pickuser?'; |
var url = '/adm/pickuser?'; |
var userdom = getDomainFromSelectbox(formname,udom); |
var userdom = getDomainFromSelectbox(formname,udom); |
if (userdom != null) { |
if (userdom != null) { |
Line 612 function openuserbrowser(formname,uname,
|
Line 613 function openuserbrowser(formname,uname,
|
'&uemailelement='+uemail+ |
'&uemailelement='+uemail+ |
'&hideudomelement='+hideudom+ |
'&hideudomelement='+hideudom+ |
'&coursedom='+crsdom; |
'&coursedom='+crsdom; |
|
if ((caller != null) && (caller != undefined)) { |
|
url += '&caller='+caller; |
|
} |
var title = 'User_Browser'; |
var title = 'User_Browser'; |
var options = 'scrollbars=1,resizable=1,menubar=0'; |
var options = 'scrollbars=1,resizable=1,menubar=0'; |
options += ',width=700,height=600'; |
options += ',width=700,height=600'; |
Line 619 function openuserbrowser(formname,uname,
|
Line 623 function openuserbrowser(formname,uname,
|
stdeditbrowser.focus(); |
stdeditbrowser.focus(); |
} |
} |
|
|
function fix_domain (formname,udom,origdom) { |
function fix_domain (formname,udom,origdom,uname) { |
var formid = getFormIdByName(formname); |
var formid = getFormIdByName(formname); |
if (formid > -1) { |
if (formid > -1) { |
|
var unameid = getIndexByName(formid,uname); |
var domid = getIndexByName(formid,udom); |
var domid = getIndexByName(formid,udom); |
var hidedomid = getIndexByName(formid,origdom); |
var hidedomid = getIndexByName(formid,origdom); |
if (hidedomid > -1) { |
if (hidedomid > -1) { |
var fixeddom = document.forms[formid].elements[hidedomid].value; |
var fixeddom = document.forms[formid].elements[hidedomid].value; |
if (domid > -1) { |
var unameval = document.forms[formid].elements[unameid].value; |
var slct = document.forms[formid].elements[domid]; |
if ((fixeddom != '') && (fixeddom != undefined) && (fixeddom != null) && (unameval != '') && (unameval != undefined) && (unameval != null)) { |
if (slct.type == 'select-one') { |
if (domid > -1) { |
var i; |
var slct = document.forms[formid].elements[domid]; |
for (i=0;i<slct.length;i++) { |
if (slct.type == 'select-one') { |
if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; } |
var i; |
|
for (i=0;i<slct.length;i++) { |
|
if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; } |
|
} |
|
} |
|
if (slct.type == 'hidden') { |
|
slct.value = fixeddom; |
} |
} |
} |
|
if (slct.type == 'hidden') { |
|
slct.value = fixeddom; |
|
} |
} |
} |
} |
} |
} |
Line 711 sub selectauthor_link {
|
Line 719 sub selectauthor_link {
|
|
|
sub selectuser_link { |
sub selectuser_link { |
my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem, |
my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem, |
$coursedom,$linktext) = @_; |
$coursedom,$linktext,$caller) = @_; |
return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',". |
return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',". |
"'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom'". |
"'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom','$caller'". |
');">'.$linktext.'</a>'; |
');">'.$linktext.'</a>'; |
} |
} |
|
|
Line 2971 sub syllabuswrapper {
|
Line 2979 sub syllabuswrapper {
|
} |
} |
|
|
sub track_student_link { |
sub track_student_link { |
my ($linktext,$sname,$sdom,$target,$start) = @_; |
my ($linktext,$sname,$sdom,$target,$start,$only_body) = @_; |
my $link ="/adm/trackstudent?"; |
my $link ="/adm/trackstudent?"; |
my $title = 'View recent activity'; |
my $title = 'View recent activity'; |
if (defined($sname) && $sname !~ /^\s*$/ && |
if (defined($sname) && $sname !~ /^\s*$/ && |
Line 2985 sub track_student_link {
|
Line 2993 sub track_student_link {
|
$target = ''; |
$target = ''; |
} |
} |
if ($start) { $link.='&start='.$start; } |
if ($start) { $link.='&start='.$start; } |
|
if ($only_body) { $link .= '&only_body=1'; } |
$title = &mt($title); |
$title = &mt($title); |
$linktext = &mt($linktext); |
$linktext = &mt($linktext); |
return qq{<a href="$link" title="$title" $target>$linktext</a>}. |
return qq{<a href="$link" title="$title" $target>$linktext</a>}. |
Line 4089 sub determinedomain {
|
Line 4098 sub determinedomain {
|
my $domain=shift; |
my $domain=shift; |
if (! $domain) { |
if (! $domain) { |
# Determine domain if we have not been given one |
# Determine domain if we have not been given one |
$domain = $Apache::lonnet::perlvar{'lonDefDomain'}; |
$domain = &Apache::lonnet::default_login_domain(); |
if ($env{'user.domain'}) { $domain=$env{'user.domain'}; } |
if ($env{'user.domain'}) { $domain=$env{'user.domain'}; } |
if ($env{'request.role.domain'}) { |
if ($env{'request.role.domain'}) { |
$domain=$env{'request.role.domain'}; |
$domain=$env{'request.role.domain'}; |
Line 4634 sub standard_css {
|
Line 4643 sub standard_css {
|
|
|
my $sans = 'Verdana,Arial,Helvetica,sans-serif'; |
my $sans = 'Verdana,Arial,Helvetica,sans-serif'; |
my $mono = 'monospace'; |
my $mono = 'monospace'; |
my $data_table_head = $sidebg; |
my $data_table_head = $tabbg; |
my $data_table_light = '#FAFAFA'; |
my $data_table_light = '#FAFAFA'; |
my $data_table_dark = '#F0F0F0'; |
my $data_table_dark = '#F0F0F0'; |
my $data_table_darker = '#CCCCCC'; |
my $data_table_darker = '#CCCCCC'; |
Line 4727 div.LC_confirm_box .LC_success img {
|
Line 4736 div.LC_confirm_box .LC_success img {
|
color: #999999; |
color: #999999; |
} |
} |
|
|
|
.LC_discussion { |
|
background: $tabbg; |
|
border: 1px solid black; |
|
margin: 2px; |
|
} |
|
|
|
.LC_disc_action_links_bar { |
|
background: $tabbg; |
|
border: none; |
|
margin: 4px; |
|
} |
|
|
|
.LC_disc_action_left { |
|
text-align: left; |
|
} |
|
|
|
.LC_disc_action_right { |
|
text-align: right; |
|
} |
|
|
|
.LC_disc_new_item { |
|
background: white; |
|
border: 2px solid red; |
|
margin: 2px; |
|
} |
|
|
|
.LC_disc_old_item { |
|
background: white; |
|
border: 1px solid black; |
|
margin: 2px; |
|
} |
|
|
table.LC_pastsubmission { |
table.LC_pastsubmission { |
border: 1px solid black; |
border: 1px solid black; |
margin: 2px; |
margin: 2px; |
Line 4921 table.LC_nested_outer {
|
Line 4962 table.LC_nested_outer {
|
border-spacing: 0; |
border-spacing: 0; |
width: 100%; |
width: 100%; |
} |
} |
|
table.LC_innerpickbox, |
table.LC_nested { |
table.LC_nested { |
border: none; |
border: none; |
border-collapse: collapse; |
border-collapse: collapse; |
Line 4928 table.LC_nested {
|
Line 4970 table.LC_nested {
|
width: 100%; |
width: 100%; |
} |
} |
table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th, |
table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th, |
table.LC_prior_tries tr th { |
table.LC_prior_tries tr th, |
|
table.LC_innerpickbox tr th { |
font-weight: bold; |
font-weight: bold; |
background-color: $data_table_head; |
background-color: $data_table_head; |
font-size: smaller; |
font-size: smaller; |
} |
} |
|
table.LC_innerpickbox tr th, |
|
table.LC_innerpickbox tr td { |
|
vertical-align: top; |
|
} |
table.LC_data_table tr.LC_info_row > td { |
table.LC_data_table tr.LC_info_row > td { |
background-color: #CCCCCC; |
background-color: #CCCCCC; |
font-weight: bold; |
font-weight: bold; |
Line 5246 table.LC_pick_box {
|
Line 5293 table.LC_pick_box {
|
border-spacing: 1px; |
border-spacing: 1px; |
} |
} |
table.LC_pick_box td.LC_pick_box_title { |
table.LC_pick_box td.LC_pick_box_title { |
background: $sidebg; |
background: $tabbg; |
font-weight: bold; |
font-weight: bold; |
text-align: right; |
text-align: right; |
vertical-align: top; |
vertical-align: top; |
Line 5254 table.LC_pick_box td.LC_pick_box_title {
|
Line 5301 table.LC_pick_box td.LC_pick_box_title {
|
padding: 8px; |
padding: 8px; |
} |
} |
table.LC_pick_box td.LC_selfenroll_pick_box_title { |
table.LC_pick_box td.LC_selfenroll_pick_box_title { |
background: $sidebg; |
background: $tabbg; |
font-weight: bold; |
font-weight: bold; |
text-align: right; |
text-align: right; |
width: 350px; |
width: 350px; |
Line 6808 If the user's status includes multiple t
|
Line 6855 If the user's status includes multiple t
|
the largest default quota which applies to the user determines the |
the largest default quota which applies to the user determines the |
default quota returned. |
default quota returned. |
|
|
|
=back |
|
|
=cut |
=cut |
|
|
############################################### |
############################################### |
Line 6956 sub user_picker {
|
Line 7005 sub user_picker {
|
# loncreateuser::print_user_query_page() |
# loncreateuser::print_user_query_page() |
# has been completed. |
# has been completed. |
next if ($option eq 'alc'); |
next if ($option eq 'alc'); |
|
next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs')); |
next if ($option eq 'crs' && !$env{'request.course.id'}); |
next if ($option eq 'crs' && !$env{'request.course.id'}); |
if ($curr_selected{'srchin'} eq $option) { |
if ($curr_selected{'srchin'} eq $option) { |
$srchinsel .= ' |
$srchinsel .= ' |
Line 7406 sub sorted_slots {
|
Line 7456 sub sorted_slots {
|
|
|
=pod |
=pod |
|
|
=back |
|
|
|
=head1 HTTP Helpers |
=head1 HTTP Helpers |
|
|
=over 4 |
=over 4 |
Line 8703 sub restore_settings {
|
Line 8751 sub restore_settings {
|
|
|
=item * &build_recipient_list() |
=item * &build_recipient_list() |
|
|
Build recipient lists for four types of e-mail: |
Build recipient lists for five types of e-mail: |
(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors |
(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors |
(d) Help requests, generated by |
(d) Help requests, (e) Course requests needing approval, generated by |
lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively. |
lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and |
|
loncoursequeueadmin.pm respectively. |
|
|
Inputs: |
Inputs: |
defmail (scalar - email address of default recipient), |
defmail (scalar - email address of default recipient), |
Line 9279 sub check_clone {
|
Line 9328 sub check_clone {
|
$clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'}); |
$clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'}); |
} else { |
} else { |
my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1}); |
my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1}); |
if ($env{'request.role.domain'} eq $args->{'clonedomain'}) { |
if (($env{'request.role.domain'} eq $args->{'clonedomain'}) && |
$can_clone = 1; |
(&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) { |
|
$can_clone = 1; |
} else { |
} else { |
my %clonehash = &Apache::lonnet::get('environment',['cloners'], |
my %clonehash = &Apache::lonnet::get('environment',['cloners'], |
$args->{'clonedomain'},$args->{'clonecourse'}); |
$args->{'clonedomain'},$args->{'clonecourse'}); |
Line 9307 sub check_clone {
|
Line 9357 sub check_clone {
|
} |
} |
|
|
sub construct_course { |
sub construct_course { |
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_; |
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category) = @_; |
my $outcome; |
my $outcome; |
my $linefeed = '<br />'."\n"; |
my $linefeed = '<br />'."\n"; |
if ($context eq 'auto') { |
if ($context eq 'auto') { |
Line 9345 sub construct_course {
|
Line 9395 sub construct_course {
|
$args->{'crscode'}, |
$args->{'crscode'}, |
$args->{'ccuname'}.':'. |
$args->{'ccuname'}.':'. |
$args->{'ccdomain'}, |
$args->{'ccdomain'}, |
$args->{'crstype'}); |
$args->{'crstype'}, |
|
$cnum,$context,$category); |
|
|
|
|
# Note: The testing routines depend on this being output; see |
# Note: The testing routines depend on this being output; see |
# Utils::Course. This needs to at least be output as a comment |
# Utils::Course. This needs to at least be output as a comment |
Line 9659 sub group_term {
|
Line 9711 sub group_term {
|
return $names{$crstype}; |
return $names{$crstype}; |
} |
} |
|
|
|
sub course_types { |
|
my @types = ('official','unofficial','community'); |
|
my %typename = ( |
|
official => 'Official course', |
|
unofficial => 'Unofficial course', |
|
community => 'Community', |
|
); |
|
return (\@types,\%typename); |
|
} |
|
|
sub icon { |
sub icon { |
my ($file)=@_; |
my ($file)=@_; |
my $curfext = lc((split(/\./,$file))[-1]); |
my $curfext = lc((split(/\./,$file))[-1]); |