--- loncom/auth/lonlogin.pm 2009/10/21 12:29:40 1.128 +++ loncom/auth/lonlogin.pm 2010/02/08 13:28:40 1.132 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.128 2009/10/21 12:29:40 raeburn Exp $ +# $Id: lonlogin.pm,v 1.132 2010/02/08 13:28:40 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,13 +85,21 @@ sub handler { if ($env{'form.firsturl'} ne '') { $dest = $env{'form.firsturl'}; } + + my $dom = &Apache::lonnet::default_login_domain(); + my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); + + my $loginhelp_page = $helpconfig{'helpsettings'}{'loginhelpurl'}; + if ($loginhelp_page eq '') { + $loginhelp_page = '/adm/loginproblems.html'; + } $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 + .'

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

' + .$dom.' '.$end_page ); return OK; } @@ -266,7 +274,7 @@ my $alink=&Apache::loncommon::designparm my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); -my $domainlogo=&Apache::loncommon::domainlogo($domain); +my $domainlogo='
'.&Apache::loncommon::domainlogo($domain).'
'; my $login=&Apache::loncommon::designparm('login.login',$domain); if ($login eq '') { $login = $iconpath.'/'.&mt('userauthentication.gif'); @@ -337,24 +345,27 @@ $r->print(&Apache::loncommon::start_page # ----------------------------------------------------------------------- Texts my %lt=&Apache::lonlocal::texthash( - 'un' => 'Username', - 'pw' => 'Password', - 'dom' => 'Domain', - 'perc' => 'percent', - 'load' => 'Server Load', - 'userload' => 'User Load', - 'catalog' => 'Course Catalog', - 'log' => 'Log in', - 'help' => 'Log-in Help', - 'serv' => 'Server', - 'servadm' => 'Server Administration', - 'helpdesk' => 'Contact Helpdesk', - 'forgotpw' => 'Forgot password?', - 'newuser' => 'New User?', - ); + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => 'Server Load', + 'userload' => 'User Load', + 'catalog' => 'Course/Community Catalog', + 'log' => 'Log in', + 'help' => 'Log-in Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?', + 'newuser' => 'New User?', + ); # -------------------------------------------------- Change password field name + my $forgotpw = &forgotpwdisplay(%lt); +$forgotpw .= '
' if $forgotpw; my $loginhelp = &loginhelpdisplay(%lt); +$loginhelp .= '
' if $loginhelp; # ---------------------------------------------------- Serve out DES JavaScript { @@ -386,7 +397,7 @@ $r->print(<'; } my $newuserlink; if ($shownewuserlink) { @@ -405,18 +416,18 @@ my $noscript_warning=''; my $helpdeskscript; my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); + $authdomain,\$helpdeskscript); my $loginform=(< :
-
+
:
-
+
:
-
+
LFORM @@ -424,13 +435,9 @@ LFORM if ($showbanner) { $r->print(< - - - - -
- The Learning Online Network with CAPA -
+
+ The Learning Online Network with CAPA +
HEADER } $r->print(<
- $loginhelp
- $forgotpw
- $contactblock
- $newuserlink - $coursecatalog + $loginhelp + $forgotpw + $contactblock + $newuserlink + $coursecatalog
ENDTOP @@ -470,7 +477,7 @@ $r->print(< -    $lt{'dom'}:  + $lt{'dom'}:   $domain @@ -478,7 +485,7 @@ $r->print(< -    $lt{'serv'}:  + $lt{'serv'}:   $lonhost ($role) @@ -486,7 +493,7 @@ $r->print(< -    $lt{'load'}:  + $lt{'load'}:   $loadpercent $lt{'perc'} @@ -494,12 +501,17 @@ $r->print(< -    $lt{'userload'}:  + $lt{'userload'}:   $userloadpercent $lt{'perc'} + + + $version + + @@ -532,7 +544,7 @@ sub redirect_page { } sub contactdisplay { - my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; + my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_; my $contactblock; my $showhelpdesk = 0; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; @@ -540,8 +552,8 @@ sub contactdisplay { $showhelpdesk = 1; } if ($servadm && $showadminmail) { - $contactblock .= '   '.$$lt{'servadm'}.':
'. - '      '.$servadm.'
 
'; + $contactblock .= $$lt{'servadm'}.':
'. + ''.$servadm.'
'; } if ($showhelpdesk) { $contactblock .= ''.$lt->{'helpdesk'}.'
'; @@ -562,9 +574,6 @@ function helpdesk() { ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; -    $version -ENDBLOCK return $contactblock; } @@ -581,7 +590,14 @@ sub loginhelpdisplay { my (%lt) = @_; my $login_help = 1; if ($login_help) { - return ''.$lt{'help'}.''; + my $dom = &Apache::lonnet::default_login_domain(); + my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); + my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'}; + if ($loginhelp_url ne '') { + return ''.$lt{'help'}.''; + } else { + return ''.$lt{'help'}.''; + } } return; } @@ -595,7 +611,7 @@ END sub newuser_link { my ($linkname) = @_; - return '   '.$linkname.'
'; + return ''.$linkname.''; } 1;