version 1.296, 2009/10/28 09:01:59
|
version 1.309, 2009/12/03 14:27:16
|
Line 230 sub secondary_menu {
|
Line 230 sub secondary_menu {
|
next if $$menuitem[4] =~ /^(no|)remotenavCommunity$/ |
next if $$menuitem[4] =~ /^(no|)remotenavCommunity$/ |
&& $crstype ne 'Community'; |
&& $crstype ne 'Community'; |
next if $$menuitem[4] =~ /showgroups$/ |
next if $$menuitem[4] =~ /showgroups$/ |
&& $canviewgrps |
&& !$canviewgrps |
&& !%groups; |
&& !%groups; |
|
|
if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { |
if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { |
# special treatment for role selector |
# special treatment for role selector |
my $roles_selector = roles_selector( |
my $roles_selector = &roles_selector( |
$env{'course.' . $env{'request.course.id'} . '.domain'}, |
$env{'course.' . $env{'request.course.id'} . '.domain'}, |
$env{'course.' . $env{'request.course.id'} . '.num'} ); |
$env{'course.' . $env{'request.course.id'} . '.num'} ); |
|
|
Line 512 sub registerurl {
|
Line 512 sub registerurl {
|
} |
} |
|
|
sub innerregister { |
sub innerregister { |
my ($forcereg, $titletable) = @_; |
my ($forcereg,$titletable,$bread_crumbs) = @_; |
my $result = ''; |
my $result = ''; |
my ($uname,$thisdisfn); |
my ($uname,$thisdisfn); |
my $const_space = ($env{'request.state'} eq 'construct'); |
my $const_space = ($env{'request.state'} eq 'construct'); |
Line 545 sub innerregister {
|
Line 545 sub innerregister {
|
|
|
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread()); |
my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread()); |
my @crumbs = ({text => "Course Contents", |
my $contentstext; |
|
if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') { |
|
$contentstext = &mt('Community Contents'); |
|
} else { |
|
$contentstext = &mt('Course Contents'); |
|
} |
|
my @crumbs = ({text => $contentstext, |
href => "Javascript:gonav('/adm/navmaps')"}); |
href => "Javascript:gonav('/adm/navmaps')"}); |
|
|
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { |
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { |
Line 561 sub innerregister {
|
Line 567 sub innerregister {
|
|
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::add_breadcrumb(@crumbs); |
&Apache::lonhtmlcommon::add_breadcrumb(@crumbs); |
$breadcrumb .= &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0); |
#$breadcrumb .= &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0); |
unless (($env{'request.state'} eq 'edit') || ($newmail) || |
unless (($env{'request.state'} eq 'edit') || ($newmail) || |
($env{'request.state'} eq 'construct') || |
($env{'request.state'} eq 'construct') || |
($env{'form.register'})) { |
($env{'form.register'})) { |
Line 683 sub innerregister {
|
Line 689 sub innerregister {
|
} |
} |
# Finally, turn the button on or off |
# Finally, turn the button on or off |
if ($cfile && !$const_space) { |
if ($cfile && !$const_space) { |
$editbutton=&switch |
my $nocrsedit; |
('','',6,1,'pcstr.gif','edit[_1]','resource[_2]', |
# Suppress display where CC has switched to student role. |
|
if ($env{'request.course.id'}) { |
|
unless(&Apache::lonnet::allowed('mdc', |
|
$env{'request.course.id'})) { |
|
$nocrsedit = 1; |
|
} |
|
} |
|
if ($nocrsedit) { |
|
$editbutton=&clear(6,1); |
|
} else { |
|
$editbutton=&switch |
|
('','',6,1,'pcstr.gif','edit[_1]','resource[_2]', |
"go('".$cfile."');","Edit this resource"); |
"go('".$cfile."');","Edit this resource"); |
$noeditbutton = 0; |
$noeditbutton = 0; |
|
} |
} elsif ($editbutton eq '') { |
} elsif ($editbutton eq '') { |
$editbutton=&clear(6,1); |
$editbutton=&clear(6,1); |
} |
} |
Line 735 s&7&1&del.gif&delete[_1]&resource[_2]&go
|
Line 753 s&7&1&del.gif&delete[_1]&resource[_2]&go
|
s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document |
s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document |
ENDMENUITEMS |
ENDMENUITEMS |
} |
} |
|
if ($noremote) { |
|
if (ref($bread_crumbs) eq 'ARRAY') { |
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
foreach my $crumb (@{$bread_crumbs}){ |
|
&Apache::lonhtmlcommon::add_breadcrumb($crumb); |
|
} |
|
} |
|
} |
} elsif ( defined($env{'request.course.id'}) && |
} elsif ( defined($env{'request.course.id'}) && |
$env{'request.symb'} ne '' ) { |
$env{'request.symb'} ne '' ) { |
# |
# |
Line 811 ENDMENUITEMS
|
Line 837 ENDMENUITEMS
|
my $addremote=0; |
my $addremote=0; |
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } |
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } |
my $inlinebuttons=''; |
my $inlinebuttons=''; |
if ($addremote) { |
if ($addremote) { |
# Registered, textual output |
|
if ($env{'environment.icons'} eq 'iconsonly') { |
#SD START (work in progress!) |
$inlinebuttons=(<<ENDARROWSINLINE); |
Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
<tr><td> |
# Arrows for navigation |
$inlineremote[21] $inlineremote[23] |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'A', $inlineremote[21] ); |
ENDARROWSINLINE |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'A', $inlineremote[23] ); |
if (&hidden_button_check() ne 'yes') { |
if(hidden_button_check() ne 'yes'){ |
$inlinebuttons .= (<<ENDINLINEICONS); |
# notes |
$inlineremote[61] $inlineremote[63] |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[93]); |
$inlineremote[71] $inlineremote[72] $inlineremote[73] |
# bookmark |
$inlineremote[81] $inlineremote[82] $inlineremote[83] |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[91]); |
$inlineremote[91] $inlineremote[92] $inlineremote[93]</td></tr> |
# evaluate |
ENDINLINEICONS |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[81]); |
} |
# feedback |
} else { |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[82]); |
if ($inlineremote[21] ne '' || $inlineremote[23] ne '') { |
# print |
$inlinebuttons=(<<ENDFIRSTLINE); |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[83]); |
<tr><td>$inlineremote[21]</td><td> </td><td>$inlineremote[23]</td></tr> |
# metadata |
ENDFIRSTLINE |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[63]); |
} |
|
if (&hidden_button_check() ne 'yes') { |
# ? |
foreach my $row (6..9) { |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[61]); |
if ($inlineremote[${row}.'1'] ne '' |
# ? |
|| $inlineremote[$row.'2'] ne '' |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[71]); |
|| $inlineremote[$row.'3'] ne '') { |
# ? |
$inlinebuttons .= <<"ENDLINE"; |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[72]); |
<tr><td>$inlineremote["${row}1"]</td><td>$inlineremote["${row}2"]</td><td>$inlineremote["${row}3"]</td></tr> |
# ? |
ENDLINE |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[73]); |
} |
# ? |
} |
Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[92]); |
} |
|
} |
} |
} |
|
|
#SD END |
|
# # Registered, textual output |
|
# if ( $env{'environment.icons'} eq 'iconsonly' ) { |
|
# $inlinebuttons = (<<ENDARROWSINLINE); |
|
#<tr><td> |
|
#$inlineremote[21] $inlineremote[23] |
|
#ENDARROWSINLINE |
|
# if ( &hidden_button_check() ne 'yes' ) { |
|
# $inlinebuttons .= (<<ENDINLINEICONS); |
|
#$inlineremote[61] $inlineremote[63] |
|
#$inlineremote[71] $inlineremote[72] $inlineremote[73] |
|
#$inlineremote[81] $inlineremote[82] $inlineremote[83] |
|
#$inlineremote[91] $inlineremote[92] $inlineremote[93]</td></tr> |
|
#ENDINLINEICONS |
|
# } |
|
# } else { # not iconsonly |
|
# if ( $inlineremote[21] ne '' || $inlineremote[23] ne '' ) { |
|
# $inlinebuttons = (<<ENDFIRSTLINE); |
|
#<tr><td>$inlineremote[21]</td><td> </td><td>$inlineremote[23]</td></tr> |
|
#ENDFIRSTLINE |
|
# } |
|
# if ( &hidden_button_check() ne 'yes' ) { |
|
# foreach my $row ( 6 .. 9 ) { |
|
# if ( $inlineremote[ ${row} . '1' ] ne '' |
|
# || $inlineremote[ $row . '2' ] ne '' |
|
# || $inlineremote[ $row . '3' ] ne '' ) |
|
# { |
|
# $inlinebuttons .= <<"ENDLINE"; |
|
#<tr><td>$inlineremote["${row}1"]</td><td>$inlineremote["${row}2"]</td><td>$inlineremote["${row}3"]</td></tr> |
|
#ENDLINE |
|
# } |
|
# } |
|
# } |
|
# } |
|
} |
|
#SD see below |
|
$breadcrumb = &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0); |
$result =(<<ENDREGTEXT); |
$result =(<<ENDREGTEXT); |
<script type="text/javascript"> |
<script type="text/javascript"> |
// BEGIN LON-CAPA Internal |
// BEGIN LON-CAPA Internal |
</script> |
</script> |
$timesync |
$timesync |
$breadcrumb |
$breadcrumb |
$tablestart |
<!-- $tablestart --> |
$inlinebuttons |
<!-- $inlinebuttons --> |
$tableend |
<!-- $tableend --> |
$newmail |
$newmail |
$separator |
<!-- $separator --> |
<script type="text/javascript"> |
<script type="text/javascript"> |
// END LON-CAPA Internal |
// END LON-CAPA Internal |
</script> |
</script> |
Line 1213 sub switch {
|
Line 1276 sub switch {
|
my $pic= |
my $pic= |
'<img alt="'.$text.'" src="'. |
'<img alt="'.$text.'" src="'. |
&Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img). |
&Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img). |
'" align="'.($nobreak==3?'right':'left').'" class="LC_noBorder" />'; |
'" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />'; |
if ($env{'browser.interface'} eq 'faketextual') { |
if ($env{'browser.interface'} eq 'faketextual') { |
# Main Menu |
# Main Menu |
if ($nobreak==3) { |
if ($nobreak==3) { |
Line 1239 sub switch {
|
Line 1302 sub switch {
|
$inlineremote[$idx]='<a title="'.$desc.'" href="javascript:'.$act.';">'.$pic.'</a>'; |
$inlineremote[$idx]='<a title="'.$desc.'" href="javascript:'.$act.';">'.$pic.'</a>'; |
} else { |
} else { |
$inlineremote[$idx]= |
$inlineremote[$idx]= |
'<a class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic. |
'<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic. |
'<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>'; |
'<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>'; |
} |
} |
} |
} |
Line 1273 sub inlinemenu {
|
Line 1336 sub inlinemenu {
|
undef(%category_members); |
undef(%category_members); |
# calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control |
# calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control |
&rawconfig(1); |
&rawconfig(1); |
my $output='<table id="LC_mainmenu"><tr>'; |
my $output='<table><tr>'; |
for (my $col=1; $col<=2; $col++) { |
for (my $col=1; $col<=2; $col++) { |
$output.='<td class="LC_mainmenu_col_fieldset">'; |
$output.='<td class="LC_mainmenu_col_fieldset">'; |
for (my $row=1; $row<=8; $row++) { |
for (my $row=1; $row<=8; $row++) { |
foreach my $cat (keys(%category_members)) { |
foreach my $cat (keys(%category_members)) { |
if ($category_positions{$cat} ne "$col,$row") { next; } |
if ($category_positions{$cat} ne "$col,$row") { next; } |
#$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>'; |
#$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>'; |
$output.='<div class="LC_Box">'; |
$output.='<div class="LC_Box LC_400Box">'; |
$output.='<h4 class="LC_hcell">'.&mt($category_names{$cat}).'</h4>'; |
$output.='<h3 class="LC_hcell">'.&mt($category_names{$cat}).'</h3>'; |
$output.='<table>'; |
$output.='<table>'; |
my %active=(); |
my %active=(); |
foreach my $menu_item (split(/\:/,$category_members{$cat})) { |
foreach my $menu_item (split(/\:/,$category_members{$cat})) { |
Line 1398 sub rawconfig {
|
Line 1461 sub rawconfig {
|
} |
} |
} elsif ($pro =~ /^courseenv_(.*)$/) { |
} elsif ($pro =~ /^courseenv_(.*)$/) { |
my $key = $1; |
my $key = $1; |
if (($env{'course.'.$env{'request.course.id'}.'.'.$key}) && |
if ($crstype ne 'Community') { |
($crstype ne 'Community')) { |
my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key}; |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
if ($key eq 'canuse_pdfforms') { |
|
if ($env{'request.course.id'} && $coursepref eq '') { |
|
my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'}); |
|
$coursepref = $domdefs{'canuse_pdfforms'}; |
|
} |
|
} |
|
if ($coursepref) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
|
} |
} |
} |
} elsif ($pro =~ /^communityenv_(.*)$/) { |
} elsif ($pro =~ /^communityenv_(.*)$/) { |
my $key = $1; |
my $key = $1; |
if (($env{'course.'.$env{'request.course.id'}.'.'.$key}) && |
if ($crstype eq 'Community') { |
($crstype eq 'Community')) { |
my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key}; |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
if ($key eq 'canuse_pdfforms') { |
|
if ($env{'request.course.id'} && $coursepref eq '') { |
|
my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'}); |
|
$coursepref = $domdefs{'canuse_pdfforms'}; |
|
} |
|
} |
|
if ($coursepref) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
|
} |
} |
} |
} elsif ($pro =~ /^course_(.*)$/) { |
} elsif ($pro =~ /^course_(.*)$/) { |
# Check for permissions inside of a course |
# Check for permissions inside of a course |
Line 1551 function gonav(url) {
|
Line 1630 function gonav(url) {
|
NAVCONTROL |
NAVCONTROL |
} |
} |
|
|
|
sub dc_popup_js { |
|
my %lt = &Apache::lonlocal::texthash( |
|
more => '(More ...)', |
|
less => '(Less ...)', |
|
); |
|
return <<"END"; |
|
|
|
function showCourseID() { |
|
document.getElementById('dccid').style.display='block'; |
|
document.getElementById('dccid').style.textAlign='left'; |
|
document.getElementById('dccid').style.textFace='normal'; |
|
document.getElementById('dccidtext').innerHTML ='<a href="javascript:hideCourseID();">$lt{'less'}</a>'; |
|
return; |
|
} |
|
|
|
function hideCourseID() { |
|
document.getElementById('dccid').style.display='none'; |
|
document.getElementById('dccidtext').innerHTML ='<a href="javascript:showCourseID()">$lt{'more'}</a>'; |
|
return; |
|
} |
|
|
|
END |
|
|
|
} |
|
|
sub utilityfunctions { |
sub utilityfunctions { |
my $caller = shift; |
my $caller = shift; |
unless ($env{'environment.remote'} eq 'off' || |
unless ($env{'environment.remote'} eq 'off' || |
Line 1568 sub utilityfunctions {
|
Line 1672 sub utilityfunctions {
|
my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); |
my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); |
my $nav_control=&nav_control_js(); |
my $nav_control=&nav_control_js(); |
|
|
|
my $dc_popup_cid; |
|
if ($env{'user.adv'} && exists($env{'user.role.dc./'. |
|
$env{'course.'.$env{'request.course.id'}. |
|
'.domain'}.'/'})) { |
|
$dc_popup_cid = &dc_popup_js(); |
|
} |
|
|
my $start_page_annotate = |
my $start_page_annotate = |
&Apache::loncommon::start_page('Annotator',undef, |
&Apache::loncommon::start_page('Annotator',undef, |
{'only_body' => 1, |
{'only_body' => 1, |
Line 1595 return (<<ENDUTILITY)
|
Line 1706 return (<<ENDUTILITY)
|
var currentSymb="$currentsymb"; |
var currentSymb="$currentsymb"; |
|
|
$nav_control |
$nav_control |
|
$dc_popup_cid |
|
|
function go(url) { |
function go(url) { |
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
Line 1604 function go(url) {
|
Line 1716 function go(url) {
|
} |
} |
} |
} |
|
|
|
function gotop(url) { |
|
if (url!='' && url!= null) { |
|
top.location.href = url; |
|
} |
|
} |
|
|
function gopost(url,postdata) { |
function gopost(url,postdata) { |
if (url!='') { |
if (url!='') { |
this.document.server.action=url; |
this.document.server.action=url; |
Line 1788 sub hidden_button_check {
|
Line 1906 sub hidden_button_check {
|
|
|
sub roles_selector { |
sub roles_selector { |
my ($cdom,$cnum) = @_; |
my ($cdom,$cnum) = @_; |
my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}; |
my $crstype = &Apache::loncommon::course_type(); |
if ($crstype eq '') { |
|
$crstype = 'Course'; |
|
} |
|
my $now = time; |
my $now = time; |
my (%courseroles,%seccount); |
my (%courseroles,%seccount); |
my $is_cc; |
my $is_cc; |
my $role_selector; |
my $role_selector; |
if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) { |
my $ccrole; |
my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum}); |
if ($crstype eq 'Community') { |
|
$ccrole = 'co'; |
|
} else { |
|
$ccrole = 'cc'; |
|
} |
|
if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) { |
|
my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}); |
|
|
if ((($start) && ($start<0)) || |
if ((($start) && ($start<0)) || |
(($end) && ($end<$now)) || |
(($end) && ($end<$now)) || |
Line 1847 sub roles_selector {
|
Line 1968 sub roles_selector {
|
} else { |
} else { |
$switchtext = &mt('Switch course role to...') |
$switchtext = &mt('Switch course role to...') |
} |
} |
my @roles_order = ('cc','in','ta','ep','ad','st'); |
my @roles_order = ($ccrole,'in','ta','ep','ad','st'); |
if (keys(%courseroles) > 1) { |
if (keys(%courseroles) > 1) { |
$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles); |
$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles); |
$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles"> |
$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles"> |
Line 1855 sub roles_selector {
|
Line 1976 sub roles_selector {
|
$role_selector .= '<option value="">'.$switchtext.'</option>'; |
$role_selector .= '<option value="">'.$switchtext.'</option>'; |
foreach my $role (@roles_order) { |
foreach my $role (@roles_order) { |
if (defined($courseroles{$role})) { |
if (defined($courseroles{$role})) { |
$role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; |
$role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>'; |
} |
} |
} |
} |
foreach my $role (sort(keys(%courseroles))) { |
foreach my $role (sort(keys(%courseroles))) { |