--- loncom/interface/lonmenu.pm 2010/01/19 16:53:10 1.244.2.14
+++ loncom/interface/lonmenu.pm 2009/05/08 16:08:56 1.263
@@ -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.263 2009/05/08 16:08:56 droeschl 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,7 +170,7 @@ 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',
@@ -174,7 +178,7 @@ sub initlittle {
'login' => 'Log In',
'launch' => 'Launch Remote Control',
'groups' => 'Groups',
- 'gdoc' => 'Community Documents',
+ 'gdoc' => 'Group Documents',
);
}
@@ -202,8 +206,8 @@ sub menubuttons {
my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
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 = '<a href="/adm/about.html"><img src="'.
+ $logo.'" alt="LON-CAPA Logo" class="LC_noBorder" /></a>';
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) {
@@ -291,17 +292,16 @@ ENDMAINMENU
return (<<ENDINLINEMENU);
<table id="LC_top_nav">
<tr>
- $logo
+ <td>$logo</td>
<td></td>
<td class="LC_top_nav_login">
<a href="/adm/roles" target="_top">$lt{'login'}</a>
</td>
</tr>
</table>
-</font>
ENDINLINEMENU
}
- $roles = '<td><a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a></td>';
+ $roles = '<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>';
# Do we have a NAV link?
if ($env{'request.course.id'}) {
my $link='/adm/navmaps?postdata='.$escurl.'&postsymb='.
@@ -310,35 +310,35 @@ ENDINLINEMENU
$link="javascript:gonav('".$link."')";
}
$navmaps=(<<ENDNAV);
-<td><a href="$link" target="_top">$lt{'nav'}</a></td>
+<li><a href="$link" target="_top">$lt{'nav'}</a></li>
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>
+<li><a href="/adm/coursedocs" target="_top">$text</a></li>
ENDDOCS
}
if ($showgroups) {
$groups =(<<ENDGROUPS);
-<td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
+<li><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></li>
ENDGROUPS
}
if (&show_return_link()) {
my $escreload=&escape('return:');
$reloadlink=(<<ENDRELOAD);
-<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
+<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
ENDRELOAD
}
if ($role_selector) {
- $roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>';
+ #$roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>';
+ $role_selector = '<li>'.$role_selector.'</li>';
}
}
if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
my $escreload=&escape('return:');
$reloadlink=(<<ENDCRELOAD);
-<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
+<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
ENDCRELOAD
}
my $reg='';
@@ -348,31 +348,40 @@ ENDCRELOAD
my $form=&serverform();
my $utility=&utilityfunctions();
+ my $messagelink = "";
+ if(&Apache::lonmsg::mynewmail()){
+ $messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message(new)</a>'
+ }else{
+ $messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message</a>'
+ }
my $helplink=&Apache::loncommon::top_nav_help('Help');
return (<<ENDINLINEMENU);
<script type="text/javascript">
-// <![CDATA[
// BEGIN LON-CAPA Internal
+// <![CDATA[
$utility
// ]]>
</script>
-<table id="LC_top_nav">
-<tr>
-$logo
-<td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
+<ol class="LC_smallMenu LC_right">
+ <li>$logo</li>
+ <li>$messagelink</li>
+ <li>$roles</li>
+ <li>$helplink</li>
+ <li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li>
+</ol>
+<ul id="LC_TabMainMenuContent">
+<li><a href="/adm/menu" target="_top">$lt{'main'}</a></li>
$reloadlink
$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>
-</tr>
-</table>
+$role_selector
+</ul>
$form
<script type="text/javascript">
// END LON-CAPA Internal
</script>
+<br clear="all" />
$reg
ENDINLINEMENU
} else {
@@ -409,9 +418,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 ''; }
@@ -561,42 +568,35 @@ sub innerregister {
my $uploaded;
if ($env{'request.filename'}) {
my $file=&Apache::lonnet::declutter($env{'request.filename'});
- $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
- # Check that the user has permission to edit this resource
- ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
- if (defined($cfudom)) {
- my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
- my $allowed=0;
- my @ids=&Apache::lonnet::current_machine_ids();
- foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
- if ($allowed) {
- $cfile=$file;
+ if (defined($cnum) && defined($cdom)) {
+ $uploaded = &is_course_upload($file,$cnum,$cdom);
+ }
+ if (!$uploaded) {
+ $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
+ # Check that the user has permission to edit this resource
+ ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
+ if (defined($cfudom)) {
+ my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
+ my $allowed=0;
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+ if ($allowed) {
+ $cfile=$file;
+ }
}
}
- }
+ }
# 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;
- }
+ $noeditbutton = 0;
} elsif ($editbutton eq '') {
$editbutton=&clear(6,1);
}
}
- if (($noeditbutton) && ($env{'request.filename'})) {
+ 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)) {
@@ -659,15 +659,8 @@ 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
ENDREALRES
@@ -771,7 +764,6 @@ ENDREGTEXT
$result = (<<ENDREGTHIS);
<script type="text/javascript">
-// <![CDATA[
// BEGIN LON-CAPA Internal
var swmenu=null;
@@ -807,7 +799,6 @@ var swmenu=null;
}
// END LON-CAPA Internal
-// ]]>
</script>
ENDREGTHIS
}
@@ -823,7 +814,6 @@ ENDDONOTREGTEXT
$result = (<<ENDDONOTREGTHIS);
<script type="text/javascript">
-// <![CDATA[
// BEGIN LON-CAPA Internal
var swmenu=null;
@@ -848,7 +838,6 @@ var swmenu=null;
}
// END LON-CAPA Internal
-// ]]>
</script>
ENDDONOTREGTHIS
}
@@ -920,7 +909,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 +958,7 @@ function main() {
timestart=date.getTime();
wait();
}
-// ]]>
+
</script>
ENDREMOTESTARTUP
}
@@ -978,10 +966,8 @@ ENDREMOTESTARTUP
sub setflags() {
return(<<ENDSETFLAGS);
<script type="text/javascript">
-// <![CDATA[
menuloaded=0;
tim=0;
-// ]]>
</script>
ENDSETFLAGS
}
@@ -991,9 +977,7 @@ sub maincall() {
($env{'environment.remote'} eq 'off')) { return ''; }
return(<<ENDMAINCALL);
<script type="text/javascript">
-// <![CDATA[
main();
-// ]]>
</script>
ENDMAINCALL
}
@@ -1005,9 +989,9 @@ 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('[_1]Continue[_2] on in Inline Menu mode'
+ ,'<a href="/adm/remote?action=collapse&url='.$esclowerurl.'">'
+ ,'</a>');
return(<<ENDREMOTEFORM);
<p>
<form name="wheel">
@@ -1038,12 +1022,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 +1035,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 +1104,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="LC_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 +1170,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="LC_ContentBoxSpecial">';
+ $output.='<h4 class="LC_hcell">'.&mt($category_names{$cat}).'</h4>';
+ $output.='<table>';
my %active=();
foreach my $menu_item (split(/\:/,$category_members{$cat})) {
if ($inlineremote[$menu_item]) {
@@ -1207,7 +1184,7 @@ sub inlinemenu {
$output.=$inlineremote[$item];
}
$output.='</table>';
- $output.='</fieldset>';
+ $output.='</div>';
}
}
$output.="</td>";
@@ -1230,17 +1207,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 +1225,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 +1258,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/)) ||
@@ -1383,14 +1310,16 @@ sub rawconfig {
$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;
+ } elsif ($prt eq 'reqcrs') {
+ my $showreqcrs = 0;
+ foreach my $type ('official','unofficial') {
+ if (&Apache::lonnet::usertools_access($env{'user.name'},
+ $env{'user.domain'},
+ $type,undef,'requestcourses')) {
+ $showreqcrs = 1;
+ last;
+ }
}
- my $showreqcrs = &check_for_rcrs();
if (!$showreqcrs) {
$output.=&clear($row,$col);
next;
@@ -1399,7 +1328,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 +1341,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 +1349,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 +1358,6 @@ menu.autologout=0;
window.status='Closing Remote Control';
menu.close();
window.status='Done.';
-// ]]>
</script>
ENDCLOSE
}
@@ -1486,11 +1390,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'});
@@ -1648,7 +1547,7 @@ function set_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 '
+ +'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" '
@@ -1702,6 +1601,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 +1628,13 @@ sub hidden_button_check {
sub roles_selector {
my ($cdom,$cnum) = @_;
- my $crstype = &Apache::loncommon::course_type();
my $now = time;
my (%courseroles,%seccount);
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,7 +1644,7 @@ sub roles_selector {
}
}
if ($is_cc) {
- &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
+ &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
} else {
my %gotnosection;
foreach my $item (keys(%env)) {
@@ -1771,22 +1677,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 +1695,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".
@@ -1810,11 +1709,11 @@ sub get_all_courseroles {
unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH')) {
return;
}
- my ($result,$cached) =
+ 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') &&
+ if ((ref($result->{'roles'}) eq 'HASH') &&
(ref($result->{'seccount'}) eq 'HASH')) {
%{$courseroles} = %{$result->{'roles'}};
%{$seccount} = %{$result->{'seccount'}};
@@ -1833,7 +1732,7 @@ sub get_all_courseroles {
}
if (ref($courseroles->{$urole}) eq 'ARRAY') {
if ($usec ne '') {
- if (!grep(/^\Q$usec\E$/,@{$courseroles->{$urole}})) {
+ if (!grep(/^Q$usec\E$/,@{$courseroles->{$urole}})) {
push(@{$courseroles->{$urole}},$usec);
$seccount->{$urole} ++;
}
@@ -1850,7 +1749,7 @@ sub get_all_courseroles {
@{$courseroles->{'st'}} = ();
if (keys(%sections_count) > 0) {
push(@{$courseroles->{'st'}},keys(%sections_count));
- $seccount->{'st'} = scalar(keys(%sections_count));
+ $seccount->{'st'} = scalar(keys(%sections_count));
}
my $rolehash = {
'roles' => $courseroles,
@@ -1891,9 +1790,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 +1862,11 @@ function retrieveIndex(item) {
}
return -1;
}
-// ]]>
+
+
</script>
END
+ return $output;
}