--- loncom/auth/lonroles.pm 2002/12/26 15:38:54 1.47
+++ loncom/auth/lonroles.pm 2003/02/03 18:03:52 1.50
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.47 2002/12/26 15:38:54 www Exp $
+# $Id: lonroles.pm,v 1.50 2003/02/03 18:03:52 harris41 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,9 +36,7 @@
# 12/08,12/28,
# YEAR=2001
# 01/15/01 Gerd Kortemeyer
-# 02/27/01 Scott Harrison
# 03/02,05/03,05/25,05/30,06/01,07/06,08/06 Gerd Kortemeyer
-# 12/21 Scott Harrison
# 12/29 Gerd Kortemeyer
#
###
@@ -150,7 +148,8 @@ ENDREDIR
my $swinfo=&Apache::lonmenu::rawconfig($r);
my $bodytag=&Apache::loncommon::bodytag('User Roles');
- my $helptag=&Apache::loncommon::help_open_topic("General_Intro","HELP");
+ my $helptag=&Apache::loncommon::help_open_topic
+ ("General_Intro","CLICK HERE FOR HELP");
$r->print(<
@@ -240,6 +239,7 @@ ENDHEADER
foreach $envkey (sort keys %ENV) {
my $button = 1;
+ my $switchserver='';
if ($envkey=~/^user\.role\./) {
my (undef,undef,$role,@pwhere)=split(/\./,$envkey);
next if (!defined($role) || $role eq '');
@@ -277,12 +277,14 @@ ENDHEADER
$tfont='#003300';
} elsif ($tstatus eq 'future') {
$tbg='#FFFF77';
+ $button=0;
} elsif ($tstatus eq 'will') {
$tbg='#FFAA77';
$tremark.='Active at next login. ';
} elsif ($tstatus eq 'expired') {
$tbg='#FF7777';
$tfont='#330000';
+ $button=0;
} elsif ($tstatus eq 'will_not') {
$tbg='#AAFF77';
$tremark.='Expired after logout. ';
@@ -306,7 +308,11 @@ ENDHEADER
# First, Co-Authorship roles
if ($role eq 'ca') {
my $home = &Apache::lonnet::homeserver($trest,$tdom);
- $button = 0 if ($home ne $r->dir_config('lonHostID'));
+ if ($home ne $r->dir_config('lonHostID')) {
+ $button=0;
+ $switchserver='http://'.
+ $Apache::lonnet::hostname{$home}.'/priv/'.$trest;
+ }
#next if ($home eq 'no_host');
$home = $Apache::lonnet::hostname{$home};
$ttype='Construction Space';
@@ -317,7 +323,12 @@ ENDHEADER
# Authors
my $home = &Apache::lonnet::homeserver
($ENV{'user.name'},$ENV{'user.domain'});
- $button = 0 if ($home ne $r->dir_config('lonHostID'));
+ if ($home ne $r->dir_config('lonHostID')) {
+ $button=0;
+ $switchserver='http://'.
+ $Apache::lonnet::hostname{$home}.'/priv/'.
+ $ENV{'user.name'};
+ }
#next if ($home eq 'no_host');
$home = $Apache::lonnet::hostname{$home};
$ttype='Construction Space';
@@ -332,16 +343,18 @@ ENDHEADER
if ($ENV{'course.'.$tcourseid.'.description'}) {
$twhere=$ENV{'course.'.$tcourseid.'.description'};
unless ($twhere eq 'Currently not available') {
- $twhere=
- &Apache::loncommon::syllabuswrapper($twhere,$trest,$tdom,$tfont);
+ $twhere.=' '.
+ &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont).
+ '';
}
} else {
my %newhash=Apache::lonnet::coursedescription
($tcourseid);
if (%newhash) {
- $twhere=
-&Apache::loncommon::syllabuswrapper($newhash{'description'},$trest,$tdom,
- $tfont);
+ $twhere=$newhash{'description'}.
+ ' '.
+ &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont).
+ '';
} else {
$twhere='Currently not available';
$ENV{'course.'.$tcourseid.'.description'}=$twhere;
@@ -360,7 +373,12 @@ ENDHEADER
$r->print('');
unless ($nochoose) {
if (!$button) {
- $r->print('| | ');
+ if ($switchserver) {
+ $r->print('Switch Server | ');
+ } else {
+ $r->print(' | ');
+ }
} elsif ($tstatus eq 'is') {
$r->print(' | ');