version 1.275, 2009/07/13 08:24:21
|
version 1.282, 2009/09/27 11:05:06
|
Line 137 use Apache::loncommon();
|
Line 137 use Apache::loncommon();
|
use Apache::lonenc(); |
use Apache::lonenc(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
|
use HTML::Entities(); |
|
|
use vars qw(@desklines %category_names %category_members %category_positions $readdesk); |
use vars qw(@desklines %category_names %category_members %category_positions $readdesk); |
|
|
Line 149 my @inlineremote;
|
Line 150 my @inlineremote;
|
|
|
sub initlittle { |
sub initlittle { |
return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', |
return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', |
'nav' => 'Navigate Contents', |
'nav' => 'Course Contents', |
'main' => 'Main Menu', |
'main' => 'Main Menu', |
'roles' => (&Apache::loncommon::show_course()? |
'roles' => (&Apache::loncommon::show_course()? |
'Courses':'Roles'), |
'Courses':'Roles'), |
Line 165 sub initlittle {
|
Line 166 sub initlittle {
|
|
|
sub menubuttons { |
sub menubuttons { |
my $forcereg=shift; |
my $forcereg=shift; |
my $registration=shift; |
|
my $titletable=shift; |
my $titletable=shift; |
# |
# |
# Early-out for pages that should not have a menu, triggered by query string "inhibitmenu=yes" |
# Early-out for pages that should not have a menu, triggered by query string "inhibitmenu=yes" |
Line 288 ENDRELOAD
|
Line 288 ENDRELOAD
|
<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li> |
<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li> |
ENDCRELOAD |
ENDCRELOAD |
} |
} |
my $reg=''; |
my $reg = $forcereg ? &innerregister($forcereg,$titletable) : ''; |
if ($registration) { |
my $form = &serverform(); |
$reg=&innerregister($forcereg,$titletable); |
my $utility = &utilityfunctions(); |
} |
|
my $form=&serverform(); |
#Prepare the message link that indicates the arrival of new mail |
my $utility=&utilityfunctions(); |
my $messagelink = Apache::lonmsg::mynewmail() ? "Message (new)" : "Message"; |
|
$messagelink = '<a href="javascript:go(\'/adm/communicate\');">' |
my $messagelink = ""; |
. mt($messagelink) .'</a>'; |
if(&Apache::lonmsg::mynewmail()){ |
|
$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message(new)</a>' |
my $helplink = &Apache::loncommon::top_nav_help('Help'); |
}else{ |
|
$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message</a>' |
|
} |
|
my $helplink=&Apache::loncommon::top_nav_help('Help'); |
|
return (<<ENDINLINEMENU); |
return (<<ENDINLINEMENU); |
<script type="text/javascript"> |
<script type="text/javascript"> |
// BEGIN LON-CAPA Internal |
|
// <![CDATA[ |
// <![CDATA[ |
|
// BEGIN LON-CAPA Internal |
$utility |
$utility |
// ]]> |
// ]]> |
</script> |
</script> |
Line 362 sub registerurl {
|
Line 358 sub registerurl {
|
(!&Apache::lonnet::is_on_map( |
(!&Apache::lonnet::is_on_map( |
&unescape($env{'request.noversionuri'})))) && |
&unescape($env{'request.noversionuri'})))) && |
(!$forcereg))) { |
(!$forcereg))) { |
return $result. |
return |
'<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title; |
$result |
|
.'<script type="text/javascript">'."\n" |
|
.'// <![CDATA['."\n" |
|
.'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n" |
|
.'// ]]>'."\n" |
|
.'</script>' |
|
.$force_title; |
} |
} |
# Graphical display after login only |
# Graphical display after login only |
if ($env{'request.registered'} && !$forcereg) { return ''; } |
if ($env{'request.registered'} && !$forcereg) { return ''; } |
Line 389 sub innerregister {
|
Line 391 sub innerregister {
|
my $reopen=&Apache::lonmenu::reopenmenu(); |
my $reopen=&Apache::lonmenu::reopenmenu(); |
|
|
my $newmail=''; |
my $newmail=''; |
my $breadcrumb; |
|
|
|
if (&Apache::lonmsg::newmail() && !$noremote) { |
if (&Apache::lonmsg::newmail() && !$noremote) { |
# We have new mail and remote is up |
# We have new mail and remote is up |
$newmail= 'swmenu.setstatus("you have","messages");'; |
$newmail= 'swmenu.setstatus("you have","messages");'; |
} |
} |
|
|
|
my $breadcrumb; |
if ($noremote |
if ($noremote |
&& ($env{'request.symb'}) |
&& ($env{'request.symb'}) |
&& ($env{'request.course.id'})) { |
&& ($env{'request.course.id'})) { |
Line 615 if(length($annotation) > 0){
|
Line 618 if(length($annotation) > 0){
|
$menuitems.="&anno-[_1]&tations[_1]&annotate()&"; |
$menuitems.="&anno-[_1]&tations[_1]&annotate()&"; |
$menuitems.="Make notes and annotations about this resource&&1\n"; |
$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)(\?|$)/) { |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { |
if (!$env{'request.enc'}) { |
if (!$env{'request.enc'}) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
Line 716 ENDREGTEXT
|
Line 726 ENDREGTEXT
|
$result = (<<ENDREGTHIS); |
$result = (<<ENDREGTHIS); |
|
|
<script type="text/javascript"> |
<script type="text/javascript"> |
|
// <![CDATA[ |
// BEGIN LON-CAPA Internal |
// BEGIN LON-CAPA Internal |
var swmenu=null; |
var swmenu=null; |
|
|
Line 751 var swmenu=null;
|
Line 762 var swmenu=null;
|
} |
} |
|
|
// END LON-CAPA Internal |
// END LON-CAPA Internal |
|
// ]]> |
</script> |
</script> |
ENDREGTHIS |
ENDREGTHIS |
} |
} |
Line 766 ENDDONOTREGTEXT
|
Line 778 ENDDONOTREGTEXT
|
$result = (<<ENDDONOTREGTHIS); |
$result = (<<ENDDONOTREGTHIS); |
|
|
<script type="text/javascript"> |
<script type="text/javascript"> |
|
// <![CDATA[ |
// BEGIN LON-CAPA Internal |
// BEGIN LON-CAPA Internal |
var swmenu=null; |
var swmenu=null; |
|
|
Line 790 var swmenu=null;
|
Line 803 var swmenu=null;
|
} |
} |
|
|
// END LON-CAPA Internal |
// END LON-CAPA Internal |
|
// ]]> |
</script> |
</script> |
ENDDONOTREGTHIS |
ENDDONOTREGTHIS |
} |
} |
Line 860 sub startupremote {
|
Line 874 sub startupremote {
|
my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); |
my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); |
return(<<ENDREMOTESTARTUP); |
return(<<ENDREMOTESTARTUP); |
<script type="text/javascript"> |
<script type="text/javascript"> |
|
// <![CDATA[ |
var timestart; |
var timestart; |
function wheelswitch() { |
function wheelswitch() { |
if (typeof(document.wheel) != 'undefined') { |
if (typeof(document.wheel) != 'undefined') { |
Line 910 function main() {
|
Line 925 function main() {
|
wait(); |
wait(); |
} |
} |
|
|
|
// ]]> |
</script> |
</script> |
ENDREMOTESTARTUP |
ENDREMOTESTARTUP |
} |
} |
Line 917 ENDREMOTESTARTUP
|
Line 933 ENDREMOTESTARTUP
|
sub setflags() { |
sub setflags() { |
return(<<ENDSETFLAGS); |
return(<<ENDSETFLAGS); |
<script type="text/javascript"> |
<script type="text/javascript"> |
|
// <![CDATA[ |
menuloaded=0; |
menuloaded=0; |
tim=0; |
tim=0; |
|
// ]]> |
</script> |
</script> |
ENDSETFLAGS |
ENDSETFLAGS |
} |
} |
Line 927 sub maincall() {
|
Line 945 sub maincall() {
|
if ($env{'environment.remote'} eq 'off') { return ''; } |
if ($env{'environment.remote'} eq 'off') { return ''; } |
return(<<ENDMAINCALL); |
return(<<ENDMAINCALL); |
<script type="text/javascript"> |
<script type="text/javascript"> |
|
// <![CDATA[ |
main(); |
main(); |
|
// ]]> |
</script> |
</script> |
ENDMAINCALL |
ENDMAINCALL |
} |
} |
Line 969 sub reopenmenu {
|
Line 989 sub reopenmenu {
|
sub open { |
sub open { |
my $returnval=''; |
my $returnval=''; |
if ($env{'environment.remote'} eq 'off') { |
if ($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(); |
my $menuname = &get_menu_name(); |
|
|
Line 982 sub open {
|
Line 1007 sub open {
|
#} |
#} |
#ENDRESIZE |
#ENDRESIZE |
# } |
# } |
$returnval.=(<<ENDOPEN); |
$returnval=(<<ENDOPEN); |
|
// <![CDATA[ |
window.status='Opening LON-CAPA Remote Control'; |
window.status='Opening LON-CAPA Remote Control'; |
var menu=window.open("/res/adm/pages/menu.html?inhibitmenu=yes","$menuname", |
var menu=window.open("/res/adm/pages/menu.html?inhibitmenu=yes","$menuname", |
"height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5"); |
"height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5"); |
self.name='loncapaclient'; |
self.name='loncapaclient'; |
|
// ]]> |
ENDOPEN |
ENDOPEN |
return '<script type="text/javascript">'.$returnval.'</script>'; |
return '<script type="text/javascript">'.$returnval.'</script>'; |
} |
} |
Line 1252 sub rawconfig {
|
Line 1279 sub rawconfig {
|
$output.=&clear($row,$col); |
$output.=&clear($row,$col); |
next; |
next; |
} |
} |
} elsif ($prt eq 'reqcrs') { |
} elsif (($prt eq 'reqcrsnsc') || ($prt eq 'reqcrsshc')) { |
my $showreqcrs = 0; |
if (($prt eq 'reqcrsnsc') && ($show_course)) { |
foreach my $type ('official','unofficial') { |
next; |
if (&Apache::lonnet::usertools_access($env{'user.name'}, |
} |
$env{'user.domain'}, |
if (($prt eq 'reqcrsshc') && (!$show_course)) { |
$type,undef,'requestcourses')) { |
next; |
$showreqcrs = 1; |
|
last; |
|
} |
|
} |
} |
|
my $showreqcrs = &check_for_rcrs(); |
if (!$showreqcrs) { |
if (!$showreqcrs) { |
$output.=&clear($row,$col); |
$output.=&clear($row,$col); |
next; |
next; |
Line 1282 sub rawconfig {
|
Line 1307 sub rawconfig {
|
return $output; |
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 |
# ======================================================================= Close |
|
|
sub close { |
sub close { |
Line 1289 sub close {
|
Line 1336 sub close {
|
my $menuname = &get_menu_name(); |
my $menuname = &get_menu_name(); |
return(<<ENDCLOSE); |
return(<<ENDCLOSE); |
<script type="text/javascript"> |
<script type="text/javascript"> |
|
// <![CDATA[ |
window.status='Accessing Remote Control'; |
window.status='Accessing Remote Control'; |
menu=window.open("/adm/rat/empty.html","$menuname", |
menu=window.open("/adm/rat/empty.html","$menuname", |
"height=350,width=150,scrollbars=no,menubar=no"); |
"height=350,width=150,scrollbars=no,menubar=no"); |
Line 1298 menu.autologout=0;
|
Line 1346 menu.autologout=0;
|
window.status='Closing Remote Control'; |
window.status='Closing Remote Control'; |
menu.close(); |
menu.close(); |
window.status='Done.'; |
window.status='Done.'; |
|
// ]]> |
</script> |
</script> |
ENDCLOSE |
ENDCLOSE |
} |
} |
Line 1640 sub roles_selector {
|
Line 1689 sub roles_selector {
|
} |
} |
$role_selector .= '</select>'."\n". |
$role_selector .= '</select>'."\n". |
'<input type="hidden" name="destinationurl" value="'. |
'<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="gotorole" value="1" />'."\n". |
'<input type="hidden" name="selectrole" value="" />'."\n". |
'<input type="hidden" name="selectrole" value="" />'."\n". |
'<input type="hidden" name="switch" value="1" />'."\n". |
'<input type="hidden" name="switch" value="1" />'."\n". |