--- modules/gci/lonlogin.pm 2009/09/24 14:42:27 1.3 +++ modules/gci/lonlogin.pm 2010/01/11 02:31:32 1.9 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.3 2009/09/24 14:42:27 gci Exp $ +# $Id: lonlogin.pm,v 1.9 2010/01/11 02:31:32 gci Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,7 @@ use Apache::lonlocal; use Apache::migrateuser(); use lib '/home/httpd/lib/perl/'; use LONCAPA; +use HTML::Entities(); sub handler { my $r = shift; @@ -81,11 +82,22 @@ sub handler { &Apache::loncommon::start_page('Already logged in'); my $end_page = &Apache::loncommon::end_page(); + my $dest = '/adm/roles'; + if ($env{'form.role'}) { + $dest .= '?selectrole=1&'.$env{'form.role'}.'=1'; + } + if ($env{'form.symb'}) { + $dest .= ($dest =~ /\?/) ? '&' : '?'; + $dest .= 'destinationurl='.&HTML::Entities::encode($env{'form.symb'},'"&<>'); + } + if ($env{'form.firsturl'} ne '') { + $dest = $env{'form.firsturl'}; + } $r->print( $start_page .'

'.&mt('You are already logged in!').'

' .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', - '','','','').'

' + '','','','').'

' .'

'.&mt('Login problems?').'

' .$end_page ); @@ -121,6 +133,10 @@ sub handler { (&Apache::lonnet::domain($env{'form.domain'},'description'))) { $domain=$env{'form.domain'}; } + my $sitename = 'GCI WebCenter'; + my $shortsitename = 'WebCenter'; + my $existing = 'Existing WebCenter user?'; + my $sitedesc = &mt('The Geoscience Concept Inventory (GCI) [_1]WebCenter[_2] is a place to comment on existing concept questions, or submit new ones, and is also a place to build and manage Concept Tests which your students will complete via the [_3]Testing Center[_2].','','',''); my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); my $servadm = $r->dir_config('lonAdmEMail'); @@ -130,6 +146,14 @@ sub handler { my $expire = $r->dir_config('lonExpire'); my $version = $r->dir_config('lonVersion'); my $host_name = &Apache::lonnet::hostname($lonhost); + if ($domain eq 'gcitest') { + $lonhost = 'gcitestl1'; + $host_name = 'gcitest.lite.msu.edu'; + $sitename = 'GCI Testing Center'; + $shortsitename = 'Testing Center'; + $existing = 'Student with Testing Center account?'; + $sitedesc = &mt('The GCI Testing Center is used by [_1]students[_2] to complete online concept tests created by their instructors using questions available in the Geoscience Concept Inventory.','',''); + } # --------------------------------------------- Default values for login fields @@ -183,6 +207,11 @@ sub handler { if ($env{'form.role'}) { $tokenextras = '&role='.&escape($env{'form.role'}); } + if ($domain eq 'gci') { + unless ($env{'form.symb'} eq '/adm/statistics') { + $env{'form.symb'} = '/adm/gci_info'; + } + } if ($env{'form.symb'}) { if (!$tokenextras) { $tokenextras = '&'; @@ -190,7 +219,7 @@ sub handler { $tokenextras .= '&symb='.&escape($env{'form.symb'}); } my $logtoken=Apache::lonnet::reply( - 'tmpput:'.$ukey.$lkey.'&'.$firsturl, + 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, $lonhost); # ------------------- If we cannot talk to ourselves, we are in serious trouble @@ -239,7 +268,7 @@ sub handler { .'' .'

'.&mt('The LearningOnline Network with CAPA').'

' .'' - .'

'.&mt('The GCI WebCenter server is temporarily not available for login.').'

' + .'

'.&mt("The $sitename server is temporarily not available for login.").'

' .'' .'' ); @@ -292,7 +321,8 @@ sub handler { my $js = (< -// + // ]]> + ENDSCRIPT # --------------------------------------------------- Print login screen header @@ -368,7 +399,8 @@ ENDSCRIPT onload => "if ( document.client.uname ) { document.client.uname.focus(); }", marginheight => "0",); - $js .= "\n".''."\n"; + my $css_url = "/css/$domain/login.css"; + $js .= "\n".''."\n"; $r->print(&Apache::loncommon::start_page('GCI WebCenter Login',$js, { 'redirect' => [$expire,'/adm/roles'], 'add_entries' => \%add_entries, @@ -420,23 +452,23 @@ my %lt=&Apache::lonlocal::texthash( $newuserlink = &newuser_link($lt{'newuser'}); } if ($fullgraph) { - $r->print(<<"END_OF_BLOCK2"); + $r->print(<<"END_OF_BLOCK1");
- - + - + - +
- + + - + @@ -449,41 +481,53 @@ my %lt=&Apache::lonlocal::texthash(


GCI
-
+
  -
New to the WebCenter?
- The Geoscience Concept Inventory (GCI) WebCenter is a place to comment on existing concept questions and submit new ones.

The WebCenter runs on LON-CAPA - an open source freeware distributed learning content management and assessment system.

- Create a GCI WebCenter ID – use your ID to submit comments or new content. If you are already a GCI WebCenter user, please log-in.


+
New to the $sitename?
+ $sitedesc

The $shortsitename runs on LON-CAPA - an open source freeware distributed learning content management and assessment system.

+END_OF_BLOCK1 + if ($domain eq 'gci') { + $r->print(<<"END_OF_BLOCK2"); + Create a GCI WebCenter ID – use your ID to submit comments or new content, or to create a new test. If you are already a GCI WebCenter user, please log-in.


- + - + - + + + - + - +
+END_OF_BLOCK2 + } else { + $r->print(''. + &mt("If you are already a $sitename user, please log-in.").' '.&mt('If not, contact your instructor to request a username and password.'). + '


'); + } + $r->print(<<"END_OF_BLOCK3");
  -
+ - + - + @@ -492,9 +536,9 @@ my %lt=&Apache::lonlocal::texthash( @@ -506,7 +550,7 @@ my %lt=&Apache::lonlocal::texthash( - + @@ -519,7 +563,7 @@ my %lt=&Apache::lonlocal::texthash( - + - +
 
 
 

- Existing WebCenter user? + $existing
Please log-in.
-


+

:
 



-
+
Forgot your password?

@@ -530,36 +574,38 @@ my %lt=&Apache::lonlocal::texthash( 		 
 
 
+
  - Note:
+ Note:
If log-in fails, it may be because your browser is not accepting session cookies, or javascript is disabled. Learn more. 		 
+
 
@@ -574,7 +620,7 @@ my %lt=&Apache::lonlocal::texthash( -END_OF_BLOCK2 +END_OF_BLOCK3 } else { $r->print(<The LearningOnline Network with CAPA @@ -608,7 +654,7 @@ ENDACCESSOPTIONS .''; $r->print(< - +
$logintitle$noscript_warning @@ -624,7 +670,7 @@ ENDACCESSOPTIONS

- +