version 1.897, 2009/10/13 13:18:24
|
version 1.907, 2009/10/31 16:17:07
|
Line 482 ENDAUTHORBRW
|
Line 482 ENDAUTHORBRW
|
} |
} |
|
|
sub coursebrowser_javascript { |
sub coursebrowser_javascript { |
my ($domainfilter,$sec_element,$formname)=@_; |
my ($domainfilter,$sec_element,$formname,$role_element)=@_; |
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 = ' |
Line 548 sub coursebrowser_javascript {
|
Line 548 sub coursebrowser_javascript {
|
} |
} |
$id_functions |
$id_functions |
ENDSTDBRW |
ENDSTDBRW |
if ($sec_element ne '') { |
if (($sec_element ne '') || ($role_element ne '')) { |
$output .= &setsec_javascript($sec_element,$formname); |
$output .= &setsec_javascript($sec_element,$formname,$role_element); |
} |
} |
$output .= ' |
$output .= ' |
// ]]> |
// ]]> |
Line 661 ENDUSERBRW
|
Line 661 ENDUSERBRW
|
} |
} |
|
|
sub setsec_javascript { |
sub setsec_javascript { |
my ($sec_element,$formname) = @_; |
my ($sec_element,$formname,$role_element) = @_; |
|
my (@courserolenames,@communityrolenames,$rolestr,$courserolestr, |
|
$communityrolestr); |
|
if ($role_element ne '') { |
|
my @allroles = ('st','ta','ep','in','ad'); |
|
foreach my $crstype ('Course','Community') { |
|
if ($crstype eq 'Community') { |
|
foreach my $role (@allroles) { |
|
push(@communityrolenames,&Apache::lonnet::plaintext($role,$crstype)); |
|
} |
|
push(@communityrolenames,&Apache::lonnet::plaintext('co')); |
|
} else { |
|
foreach my $role (@allroles) { |
|
push(@courserolenames,&Apache::lonnet::plaintext($role,$crstype)); |
|
} |
|
push(@courserolenames,&Apache::lonnet::plaintext('cc')); |
|
} |
|
} |
|
$rolestr = '"'.join('","',@allroles).'"'; |
|
$courserolestr = '"'.join('","',@courserolenames).'"'; |
|
$communityrolestr = '"'.join('","',@communityrolenames).'"'; |
|
} |
my $setsections = qq| |
my $setsections = qq| |
function setSect(sectionlist) { |
function setSect(sectionlist) { |
var sectionsArray = new Array(); |
var sectionsArray = new Array(); |
Line 695 function setSect(sectionlist) {
|
Line 716 function setSect(sectionlist) {
|
} |
} |
} |
} |
} |
} |
|
|
|
function setRole(crstype) { |
|; |
|; |
|
if ($role_element eq '') { |
|
$setsections .= ' return; |
|
} |
|
'; |
|
} else { |
|
$setsections .= qq| |
|
var elementLength = document.$formname.$role_element.length; |
|
var allroles = Array($rolestr); |
|
var courserolenames = Array($courserolestr); |
|
var communityrolenames = Array($communityrolestr); |
|
if (elementLength != undefined) { |
|
if (document.$formname.$role_element.options[5].value == 'cc') { |
|
if (crstype == 'Course') { |
|
return; |
|
} else { |
|
allroles[5] = 'co'; |
|
for (var i=0; i<6; i++) { |
|
document.$formname.$role_element.options[i].value = allroles[i]; |
|
document.$formname.$role_element.options[i].text = communityrolenames[i]; |
|
} |
|
} |
|
} else { |
|
if (crstype == 'Community') { |
|
return; |
|
} else { |
|
allroles[5] = 'cc'; |
|
for (var i=0; i<6; i++) { |
|
document.$formname.$role_element.options[i].value = allroles[i]; |
|
document.$formname.$role_element.options[i].text = courserolenames[i]; |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|; |
|
} |
return $setsections; |
return $setsections; |
} |
} |
|
|
|
|
sub selectcourse_link { |
sub selectcourse_link { |
my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_; |
my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_; |
my $linktext = &mt('Select Course'); |
my $linktext = &mt('Select Course'); |
if ($selecttype eq 'Community') { |
if ($selecttype eq 'Community') { |
$linktext = &mt('Select Community'); |
$linktext = &mt('Select Community'); |
|
} elsif ($selecttype eq 'Course/Community') { |
|
$linktext = &mt('Select Course/Community'); |
|
$selecttype = 'Course'; |
} |
} |
return '<span class="LC_nobreak">' |
return '<span class="LC_nobreak">' |
."<a href='" |
."<a href='" |
Line 1109 sub general_help {
|
Line 1171 sub general_help {
|
my $helptopic='Student_Intro'; |
my $helptopic='Student_Intro'; |
if ($env{'request.role'}=~/^(ca|au)/) { |
if ($env{'request.role'}=~/^(ca|au)/) { |
$helptopic='Authoring_Intro'; |
$helptopic='Authoring_Intro'; |
} elsif ($env{'request.role'}=~/^cc/) { |
} elsif ($env{'request.role'}=~/^(cc|co)/) { |
$helptopic='Course_Coordination_Intro'; |
$helptopic='Course_Coordination_Intro'; |
} elsif ($env{'request.role'}=~/^dc/) { |
} elsif ($env{'request.role'}=~/^dc/) { |
$helptopic='Domain_Coordination_Intro'; |
$helptopic='Domain_Coordination_Intro'; |
Line 3670 sub findallcourses {
|
Line 3732 sub findallcourses {
|
if (!%roles) { |
if (!%roles) { |
%roles = ( |
%roles = ( |
cc => 1, |
cc => 1, |
|
co => 1, |
in => 1, |
in => 1, |
ep => 1, |
ep => 1, |
ta => 1, |
ta => 1, |
Line 4397 sub bodytag {
|
Line 4460 sub bodytag {
|
if ($env{'request.role'} !~ /^cr/) { |
if ($env{'request.role'} !~ /^cr/) { |
$role = &Apache::lonnet::plaintext($role,&course_type()); |
$role = &Apache::lonnet::plaintext($role,&course_type()); |
} |
} |
|
if ($env{'request.course.sec'}) { |
|
$role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'}; |
|
} |
$realm = $env{'course.'.$env{'request.course.id'}.'.description'}; |
$realm = $env{'course.'.$env{'request.course.id'}.'.description'}; |
} else { |
} else { |
$role = &Apache::lonnet::plaintext($role); |
$role = &Apache::lonnet::plaintext($role); |
Line 4436 sub bodytag {
|
Line 4502 sub bodytag {
|
$dc_info = '('.$dc_info.')'; |
$dc_info = '('.$dc_info.')'; |
} |
} |
|
|
$role = "($role)" if $role; |
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); |
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); |
|
|
if ($env{'environment.remote'} eq 'off') { |
if ($env{'environment.remote'} eq 'off') { |
# No Remote |
# No Remote |
if ($env{'request.state'} eq 'construct') { |
if ($no_nav_bar) { return $bodytag; } |
$forcereg=1; |
|
} |
|
|
|
# if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { $forcereg=1; } |
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls |
|
# } |
|
|
|
my $titletable = '<table id="LC_title_bar">' |
# if ($env{'request.state'} eq 'construct') { |
."<tr><td> $titleinfo $dc_info</td>" |
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls |
.'</tr></table>'; |
# } |
|
|
if ($no_nav_bar) { |
$bodytag .= qq|<div id="LC_nav_bar">$name $role<br /> |
$bodytag .= $titletable; |
<em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; |
} else { |
|
$bodytag .= qq|<div id="LC_nav_bar">$name $role<br /> |
|
<em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; |
|
|
|
#SD $titletable is obsolete |
if ( $env{'form.inhibitmenu'} eq 'yes' |
#SD if ($env{'request.state'} eq 'construct') { |
|| $ENV{'REQUEST_URI'} eq '/adm/logout' |
#SD $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable); |
|| $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { |
#SD } else { |
|
#SD $bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable; |
return $bodytag; |
#SD } |
} |
if ( $env{'form.inhibitmenu'} eq 'yes' |
|
|| $ENV{'REQUEST_URI'} eq '/adm/logout' |
$bodytag .= Apache::lonhtmlcommon::scripttag( |
|| $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { |
Apache::lonmenu::utilityfunctions(), 'start'); |
|
|
return $bodytag; |
|
} |
|
|
|
$bodytag .= Apache::lonhtmlcommon::scripttag( |
$bodytag .= Apache::lonmenu::primary_menu(); |
Apache::lonmenu::utilityfunctions(), |
|
'start'); |
#don't show menus for public users |
$bodytag .= Apache::lonmenu::primary_menu(); |
if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){ |
$bodytag .= Apache::lonmenu::secondary_menu(); |
$bodytag .= Apache::lonmenu::secondary_menu(); |
#SD remove next line |
$bodytag .= Apache::lonmenu::serverform(); |
#$bodytag .= Apache::lonmenu::menubuttons($forcereg); |
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
$bodytag .= Apache::lonmenu::serverform(); |
$bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg; |
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
}else{ |
$bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg; |
# this is to seperate menu from content when there's no secondary |
|
# menu. Especially needed for public accessible ressources. |
|
$bodytag .= '<hr style="clear:both" />'; |
|
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
} |
} |
|
|
|
#SD testing |
|
#$bodytag .= Apache::lonmenu::menubuttons($forcereg); |
return $bodytag; |
return $bodytag; |
} |
} |
|
|
Line 4881 table#LC_mainmenu td.LC_mainmenu_column
|
Line 4943 table#LC_mainmenu td.LC_mainmenu_column
|
clear:both; |
clear:both; |
background: $sidebg; |
background: $sidebg; |
border-bottom: 1px solid $lg_border_color; |
border-bottom: 1px solid $lg_border_color; |
line-height: 32px; |
line-height: 2.5em; |
|
/* SD working here |
|
height: 2.5em; |
|
overflow: hidden; */ |
margin: 0; |
margin: 0; |
padding: 0; |
padding: 0; |
} |
} |
Line 4990 table.LC_data_table tr.LC_odd_row > td,
|
Line 5055 table.LC_data_table tr.LC_odd_row > td,
|
table.LC_pick_box tr > td.LC_odd_row { |
table.LC_pick_box tr > td.LC_odd_row { |
background-color: $data_table_light; |
background-color: $data_table_light; |
padding: 2px; |
padding: 2px; |
|
vertical-align: top; |
} |
} |
|
|
table.LC_data_table tr.LC_even_row > td, |
table.LC_data_table tr.LC_even_row > td, |
table.LC_pick_box tr > td.LC_even_row { |
table.LC_pick_box tr > td.LC_even_row { |
background-color: $data_table_dark; |
background-color: $data_table_dark; |
padding: 2px; |
padding: 2px; |
|
vertical-align: top; |
} |
} |
|
|
table.LC_data_table tr.LC_data_table_highlight td { |
table.LC_data_table tr.LC_data_table_highlight td { |
Line 5142 table.LC_mail_list tr.LC_mail_other:hove
|
Line 5209 table.LC_mail_list tr.LC_mail_other:hove
|
|
|
table.LC_data_table tr > td.LC_browser_file, |
table.LC_data_table tr > td.LC_browser_file, |
table.LC_data_table tr > td.LC_browser_file_published { |
table.LC_data_table tr > td.LC_browser_file_published { |
background: #CCFF88; |
background: #AAEE77; |
} |
} |
|
|
table.LC_data_table tr > td.LC_browser_file_locked, |
table.LC_data_table tr > td.LC_browser_file_locked, |
Line 5151 table.LC_data_table tr > td.LC_browser_f
|
Line 5218 table.LC_data_table tr > td.LC_browser_f
|
} |
} |
|
|
table.LC_data_table tr > td.LC_browser_file_obsolete { |
table.LC_data_table tr > td.LC_browser_file_obsolete { |
background: #AAAAAA; |
background: #888888; |
} |
} |
|
|
table.LC_data_table tr > td.LC_browser_file_modified, |
table.LC_data_table tr > td.LC_browser_file_modified, |
table.LC_data_table tr > td.LC_browser_file_metamodified { |
table.LC_data_table tr > td.LC_browser_file_metamodified { |
background: #FFFF77; |
background: #F8F866; |
} |
} |
|
|
table.LC_data_table tr.LC_browser_folder > td { |
table.LC_data_table tr.LC_browser_folder > td { |
background: #CCCCFF; |
background: #E0E8FF; |
} |
} |
|
|
table.LC_data_table tr > td.LC_roles_is { |
table.LC_data_table tr > td.LC_roles_is { |
Line 5302 table.LC_pick_box {
|
Line 5369 table.LC_pick_box {
|
table.LC_pick_box td.LC_pick_box_title { |
table.LC_pick_box td.LC_pick_box_title { |
background: $sidebg; |
background: $sidebg; |
font-weight: bold; |
font-weight: bold; |
text-align: right; |
text-align: left; |
vertical-align: top; |
vertical-align: top; |
width: 184px; |
width: 184px; |
padding: 8px; |
padding: 8px; |
Line 5340 table.LC_pick_box td.LC_oddrow_value {
|
Line 5407 table.LC_pick_box td.LC_oddrow_value {
|
background-color: $data_table_light; |
background-color: $data_table_light; |
} |
} |
|
|
table.LC_helpform_receipt { |
|
width: 620px; |
|
border-collapse: separate; |
|
background: white; |
|
border: 1px solid black; |
|
border-spacing: 1px; |
|
} |
|
|
|
table.LC_helpform_receipt td.LC_pick_box_title { |
|
background: $tabbg; |
|
font-weight: bold; |
|
text-align: right; |
|
width: 184px; |
|
padding: 8px; |
|
} |
|
|
|
table.LC_helpform_receipt td.LC_evenrow_value { |
|
text-align: left; |
|
padding: 8px; |
|
background-color: $data_table_light; |
|
} |
|
|
|
table.LC_helpform_receipt td.LC_oddrow_value { |
|
text-align: left; |
|
padding: 8px; |
|
background-color: $data_table_light; |
|
} |
|
|
|
table.LC_helpform_receipt td.LC_pick_box_separator { |
|
padding: 0; |
|
height: 1px; |
|
background: black; |
|
} |
|
|
|
span.LC_helpform_receipt_cat { |
span.LC_helpform_receipt_cat { |
font-weight: bold; |
font-weight: bold; |
} |
} |
Line 5837 ul#LC_secondary_menu a:hover,
|
Line 5870 ul#LC_secondary_menu a:hover,
|
.LC_FormSectionClearButton input:hover |
.LC_FormSectionClearButton input:hover |
ul.LC_TabContent li:hover a { |
ul.LC_TabContent li:hover a { |
color:#BF2317; |
color:#BF2317; |
text-decoration:none; |
text-decoration:none; |
} |
} |
|
|
h1 { |
h1 { |
Line 6067 ol#LC_PathBreadcrumbs {
|
Line 6100 ol#LC_PathBreadcrumbs {
|
padding-left: 10px; |
padding-left: 10px; |
margin: 0; |
margin: 0; |
list-style-position: inside; |
list-style-position: inside; |
|
/* SD working here |
|
white-space: nowrap; */ |
} |
} |
|
|
ol#LC_MenuBreadcrumbs li, |
ol#LC_MenuBreadcrumbs li, |
Line 6074 ol#LC_PathBreadcrumbs li,
|
Line 6109 ol#LC_PathBreadcrumbs li,
|
ul.LC_CourseBreadcrumbs li { |
ul.LC_CourseBreadcrumbs li { |
display: inline; |
display: inline; |
white-space: nowrap; |
white-space: nowrap; |
|
/* SD working here |
|
white-space: normal; */ |
} |
} |
|
|
ol#LC_MenuBreadcrumbs li a, |
ol#LC_MenuBreadcrumbs li a, |
Line 6757 sub simple_error_page {
|
Line 6794 sub simple_error_page {
|
my ($add_class) = @_; |
my ($add_class) = @_; |
$row_count[0]++; |
$row_count[0]++; |
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; |
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; |
$css_class = (join(' ',$css_class,$add_class)); |
$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq ''); |
return '<tr class="'.$css_class.'">'."\n";; |
return '<tr class="'.$css_class.'">'."\n";; |
} |
} |
|
|
sub continue_data_table_row { |
sub continue_data_table_row { |
my ($add_class) = @_; |
my ($add_class) = @_; |
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; |
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; |
$css_class = (join(' ',$css_class,$add_class)); |
$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');; |
return '<tr class="'.$css_class.'">'."\n";; |
return '<tr class="'.$css_class.'">'."\n";; |
} |
} |
|
|
Line 6863 sub get_users_function {
|
Line 6900 sub get_users_function {
|
if ($env{'request.role'}=~/^(st)/) { |
if ($env{'request.role'}=~/^(st)/) { |
$function='student'; |
$function='student'; |
} |
} |
if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { |
if ($env{'request.role'}=~/^(cc|co|in|ta|ep)/) { |
$function='coordinator'; |
$function='coordinator'; |
} |
} |
if ($env{'request.role'}=~/^(su|dc|ad|li)/) { |
if ($env{'request.role'}=~/^(su|dc|ad|li)/) { |
Line 10273 sub group_term {
|
Line 10310 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]); |