version 1.127, 2005/07/13 19:56:17
|
version 1.130, 2005/10/24 21:32:42
|
Line 50 sub redirect_user {
|
Line 50 sub redirect_user {
|
my $swinfo=&Apache::lonmenu::rawconfig(); |
my $swinfo=&Apache::lonmenu::rawconfig(); |
my $navwindow; |
my $navwindow; |
if ($launch_nav eq 'on') { |
if ($launch_nav eq 'on') { |
$navwindow.=&Apache::lonnavmaps::launch_win('now'); |
$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef, |
|
($url eq '/adm/whatsnew')); |
} else { |
} else { |
$navwindow.=&Apache::lonnavmaps::close(); |
$navwindow.=&Apache::lonnavmaps::close(); |
} |
} |
Line 478 ENDHEADER
|
Line 479 ENDHEADER
|
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$button=0; |
$button=0; |
$switchserver=&Apache::lonnet::escape('http://'. |
$switchserver='otherserver='.$home.'&role='.$trolecode; |
$Apache::lonnet::hostname{$home}. |
|
'/adm/login?domain='.$env{'user.domain'}. |
|
'&username='.$env{'user.name'}. |
|
'&firsturl=/priv/'.$trest.'/'); |
|
} |
} |
#next if ($home eq 'no_host'); |
#next if ($home eq 'no_host'); |
$home = $Apache::lonnet::hostname{$home}; |
$home = $Apache::lonnet::hostname{$home}; |
Line 595 ENDHEADER
|
Line 592 ENDHEADER
|
'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'. |
'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'. |
&mt('Remarks and Calendar Announcements').'</th></tr>'."\n"); |
&mt('Remarks and Calendar Announcements').'</th></tr>'."\n"); |
my $doheaders=-1; |
my $doheaders=-1; |
foreach my $type ('Construction Space','Course','Domain','System') { |
foreach my $type ('Domain','Construction Space','Course','System') { |
my $haverole=0; |
my $haverole=0; |
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { |
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { |
if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { |
if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { |
Line 771 sub build_roletext {
|
Line 768 sub build_roletext {
|
unless ($nochoose) { |
unless ($nochoose) { |
if (!$button) { |
if (!$button) { |
if ($switchserver) { |
if ($switchserver) { |
$roletext.='<td><a href="/adm/logout?handover='. |
$roletext.='<td><a href="/adm/switchserver?'. |
$switchserver.'">'.&mt('Switch Server').'</a></td>'; |
$switchserver.'">'.&mt('Switch Server').'</a></td>'; |
} else { |
} else { |
$roletext.=('<td> </td>'); |
$roletext.=('<td> </td>'); |