--- loncom/interface/lonmenu.pm 2010/01/19 16:53:10 1.244.2.14
+++ loncom/interface/lonmenu.pm 2008/12/09 04:49:01 1.249
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.244.2.14 2010/01/19 16:53:10 raeburn Exp $
+# $Id: lonmenu.pm,v 1.249 2008/12/09 04:49:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -120,6 +120,11 @@ The javascript is usually similar to "go
=item get_nav_status()
+=item convert_menu_function()
+
+FIXME this needs to move into mydesktab and the other locations
+the text is generated
+
=item hidden_button_check()
=item roles_selector()
@@ -139,7 +144,6 @@ use Apache::loncommon();
use Apache::lonenc();
use Apache::lonlocal;
use LONCAPA qw(:DEFAULT :match);
-use HTML::Entities();
use vars qw(@desklines %category_names %category_members %category_positions $readdesk);
@@ -166,15 +170,15 @@ sub initlittle {
return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
'nav' => 'Navigate Contents',
'main' => 'Main Menu',
- 'roles' => (&Apache::loncommon::show_course()?
+ 'roles' => (&show_course()?
'Courses':'Roles'),
'other' => 'Other Roles',
'docs' => 'Edit Course',
- 'exit' => 'Logout',
+ 'exit' => 'Exit',
'login' => 'Log In',
'launch' => 'Launch Remote Control',
'groups' => 'Groups',
- 'gdoc' => 'Community Documents',
+ 'gdoc' => 'Group Documents',
);
}
@@ -203,7 +207,7 @@ sub menubuttons {
my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
$logo = '<td class="LC_top_nav_logo"><a href="/adm/about.html"><img src="'.
- $logo.'" alt="LON-CAPA Logo" /></a></td>';
+ $logo.'" alt="LON-CAPA Logo" class="noBorder" /></a></td>';
if ($env{'request.state'} eq 'construct') {
if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
@@ -242,12 +246,9 @@ ENDNAV
<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
ENDRELOAD
}
- my $is_community =
- (&Apache::loncommon::course_type() eq 'Community');
- if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
- $docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top">$text</a>
+ if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ $docs=(<<ENDDOCS);
+<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
ENDDOCS
}
if ($showgroups) {
@@ -298,7 +299,6 @@ ENDMAINMENU
</td>
</tr>
</table>
-</font>
ENDINLINEMENU
}
$roles = '<td><a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a></td>';
@@ -312,10 +312,9 @@ ENDINLINEMENU
$navmaps=(<<ENDNAV);
<td><a href="$link" target="_top">$lt{'nav'}</a></td>
ENDNAV
- my $is_community =
- (&Apache::loncommon::course_type() eq 'Community');
+ my $is_group = (&Apache::loncommon::course_type() eq 'Group');
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
+ my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};
$docs=(<<ENDDOCS);
<td><a href="/adm/coursedocs" target="_top">$text</a></td>
ENDDOCS
@@ -351,8 +350,8 @@ ENDCRELOAD
my $helplink=&Apache::loncommon::top_nav_help('Help');
return (<<ENDINLINEMENU);
<script type="text/javascript">
-// <![CDATA[
// BEGIN LON-CAPA Internal
+// <![CDATA[
$utility
// ]]>
</script>
@@ -365,8 +364,8 @@ $navmaps
$docs
$groups
$roles
-<td class="LC_top_nav_help">$helplink</td>
-<td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
+<td style="width: 2.0em;">$helplink</td>
+<td style="width: 2.0em;"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
</tr>
</table>
$form
@@ -409,9 +408,7 @@ sub registerurl {
&unescape($env{'request.noversionuri'})))) &&
(!$forcereg))) {
return $result.
- '<script type="text/javascript">'."\n".
- 'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n".
- '</script>'.$force_title;
+ '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
}
# Graphical display after login only
if ($env{'request.registered'} && !$forcereg) { return ''; }
@@ -495,7 +492,7 @@ sub innerregister {
if ($env{'request.symb'} ne '' &&
$env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
if (&Apache::lonnet::allowed('mgr',$crs)) {
- $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_4]',
+ $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
"gocmd('/adm/grades','gradingmenu')",
'Modify user grades for this assessment resource');
} elsif (&Apache::lonnet::allowed('vgr',$crs)) {
@@ -516,12 +513,6 @@ sub innerregister {
### resource
###
my $editbutton = '';
- my $noeditbutton = 1;
- my ($cnum,$cdom);
- if ($env{'request.course.id'}) {
- $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- }
if ($env{'user.author'}) {
if ($env{'request.role'}=~/^(aa|ca|au)/) {
# Set defaults for authors
@@ -549,7 +540,6 @@ sub innerregister {
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
if (!$allowed) {
$editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
- $noeditbutton = 0;
}
}
##
@@ -558,7 +548,6 @@ sub innerregister {
my $cfile='';
my $cfuname='';
my $cfudom='';
- my $uploaded;
if ($env{'request.filename'}) {
my $file=&Apache::lonnet::declutter($env{'request.filename'});
$file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
@@ -576,42 +565,13 @@ sub innerregister {
}
# Finally, turn the button on or off
if ($cfile && !$const_space) {
- my $nocrsedit;
- # 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]',
+ $editbutton=&switch
+ ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
"go('".$cfile."');","Edit this resource");
- $noeditbutton = 0;
- }
} elsif ($editbutton eq '') {
$editbutton=&clear(6,1);
}
}
- if (($noeditbutton) && ($env{'request.filename'})) {
- if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- my $file=&Apache::lonnet::declutter($env{'request.filename'});
- if (defined($cnum) && defined($cdom)) {
- if (&is_course_upload($file,$cnum,$cdom)) {
- my $cfile = &edit_course_upload($file,$cnum,$cdom);
- if ($cfile) {
- $editbutton=&switch
- ('','',6,1,'pcstr.gif','edit[_1]',
- 'resource[_2]',"go('".$cfile."');",
- 'Edit this resource');
- }
- }
- }
- }
- }
###
###
# Prepare the rest of the buttons
@@ -629,7 +589,7 @@ sub innerregister {
$menuitems=(<<ENDMENUITEMS);
s&6&1&list.gif&list[_1]&dir[_1]&golist('$esc_currdir')&List current directory
s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version
-s&6&3&pub.gif&publish[_1]&resource[_3]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
+s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource
s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
ENDMENUITEMS
@@ -659,17 +619,10 @@ if(length($annotation) > 0){
$menuitems.="&anno-[_1]&tations[_1]&annotate()&";
$menuitems.="Make notes and annotations about this resource&&1\n";
- unless ($noremote) {
- my $showreqcrs = &check_for_rcrs();
- if ($showreqcrs) {
- $menuitems.="s&8&1&rcrs.gif&request[_1]&course[_16]".
- "&go('/adm/requestcourse')&Course requests\n";
- }
- }
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
- if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
+ if (!$env{'request.enc'}) {
$menuitems.=(<<ENDREALRES);
-s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata
+s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
ENDREALRES
}
$menuitems.=(<<ENDREALRES);
@@ -771,7 +724,6 @@ ENDREGTEXT
$result = (<<ENDREGTHIS);
<script type="text/javascript">
-// <![CDATA[
// BEGIN LON-CAPA Internal
var swmenu=null;
@@ -807,7 +759,6 @@ var swmenu=null;
}
// END LON-CAPA Internal
-// ]]>
</script>
ENDREGTHIS
}
@@ -823,7 +774,6 @@ ENDDONOTREGTEXT
$result = (<<ENDDONOTREGTHIS);
<script type="text/javascript">
-// <![CDATA[
// BEGIN LON-CAPA Internal
var swmenu=null;
@@ -848,7 +798,6 @@ var swmenu=null;
}
// END LON-CAPA Internal
-// ]]>
</script>
ENDDONOTREGTHIS
}
@@ -857,42 +806,6 @@ ENDDONOTREGTHIS
return $result;
}
-sub is_course_upload {
- my ($file,$cnum,$cdom) = @_;
- my $uploadpath = &LONCAPA::propath($cdom,$cnum);
- $uploadpath =~ s{^\/}{};
- if (($file =~ m{^\Q$uploadpath\E/userfiles/docs/}) ||
- ($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/docs/})) {
- return 1;
- }
- return;
-}
-
-sub edit_course_upload {
- my ($file,$cnum,$cdom) = @_;
- my $cfile;
- if ($file =~/\.(htm|html|css|js|txt)$/) {
- my $ext = $1;
- my $url = &Apache::lonnet::hreflocation('',$file);
- my $home = &Apache::lonnet::homeserver($cnum,$cdom);
- my @ids=&Apache::lonnet::current_machine_ids();
- my $dest;
- if ($home && grep(/^\Q$home\E$/,@ids)) {
- $dest = $url.'?forceedit=1';
- } else {
- unless (&Apache::lonnet::get_locks()) {
- $dest = '/adm/switchserver?otherserver='.
- $home.'&role='.$env{'request.role'}.
- '&url='.$url.'&forceedit=1';
- }
- }
- if ($dest) {
- $cfile = &HTML::Entities::encode($dest,'"<>&');
- }
- }
- return $cfile;
-}
-
sub loadevents() {
if ($env{'request.state'} eq 'construct' ||
$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
@@ -920,7 +833,6 @@ sub startupremote {
my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
return(<<ENDREMOTESTARTUP);
<script type="text/javascript">
-// <![CDATA[
var timestart;
function wheelswitch() {
if (typeof(document.wheel) != 'undefined') {
@@ -970,7 +882,7 @@ function main() {
timestart=date.getTime();
wait();
}
-// ]]>
+
</script>
ENDREMOTESTARTUP
}
@@ -978,10 +890,8 @@ ENDREMOTESTARTUP
sub setflags() {
return(<<ENDSETFLAGS);
<script type="text/javascript">
-// <![CDATA[
menuloaded=0;
tim=0;
-// ]]>
</script>
ENDSETFLAGS
}
@@ -991,9 +901,7 @@ sub maincall() {
($env{'environment.remote'} eq 'off')) { return ''; }
return(<<ENDMAINCALL);
<script type="text/javascript">
-// <![CDATA[
main();
-// ]]>
</script>
ENDMAINCALL
}
@@ -1005,9 +913,8 @@ sub load_remote_msg {
($env{'environment.remote'} eq 'off')) { return ''; }
my $esclowerurl=&escape($lowerurl);
- my $link=&mt('[_1]Continue[_2] on in Inline Menu mode',
- '<a href="/adm/remote?action=collapse&url='.$esclowerurl.'">',
- '</a>');
+ my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
+ "/adm/remote?action=collapse&url=$esclowerurl");
return(<<ENDREMOTEFORM);
<p>
<form name="wheel">
@@ -1038,12 +945,7 @@ sub open {
my $returnval='';
if (($env{'browser.interface'} eq 'textual') ||
($env{'environment.remote'} eq 'off')) {
- return
- '<script type="text/javascript">'."\n".
- '// <![CDATA['."\n".
- 'self.name="loncapaclient";'."\n".
- '// ]]>'."\n".
- '</script>';
+ return '<script type="text/javascript">self.name="loncapaclient";</script>';
}
my $menuname = &get_menu_name();
@@ -1056,13 +958,11 @@ sub open {
#}
#ENDRESIZE
# }
- $returnval=(<<ENDOPEN);
-// <![CDATA[
+ $returnval.=(<<ENDOPEN);
window.status='Opening LON-CAPA Remote Control';
var menu=window.open("/res/adm/pages/menu.html","$menuname",
"height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
self.name='loncapaclient';
-// ]]>
ENDOPEN
return '<script type="text/javascript">'.$returnval.'</script>';
}
@@ -1127,22 +1027,22 @@ sub switch {
my $pic=
'<img alt="'.$text.'" src="'.
&Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
- '" align="'.($nobreak==3?'right':'left').'" />';
+ '" align="'.($nobreak==3?'right':'left').'" class="noBorder" />';
if ($env{'browser.interface'} eq 'faketextual') {
# Accessibility
if ($nobreak==3) {
$inlineremote[$idx]="\n".
'<td class="LC_menubuttons_text" align="right">'.$text.
- '</td><td class="LC_menubuttons_img" align="left">'.
+ '</td><td align="left">'.
'<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
} elsif ($nobreak) {
$inlineremote[$idx]="\n<tr>".
- '<td class="LC_menubuttons_img" align="left">'.
+ '<td align="left">'.
'<a href="javascript:'.$act.';">'.$pic.'</a></td>
<td class="LC_menubuttons_text" align="left"><a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$text.'</span></a></td>';
} else {
$inlineremote[$idx]="\n<tr>".
- '<td class="LC_menubuttons_img" align="left">'.
+ '<td align="left">'.
'<a href="javascript:'.$act.';">'.$pic.
'</a></td><td class="LC_menubuttons_text" colspan="3">'.
'<a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$desc.'</span></a></td></tr>';
@@ -1193,10 +1093,10 @@ sub inlinemenu {
for (my $row=1; $row<=8; $row++) {
foreach my $cat (keys(%category_members)) {
if ($category_positions{$cat} ne "$col,$row") { next; }
- #$output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
- $output.='<fieldset id="LC_mainmenu_fieldset">';
- $output.='<legend class="LC_mainmenu_fieldset_category">'.&mt($category_names{$cat}).'</legend>';
- $output.='<table id="LC_menubuttons_mainmenu">';
+ #$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
+ $output.='<div class="ContentBoxSpecial">';
+ $output.='<h4 class="hcell">'.&mt($category_names{$cat}).'</h4>';
+ $output.='<table>';
my %active=();
foreach my $menu_item (split(/\:/,$category_members{$cat})) {
if ($inlineremote[$menu_item]) {
@@ -1207,7 +1107,7 @@ sub inlinemenu {
$output.=$inlineremote[$item];
}
$output.='</table>';
- $output.='</fieldset>';
+ $output.='</div>';
}
}
$output.="</td>";
@@ -1230,17 +1130,15 @@ sub rawconfig {
my $uname=$env{'user.name'};
my $udom=$env{'user.domain'};
my $adv=$env{'user.adv'};
- my $show_course=&Apache::loncommon::show_course();
+ my $show_course=&show_course();
my $author=$env{'user.author'};
my $crs='';
- my $crstype='';
if ($env{'request.course.id'}) {
$crs='/'.$env{'request.course.id'};
if ($env{'request.course.sec'}) {
$crs.='_'.$env{'request.course.sec'};
}
$crs=~s/\_/\//g;
- $crstype = &Apache::loncommon::course_type();
}
my $pub=($env{'request.state'} eq 'published');
my $con=($env{'request.state'} eq 'construct');
@@ -1250,18 +1148,13 @@ sub rawconfig {
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);
$prt=~s/\$uname/$uname/g;
$prt=~s/\$udom/$udom/g;
- $prt=~s/\$crs/$crs/g;
- if ($prt =~ /\$crs/) {
- next unless ($env{'request.course.id'});
- next if ($crstype eq 'Community');
- $prt=~s/\$crs/$crs/g;
- } elsif ($prt =~ /\$cmty/) {
- next unless ($env{'request.course.id'});
- next if ($crstype ne 'Community');
- $prt=~s/\$cmty/$crs/g;
- }
+ $prt=~s/\$crs/$crs/g;
$prt=~s/\$requested_domain/$requested_domain/g;
if ($category_names{$cat}!~/\w/) { $cat='oth'; }
+ my $type = &Apache::loncommon::course_type();
+ if ($type eq 'Group') {
+ $desc = &convert_menu_function($desc,$type);
+ }
if ($pro eq 'clear') {
$output.=&clear($row,$col);
} elsif ($pro eq 'any') {
@@ -1288,69 +1181,26 @@ sub rawconfig {
$uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
}
} elsif (($pro=~/^p(\w+)/) && ($prt)) {
- my $priv = $1;
- if ($priv =~ /^mdc(Course|Community)/) {
- if ($crstype eq $1) {
- $priv = 'mdc';
- } else {
- next;
- }
- }
- if (&Apache::lonnet::allowed($priv,$prt)) {
+ if (&Apache::lonnet::allowed($1,$prt)) {
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
}
- } elsif ($pro eq 'course') {
- if (($env{'request.course.fn'}) && ($crstype ne 'Community')) {
+ } elsif ($pro eq 'course') {
+ if ($env{'request.course.fn'}) {
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
- }
- } elsif ($pro eq 'community') {
- if (($env{'request.course.fn'}) && ($crstype eq 'Community')) {
- $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
- }
+ }
} elsif ($pro =~ /^courseenv_(.*)$/) {
my $key = $1;
- if ($crstype ne 'Community') {
- my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key};
- 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_(.*)$/) {
- my $key = $1;
- if ($crstype eq 'Community') {
- my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key};
- 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);
- }
+ if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) {
+ $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
}
} elsif ($pro =~ /^course_(.*)$/) {
# Check for permissions inside of a course
- if (($env{'request.course.id'}) && ($crstype ne 'Community') &&
- (&Apache::lonnet::allowed($1,$env{'request.course.id'}.
- ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
- )) {
- $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
- }
- } elsif ($pro =~ /^community_(.*)$/) {
- # Check for permissions inside of a community
- if (($env{'request.course.id'}) && ($crstype eq 'Community') &&
+ if (($env{'request.course.id'}) &&
(&Apache::lonnet::allowed($1,$env{'request.course.id'}.
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
)) {
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
- }
+ }
} elsif ($pro eq 'author') {
if ($author) {
if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) ||
@@ -1378,20 +1228,7 @@ sub rawconfig {
my @tools = ('aboutme','blog','portfolio');
if (grep(/^\Q$prt\E$/,@tools)) {
if (!&Apache::lonnet::usertools_access($env{'user.name'},
- $env{'user.domain'},
- $prt,undef,'tools')) {
- $output.=&clear($row,$col);
- next;
- }
- } elsif (($prt eq 'reqcrsnsc') || ($prt eq 'reqcrsshc')) {
- if (($prt eq 'reqcrsnsc') && ($show_course)) {
- next;
- }
- if (($prt eq 'reqcrsshc') && (!$show_course)) {
- next;
- }
- my $showreqcrs = &check_for_rcrs();
- if (!$showreqcrs) {
+ $env{'user.domain'},$prt)) {
$output.=&clear($row,$col);
next;
}
@@ -1399,7 +1236,6 @@ sub rawconfig {
$prt='any';
$output.=&secondlevel(
$uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
-
}
}
unless (($env{'browser.interface'} eq 'textual') ||
@@ -1413,28 +1249,6 @@ sub rawconfig {
return $output;
}
-sub check_for_rcrs {
- my $showreqcrs = 0;
- my @reqtypes = ('official','unofficial','community');
- foreach my $type (@reqtypes) {
- if (&Apache::lonnet::usertools_access($env{'user.name'},
- $env{'user.domain'},
- $type,undef,'requestcourses')) {
- $showreqcrs = 1;
- last;
- }
- }
- if (!$showreqcrs) {
- foreach my $type (@reqtypes) {
- if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
- $showreqcrs = 1;
- last;
- }
- }
- }
- return $showreqcrs;
-}
-
# ======================================================================= Close
sub close {
@@ -1443,7 +1257,6 @@ sub close {
my $menuname = &get_menu_name();
return(<<ENDCLOSE);
<script type="text/javascript">
-// <![CDATA[
window.status='Accessing Remote Control';
menu=window.open("/adm/rat/empty.html","$menuname",
"height=350,width=150,scrollbars=no,menubar=no");
@@ -1453,7 +1266,6 @@ menu.autologout=0;
window.status='Closing Remote Control';
menu.close();
window.status='Done.';
-// ]]>
</script>
ENDCLOSE
}
@@ -1486,11 +1298,6 @@ sub utilityfunctions {
unless (($env{'browser.interface'} eq 'textual') ||
($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
- if ($currenturl =~ m{^/adm/wrapper/ext/}) {
- if ($env{'request.external.querystring'}) {
- $currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'};
- }
- }
$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
@@ -1645,16 +1452,16 @@ function set_bookmark() {
bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
bmquery.document.write(
'$start_page_bookmark'
- +'<center><form method="post"'
- +' name="newlink" action="/adm/bookmarks" target="bmquery" '
- +'> <table width="340" height="150" '
- +'bgcolor="ffffff" align="center"><tr><td>Link Name:<br /><input '
- +'type="text" name="title" size="45" value="'+clienttitle+'" />'
- +'<br />Address:<br /><input type="text" name="address" size="45" '
- +'value="'+clienthref+'" /><br /><center><input type="submit" '
- +'value="Save" /> <input type="button" value="Close" '
- +'onclick="javascript:window.close();" /></center></td>'
- +'</tr></table></form></center>'
+ +"<center><form method='post'"
+ +" name='newlink' action='/adm/bookmarks' target='bmquery' "
+ +">\\n <table width=340 height=150 "
+ +"bgcolor='ffffff' align=center><tr><td>Link Name:<br /><input "
+ +"type='text' name='title' size=45 value='"+clienttitle+"' />"
+ +"<br />Address:<br /><input type='text' name='address' size='45' "
+ +"value='"+clienthref+"' /><br /><center><input type='submit' "
+ +"value='Save' /> <input type='button' value='Close (no save)' "
+ +"onclick='javascript:window.close();' /><\\/center><\\/td>"
+ +"<\\/tr><\\/table><\\/form><\\/center>"
+'$end_page_bookmark' );
bmquery.document.close();
}
@@ -1702,6 +1509,19 @@ sub get_nav_status {
return $navstatus;
}
+#FIXME this needs to move into mydesktab and the other locations
+# the text is generated
+sub convert_menu_function {
+ my ($rolename,$type) = @_;
+ if ($type eq 'Group') {
+ $rolename =~ s/student/member/g;
+ $rolename =~ s/group/team/g;
+ $rolename =~ s/course/group/g;
+ $rolename =~ s/Course/Group/g;
+ }
+ return $rolename;
+}
+
sub hidden_button_check {
my $hidden;
if ($env{'request.course.id'} eq '') {
@@ -1716,19 +1536,13 @@ sub hidden_button_check {
sub roles_selector {
my ($cdom,$cnum) = @_;
- my $crstype = &Apache::loncommon::course_type();
my $now = time;
- my (%courseroles,%seccount);
+ my (%courseroles,%seccount,%gotnosection);
my $is_cc;
my $role_selector;
- my $ccrole;
- 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 ($env{'user.role.cc./'.$cdom.'/'.$cnum}) {
+ my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum});
+
if ((($start) && ($start<0)) ||
(($end) && ($end<$now)) ||
(($start) && ($now<$start))) {
@@ -1738,9 +1552,35 @@ sub roles_selector {
}
}
if ($is_cc) {
- &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
+ my %adv_roles =
+ &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
+ foreach my $role (keys(%adv_roles)) {
+ my ($urole,$usec) = split(/:/,$role);
+ if (!$gotnosection{$urole}) {
+ $seccount{$urole} ++;
+ $gotnosection{$urole} = 1;
+ }
+ if (ref($courseroles{$urole}) eq 'ARRAY') {
+ if ($usec ne '') {
+ if (!grep(/^Q$usec\E$/,@{$courseroles{$urole}})) {
+ push(@{$courseroles{$urole}},$usec);
+ $seccount{$urole} ++;
+ }
+ }
+ } else {
+ @{$courseroles{$urole}} = ();
+ if ($usec ne '') {
+ $seccount{$urole} ++;
+ push(@{$courseroles{$urole}},$usec);
+ }
+ }
+ }
+ my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+ @{$courseroles{'st'}} = ();
+ if (keys(%sections_count) > 0) {
+ push(@{$courseroles{'st'}},keys(%sections_count));
+ }
} else {
- my %gotnosection;
foreach my $item (keys(%env)) {
if ($item =~ m-^user\.role\.([^.]+)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
my $role = $1;
@@ -1771,22 +1611,15 @@ sub roles_selector {
}
}
}
- my $switchtext;
- if ($crstype eq 'Community') {
- $switchtext = &mt('Switch community role to...')
- } else {
- $switchtext = &mt('Switch course role to...')
- }
-
- my @roles_order = ($ccrole,'in','ta','ep','ad','st');
+ my @roles_order = ('cc','in','ta','ep','ad','st');
if (keys(%courseroles) > 1) {
$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles);
$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
<select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';
- $role_selector .= '<option value="">'.$switchtext.'</option>';
+ $role_selector .= '<option value="">'.&mt('Switch course role to...').'</option>';
foreach my $role (@roles_order) {
if (defined($courseroles{$role})) {
- $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>';
+ $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>';
}
}
foreach my $role (sort(keys(%courseroles))) {
@@ -1796,7 +1629,7 @@ sub roles_selector {
}
$role_selector .= '</select>'."\n".
'<input type="hidden" name="destinationurl" value="'.
- &HTML::Entities::encode($ENV{'REQUEST_URI'},'"<>&').'" />'."\n".
+ $ENV{'REQUEST_URI'}.'" />'."\n".
'<input type="hidden" name="gotorole" value="1" />'."\n".
'<input type="hidden" name="selectrole" value="" />'."\n".
'<input type="hidden" name="switch" value="1" />'."\n".
@@ -1805,61 +1638,6 @@ sub roles_selector {
return $role_selector;
}
-sub get_all_courseroles {
- my ($cdom,$cnum,$courseroles,$seccount) = @_;
- unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH')) {
- return;
- }
- my ($result,$cached) =
- &Apache::lonnet::is_cached_new('getcourseroles',$cdom.'_'.$cnum);
- if (defined($cached)) {
- if (ref($result) eq 'HASH') {
- if ((ref($result->{'roles'}) eq 'HASH') &&
- (ref($result->{'seccount'}) eq 'HASH')) {
- %{$courseroles} = %{$result->{'roles'}};
- %{$seccount} = %{$result->{'seccount'}};
- return;
- }
- }
- }
- my %gotnosection;
- my %adv_roles =
- &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
- foreach my $role (keys(%adv_roles)) {
- my ($urole,$usec) = split(/:/,$role);
- if (!$gotnosection{$urole}) {
- $seccount->{$urole} ++;
- $gotnosection{$urole} = 1;
- }
- if (ref($courseroles->{$urole}) eq 'ARRAY') {
- if ($usec ne '') {
- if (!grep(/^\Q$usec\E$/,@{$courseroles->{$urole}})) {
- push(@{$courseroles->{$urole}},$usec);
- $seccount->{$urole} ++;
- }
- }
- } else {
- @{$courseroles->{$urole}} = ();
- if ($usec ne '') {
- $seccount->{$urole} ++;
- push(@{$courseroles->{$urole}},$usec);
- }
- }
- }
- my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum,['st']);
- @{$courseroles->{'st'}} = ();
- if (keys(%sections_count) > 0) {
- push(@{$courseroles->{'st'}},keys(%sections_count));
- $seccount->{'st'} = scalar(keys(%sections_count));
- }
- my $rolehash = {
- 'roles' => $courseroles,
- 'seccount' => $seccount,
- };
- &Apache::lonnet::do_cache_new('getcourseroles',$cdom.'_'.$cnum,$rolehash);
- return;
-}
-
sub jump_to_role {
my ($cdom,$cnum,$seccount,$courseroles) = @_;
my %lt = &Apache::lonlocal::texthash(
@@ -1891,9 +1669,8 @@ sub jump_to_role {
' numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n";
}
}
- return <<"END";
+ my $output = <<"END";
<script type="text/javascript">
-//<![CDATA[
function adhocRole(roleitem) {
$js
var newrole = document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value;
@@ -1964,9 +1741,11 @@ function retrieveIndex(item) {
}
return -1;
}
-// ]]>
+
+
</script>
END
+ return $output;
}