--- loncom/interface/lonmenu.pm 2008/06/04 23:00:49 1.237
+++ loncom/interface/lonmenu.pm 2010/01/18 20:59:58 1.244.2.10
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.237 2008/06/04 23:00:49 bisitz Exp $
+# $Id: lonmenu.pm,v 1.244.2.10 2010/01/18 20:59:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,105 @@
# browser.interface is 'textual'
#
+=head1 NAME
+
+Apache::lonmenu
+
+=head1 SYNOPSIS
+
+Coordinates the response to clicking an image.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item show_course()
+
+Little texts
+
+=item initlittle()
+
+=item menubuttons()
+
+This gets called at the top of the body section
+
+=item show_return_link()
+
+=item registerurl()
+
+This gets called in the header section
+
+=item innerregister()
+
+This gets called in order to register a URL, both with the Remote
+and in the body of the document
+
+=item loadevents()
+
+=item unloadevents()
+
+=item startupremote()
+
+=item setflags()
+
+=item maincall()
+
+=item load_remote_msg()
+
+=item get_menu_name()
+
+=item reopenmenu()
+
+=item open()
+
+Open the menu
+
+=item clear()
+
+=item switch()
+
+Switch a button or create a link
+Switch acts on the javascript that is executed when a button is clicked.
+The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)".
+
+=item secondlevel()
+
+=item openmenu()
+
+=item inlinemenu()
+
+=item rawconfig()
+
+=item close()
+
+=item footer()
+
+=item utilityfunctions()
+
+=item serverform()
+
+=item constspaceform()
+
+=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()
+
+=item jump_to_role()
+
+=back
+
+=cut
+
package Apache::lonmenu;
use strict;
@@ -45,6 +144,7 @@ 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);
@@ -53,7 +153,6 @@ my @inlineremote;
-# ================================================================ Little texts
sub show_course {
my $course = !$env{'user.adv'};
if (!$env{'user.adv'}) {
@@ -72,20 +171,18 @@ sub initlittle {
return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
'nav' => 'Navigate Contents',
'main' => 'Main Menu',
- 'roles' => (&show_course()?
+ 'roles' => (&Apache::loncommon::show_course()?
'Courses':'Roles'),
'other' => 'Other Roles',
'docs' => 'Edit Course',
- 'exit' => 'Exit',
+ 'exit' => 'Logout',
'login' => 'Log In',
'launch' => 'Launch Remote Control',
'groups' => 'Groups',
- 'gdoc' => 'Group Documents',
+ 'gdoc' => 'Community Documents',
);
}
-# ============================= This gets called at the top of the body section
-
sub menubuttons {
my $forcereg=shift;
my $registration=shift;
@@ -150,9 +247,12 @@ ENDNAV
<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
ENDRELOAD
}
- if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- $docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
+ 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>
ENDDOCS
}
if ($showgroups) {
@@ -217,9 +317,10 @@ ENDINLINEMENU
$navmaps=(<<ENDNAV);
<td><a href="$link" target="_top">$lt{'nav'}</a></td>
ENDNAV
- my $is_group = (&Apache::loncommon::course_type() eq 'Group');
+ my $is_community =
+ (&Apache::loncommon::course_type() eq 'Community');
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};
+ my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
$docs=(<<ENDDOCS);
<td><a href="/adm/coursedocs" target="_top">$text</a></td>
ENDDOCS
@@ -251,16 +352,12 @@ ENDCRELOAD
}
my $form=&serverform();
my $utility=&utilityfunctions();
- my $remote;
- if ($env{'user.adv'}) {
- $remote = '<td><a href="/adm/remote?action=launch&url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
- }
my $helplink=&Apache::loncommon::top_nav_help('Help');
return (<<ENDINLINEMENU);
<script type="text/javascript">
-// BEGIN LON-CAPA Internal
// <![CDATA[
+// BEGIN LON-CAPA Internal
$utility
// ]]>
</script>
@@ -272,7 +369,6 @@ $reloadlink
$navmaps
$docs
$groups
-$remote
$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>
@@ -302,7 +398,6 @@ sub show_return_link {
));
}
-# ====================================== This gets called in the header section
sub registerurl {
my ($forcereg) = @_;
@@ -319,7 +414,9 @@ sub registerurl {
&unescape($env{'request.noversionuri'})))) &&
(!$forcereg))) {
return $result.
- '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
+ '<script type="text/javascript">'."\n".
+ 'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n".
+ '</script>'.$force_title;
}
# Graphical display after login only
if ($env{'request.registered'} && !$forcereg) { return ''; }
@@ -327,9 +424,6 @@ sub registerurl {
return $result.$force_title;
}
-# =========== This gets called in order to register a URL, both with the Remote
-# =========== and in the body of the document
-
sub innerregister {
my ($forcereg, $titletable) = @_;
my $result = '';
@@ -406,7 +500,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[_3]',
+ $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_4]',
"gocmd('/adm/grades','gradingmenu')",
'Modify user grades for this assessment resource');
} elsif (&Apache::lonnet::allowed('vgr',$crs)) {
@@ -427,6 +521,12 @@ 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
@@ -454,6 +554,7 @@ sub innerregister {
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
if (!$allowed) {
$editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
+ $noeditbutton = 0;
}
}
##
@@ -462,6 +563,7 @@ 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/;
@@ -482,10 +584,27 @@ sub innerregister {
$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
@@ -503,7 +622,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[_1]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
+s&6&3&pub.gif&publish[_1]&resource[_3]&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
@@ -519,13 +638,31 @@ c&8&1
c&8&2
s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&&1
-s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&&1
ENDMENUITEMS
+my $currentURL = &Apache::loncommon::get_symb();
+my ($symb_old,$symb_old_enc) = &Apache::loncommon::clean_symb($currentURL);
+my $annotation = &Apache::loncommon::get_annotation($symb_old,$symb_old_enc);
+$menuitems.="s&9&3&";
+if(length($annotation) > 0){
+ $menuitems.="anot2.gif";
+}else{
+ $menuitems.="anot.gif";
+}
+$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'}) {
$menuitems.=(<<ENDREALRES);
-s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
+s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata
ENDREALRES
}
$menuitems.=(<<ENDREALRES);
@@ -627,6 +764,7 @@ ENDREGTEXT
$result = (<<ENDREGTHIS);
<script type="text/javascript">
+// <![CDATA[
// BEGIN LON-CAPA Internal
var swmenu=null;
@@ -662,6 +800,7 @@ var swmenu=null;
}
// END LON-CAPA Internal
+// ]]>
</script>
ENDREGTHIS
}
@@ -677,6 +816,7 @@ ENDDONOTREGTEXT
$result = (<<ENDDONOTREGTHIS);
<script type="text/javascript">
+// <![CDATA[
// BEGIN LON-CAPA Internal
var swmenu=null;
@@ -701,6 +841,7 @@ var swmenu=null;
}
// END LON-CAPA Internal
+// ]]>
</script>
ENDDONOTREGTHIS
}
@@ -709,6 +850,42 @@ 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 ''; }
@@ -721,7 +898,6 @@ sub unloadevents() {
return 'LONCAPAstale();';
}
-# ============================================================= Start up remote
sub startupremote {
my ($lowerurl)=@_;
@@ -737,6 +913,7 @@ 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') {
@@ -786,7 +963,7 @@ function main() {
timestart=date.getTime();
wait();
}
-
+// ]]>
</script>
ENDREMOTESTARTUP
}
@@ -794,8 +971,10 @@ ENDREMOTESTARTUP
sub setflags() {
return(<<ENDSETFLAGS);
<script type="text/javascript">
+// <![CDATA[
menuloaded=0;
tim=0;
+// ]]>
</script>
ENDSETFLAGS
}
@@ -805,7 +984,9 @@ sub maincall() {
($env{'environment.remote'} eq 'off')) { return ''; }
return(<<ENDMAINCALL);
<script type="text/javascript">
+// <![CDATA[
main();
+// ]]>
</script>
ENDMAINCALL
}
@@ -817,8 +998,9 @@ sub load_remote_msg {
($env{'environment.remote'} eq 'off')) { return ''; }
my $esclowerurl=&escape($lowerurl);
- my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
- "/adm/remote?action=collapse&url=$esclowerurl");
+ my $link=&mt('[_1]Continue[_2] on in Inline Menu mode',
+ '<a href="/adm/remote?action=collapse&url='.$esclowerurl.'">',
+ '</a>');
return(<<ENDREMOTEFORM);
<p>
<form name="wheel">
@@ -835,7 +1017,6 @@ sub get_menu_name {
return 'LCmenu'.$hostid;
}
-# ================================================================= Reopen menu
sub reopenmenu {
if (($env{'browser.interface'} eq 'textual') ||
@@ -845,13 +1026,17 @@ sub reopenmenu {
return('window.open('.$nothing.',"'.$menuname.'","",false);');
}
-# =============================================================== Open the menu
sub open {
my $returnval='';
if (($env{'browser.interface'} eq 'textual') ||
($env{'environment.remote'} eq 'off')) {
- return '<script type="text/javascript">self.name="loncapaclient";</script>';
+ return
+ '<script type="text/javascript">'."\n".
+ '// <![CDATA['."\n".
+ 'self.name="loncapaclient";'."\n".
+ '// ]]>'."\n".
+ '</script>';
}
my $menuname = &get_menu_name();
@@ -864,11 +1049,13 @@ sub open {
#}
#ENDRESIZE
# }
- $returnval.=(<<ENDOPEN);
+ $returnval=(<<ENDOPEN);
+// <![CDATA[
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>';
}
@@ -898,8 +1085,9 @@ sub switch {
$top=&mt($top);
$bot=&mt($bot);
$desc=&mt($desc);
- $img=&mt($img);
-
+ if (($env{'environment.remote'} ne 'off') || ($env{'environment.icons'} eq 'classic')) {
+ $img=&mt($img);
+ }
my $idx=10*$row+$col;
$category_members{$cat}.=':'.$idx;
@@ -994,11 +1182,14 @@ sub inlinemenu {
&rawconfig(1);
my $output='<table id="LC_mainmenu"><tr>';
for (my $col=1; $col<=2; $col++) {
- $output.='<td class="LC_mainmenu_column">';
+ $output.='<td class="LC_mainmenu_col_fieldset">';
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.='<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">';
my %active=();
foreach my $menu_item (split(/\:/,$category_members{$cat})) {
if ($inlineremote[$menu_item]) {
@@ -1009,6 +1200,7 @@ sub inlinemenu {
$output.=$inlineremote[$item];
}
$output.='</table>';
+ $output.='</fieldset>';
}
}
$output.="</td>";
@@ -1031,7 +1223,7 @@ sub rawconfig {
my $uname=$env{'user.name'};
my $udom=$env{'user.domain'};
my $adv=$env{'user.adv'};
- my $show_course=&show_course();
+ my $show_course=&Apache::loncommon::show_course();
my $author=$env{'user.author'};
my $crs='';
if ($env{'request.course.id'}) {
@@ -1125,6 +1317,32 @@ sub rawconfig {
}
}
}
+ } elsif ($pro eq 'tools') {
+ 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) {
+ $output.=&clear($row,$col);
+ next;
+ }
+ }
+ $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') ||
@@ -1138,6 +1356,28 @@ 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 {
@@ -1146,6 +1386,7 @@ 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");
@@ -1155,6 +1396,7 @@ menu.autologout=0;
window.status='Closing Remote Control';
menu.close();
window.status='Done.';
+// ]]>
</script>
ENDCLOSE
}
@@ -1187,6 +1429,11 @@ 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'});
@@ -1341,16 +1588,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' "
- +">\\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>"
+ +'<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>'
+'$end_page_bookmark' );
bmquery.document.close();
}
@@ -1425,13 +1672,18 @@ sub hidden_button_check {
sub roles_selector {
my ($cdom,$cnum) = @_;
+ my $crstype = &Apache::loncommon::course_type();
my $now = time;
- my %courseroles;
+ my (%courseroles,%seccount);
my $is_cc;
my $role_selector;
- if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) {
- 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)) ||
(($end) && ($end<$now)) ||
(($start) && ($now<$start))) {
@@ -1441,42 +1693,55 @@ sub roles_selector {
}
}
if ($is_cc) {
- my %adv_roles =
- &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
- foreach my $role (keys(%adv_roles),'st') {
- my ($urole,$usec) = split(/:/,$role);
- @{$courseroles{$urole}} = 'none';
- }
+ &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
} else {
+ my %gotnosection;
foreach my $item (keys(%env)) {
- if ($item =~ m-^user\.role\.([^.]+)\./\Q$cdom\E/\Q$cnum\E(/?\w*)$-) {
+ if ($item =~ m-^user\.role\.([^.]+)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
my $role = $1;
my $sec = $2;
next if ($role eq 'gr');
my ($start,$end) = split(/\./,$env{$item});
next if (($start && $start > $now) || ($end && $end < $now));
if ($sec eq '') {
- $sec = 'none';
+ if (!$gotnosection{$role}) {
+ $seccount{$role} ++;
+ $gotnosection{$role} = 1;
+ }
}
if (ref($courseroles{$role}) eq 'ARRAY') {
- if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) {
- push(@{$courseroles{$role}},$sec);
+ if ($sec ne '') {
+ if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) {
+ push(@{$courseroles{$role}},$sec);
+ $seccount{$role} ++;
+ }
}
} else {
- @{$courseroles{$role}} = ($sec);
+ @{$courseroles{$role}} = ();
+ if ($sec ne '') {
+ $seccount{$role} ++;
+ push(@{$courseroles{$role}},$sec);
+ }
}
}
}
}
- my @roles_order = ('cc','in','ta','ep','ad','st');
+ 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');
if (keys(%courseroles) > 1) {
- $role_selector = &jump_to_role($cdom,$cnum);
+ $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="">'.&mt('Switch course role to...').'</option>';
+ $role_selector .= '<option value="">'.$switchtext.'</option>';
foreach my $role (@roles_order) {
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))) {
@@ -1486,7 +1751,7 @@ sub roles_selector {
}
$role_selector .= '</select>'."\n".
'<input type="hidden" name="destinationurl" value="'.
- $ENV{'REQUEST_URI'}.'" />'."\n".
+ &HTML::Entities::encode($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".
@@ -1495,24 +1760,152 @@ 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) = @_;
- my $output = <<"END";
+ my ($cdom,$cnum,$seccount,$courseroles) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ this => 'This role has section(s) associated with it.',
+ ente => 'Enter a specific section.',
+ orlb => 'Enter a specific section, or leave blank for no section.',
+ avai => 'Available sections are:',
+ youe => 'You entered an invalid section choice:',
+ plst => 'Please try again',
+ );
+ my $js;
+ if (ref($courseroles) eq 'HASH') {
+ $js = ' var secpick = new Array("'.$lt{'ente'}.'","'.$lt{'orlb'}.'");'."\n".
+ ' var numsec = new Array();'."\n".
+ ' var rolesections = new Array();'."\n".
+ ' var rolenames = new Array();'."\n".
+ ' var roleseclist = new Array();'."\n";
+ my @items = keys(%{$courseroles});
+ for (my $i=0; $i<@items; $i++) {
+ $js .= ' rolenames['.$i.'] = "'.$items[$i].'";'."\n";
+ my ($secs,$secstr);
+ if (ref($courseroles->{$items[$i]}) eq 'ARRAY') {
+ my @sections = sort { $a <=> $b } @{$courseroles->{$items[$i]}};
+ $secs = join('","',@sections);
+ $secstr = join(', ',@sections);
+ }
+ $js .= ' rolesections['.$i.'] = new Array("'.$secs.'");'."\n".
+ ' roleseclist['.$i.'] = "'.$secstr.'";'."\n".
+ ' numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n";
+ }
+ }
+ return <<"END";
<script type="text/javascript">
+//<![CDATA[
function adhocRole(roleitem) {
+ $js
var newrole = document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value;
if (newrole == '') {
return;
}
- newrole += './$cdom/$cnum';
- if (newrole == "$env{'request.role'}") {
+ var fullrole = newrole+'./$cdom/$cnum';
+ var selidx = '';
+ for (var i=0; i<rolenames.length; i++) {
+ if (rolenames[i] == newrole) {
+ selidx = i;
+ }
+ }
+ var secok = 1;
+ var secchoice = '';
+ if (selidx >= 0) {
+ if (numsec[selidx] > 1) {
+ secok = 0;
+ var numrolesec = rolesections[selidx].length;
+ var msgidx = numsec[selidx] - numrolesec;
+ secchoice = prompt("$lt{'this'}\\n"+secpick[msgidx]+"\\n$lt{'avai'} "+roleseclist[selidx],"");
+ if (secchoice == '') {
+ if (msgidx > 0) {
+ secok = 1;
+ }
+ } else {
+ for (var j=0; j<rolesections[selidx].length; j++) {
+ if (rolesections[selidx][j] == secchoice) {
+ secok = 1;
+ }
+ }
+ }
+ } else {
+ if (rolesections[selidx].length == 1) {
+ secchoice = rolesections[selidx][0];
+ }
+ }
+ }
+ if (secok == 1) {
+ if (secchoice != '') {
+ fullrole += '/'+secchoice;
+ }
+ } else {
+ document.rolechooser.elements[roleitem].selectedIndex = 0;
+ if (secchoice != null) {
+ alert("$lt{'youe'} \\""+secchoice+"\\".\\n $lt{'plst'}");
+ }
+ return;
+ }
+ if (fullrole == "$env{'request.role'}") {
return;
}
itemid = retrieveIndex('gotorole');
if (itemid != -1) {
- document.rolechooser.elements[itemid].name = newrole;
+ document.rolechooser.elements[itemid].name = fullrole;
}
- document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value = newrole;
+ document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value = fullrole;
document.rolechooser.selectrole.value = '1';
document.rolechooser.submit();
return;
@@ -1526,11 +1919,9 @@ function retrieveIndex(item) {
}
return -1;
}
-
-
+// ]]>
</script>
END
- return $output;
}