version 1.172, 2006/04/10 18:49:56
|
version 1.174, 2006/04/20 02:58:17
|
Line 84 sub get_colors {
|
Line 84 sub get_colors {
|
|
|
sub menubuttons { |
sub menubuttons { |
my $forcereg=shift; |
my $forcereg=shift; |
my $target =shift; |
|
my $registration=shift; |
my $registration=shift; |
my $titletable=shift; |
my $titletable=shift; |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
Line 164 $reloadlink $navmaps $docs $groups
|
Line 163 $reloadlink $navmaps $docs $groups
|
</script> |
</script> |
$form |
$form |
ENDMAINMENU |
ENDMAINMENU |
if ($registration) { $output.=&innerregister($forcereg,$target); } |
if ($registration) { $output.=&innerregister($forcereg); } |
return $output."<hr />"; |
return $output."<hr />"; |
} elsif ($env{'environment.remote'} eq 'off') { |
} elsif ($env{'environment.remote'} eq 'off') { |
# Remote Control is switched off |
# Remote Control is switched off |
Line 244 ENDCRELOAD
|
Line 243 ENDCRELOAD
|
} |
} |
my $reg=''; |
my $reg=''; |
if ($registration) { |
if ($registration) { |
$reg=&innerregister($forcereg,$target,$titletable); |
$reg=&innerregister($forcereg,$titletable); |
} |
} |
my $form=&serverform(); |
my $form=&serverform(); |
my $utility=&utilityfunctions(); |
my $utility=&utilityfunctions(); |
Line 294 ENDINLINEMENU
|
Line 293 ENDINLINEMENU
|
# ====================================== This gets called in the header section |
# ====================================== This gets called in the header section |
|
|
sub registerurl { |
sub registerurl { |
my $forcereg=shift; |
my ($forcereg) = @_; |
my $target = shift; |
|
my $result = ''; |
my $result = ''; |
if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } |
if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } |
my $force_title=''; |
my $force_title=''; |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
$force_title=&Apache::lonxml::display_title(); |
$force_title=&Apache::lonxml::display_title(); |
} |
} |
if ($target eq 'edit') { |
|
$result .="<script type=\"text/javascript\">\n". |
|
"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n". |
|
&Apache::loncommon::browser_and_searcher_javascript(). |
|
"\n</script>\n"; |
|
} |
|
if (($env{'browser.interface'} eq 'textual') || |
if (($env{'browser.interface'} eq 'textual') || |
($env{'environment.remote'} eq 'off') || |
($env{'environment.remote'} eq 'off') || |
((($env{'request.publicaccess'}) || |
((($env{'request.publicaccess'}) || |
Line 318 sub registerurl {
|
Line 310 sub registerurl {
|
'<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title; |
'<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title; |
} |
} |
# Graphical display after login only |
# Graphical display after login only |
if ($Apache::lonxml::registered && !$forcereg) { return ''; } |
if ($env{'request.registered'} && !$forcereg) { return ''; } |
if ($target ne 'edit') { |
$result.=&innerregister($forcereg); |
$result.=&innerregister($forcereg,$target); |
|
} |
|
return $result.$force_title; |
return $result.$force_title; |
} |
} |
|
|
Line 329 sub registerurl {
|
Line 319 sub registerurl {
|
# =========== and in the body of the document |
# =========== and in the body of the document |
|
|
sub innerregister { |
sub innerregister { |
my ($forcereg, $target, $titletable) = @_; |
my ($forcereg, $titletable) = @_; |
my $result = ''; |
my $result = ''; |
my ($uname,$thisdisfn); |
my ($uname,$thisdisfn); |
my $const_space = ($env{'request.state'} eq 'construct'); |
my $const_space = ($env{'request.state'} eq 'construct'); |
Line 337 sub innerregister {
|
Line 327 sub innerregister {
|
|
|
if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } |
if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } |
|
|
$Apache::lonxml::registered=1; |
$env{'request.registered'} = 1; |
|
|
my $textinter=($env{'browser.interface'} eq 'textual'); |
my $textinter=($env{'browser.interface'} eq 'textual'); |
my $noremote=($env{'environment.remote'} eq 'off'); |
my $noremote=($env{'environment.remote'} eq 'off'); |