--- loncom/interface/lonmenu.pm 2003/04/18 01:20:25 1.64
+++ loncom/interface/lonmenu.pm 2003/06/06 02:24:49 1.76
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.64 2003/04/18 01:20:25 www Exp $
+# $Id: lonmenu.pm,v 1.76 2003/06/06 02:24:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -143,6 +143,9 @@ $navmaps
Launch Remote Control |
+
+
+LON-CAPA |
';
+ return $result.
+ ''.$force_title;
}
# Graphical display after login only
if ($Apache::lonxml::registered && !$forcereg) { return ''; }
$result.=&innerregister($forcereg,$target);
- return $result;
+ return $result.$force_title;
}
# =========== This gets called in order to register a URL, both with the Remote
@@ -189,6 +196,7 @@ sub innerregister {
my $forcereg=shift;
my $target = shift;
my $result = '';
+ if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
$Apache::lonxml::registered=1;
@@ -203,9 +211,12 @@ sub innerregister {
my $reopen=&Apache::lonmenu::reopenmenu();
my $newmail='';
+ if ($noremote) {
+ $newmail='';
+ }
if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'});
- $newmail=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
my $maptitle=&Apache::lonnet::gettitle($mapurl);
my $restitle=&Apache::lonnet::gettitle($resurl);
if ($maptitle) {
@@ -221,6 +232,9 @@ sub innerregister {
'You have new messages ':
'swmenu.setstatus("you have","messages");');
}
+ if ($noremote) {
+ $newmail.=' |
';
+ }
my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
my $tablestart=($noremote?'':'');
my $tableend=($noremote?'
':'');
@@ -385,7 +399,6 @@ var swmenu=null;
'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
2000);
-
}
// END LON-CAPA Internal
@@ -437,10 +450,12 @@ ENDDONOTREGTHIS
}
sub loadevents() {
+ if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
return 'LONCAPAreg();';
}
sub unloadevents() {
+ if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
return 'LONCAPAstale();';
}
@@ -553,6 +568,7 @@ ENDRESIZE
window.status='Opening LON-CAPA Remote Control';
var menu=window.open("/res/adm/pages/menu.html","$menuname",
"height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
+self.name='loncapaclient';
ENDOPEN
return '';
}