--- loncom/auth/lonlogin.pm	2009/12/01 14:23:49	1.130
+++ 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.130 2009/12/01 14:23:49 bisitz 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
                  .'<h1>'.&mt('You are already logged in!').'</h1>'
                  .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
                   '<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
-                 .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
-                 .$end_page
+                 .'<p><a href="'.$loginhelp_page.'">'.&mt('Login problems?').'</a></p>'
+                 .$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='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';
 my $login=&Apache::loncommon::designparm('login.login',$domain);
 if ($login eq '') {
 $login = $iconpath.'/'.&mt('userauthentication.gif');
@@ -353,8 +361,11 @@ my %lt=&Apache::lonlocal::texthash(
           'newuser'  => 'New User?',
        );
 # -------------------------------------------------- Change password field name
+
 my $forgotpw = &forgotpwdisplay(%lt);
+$forgotpw .= '<br />' if $forgotpw;
 my $loginhelp = &loginhelpdisplay(%lt);
+$loginhelp .= '<br />' if $loginhelp;
 
 # ---------------------------------------------------- Serve out DES JavaScript
 {
@@ -386,11 +397,11 @@ $r->print(<<ENDSERVERFORM);
 ENDSERVERFORM
 my $coursecatalog;
 if (($showcoursecat eq '') || ($showcoursecat)) {
-    $coursecatalog = &coursecatalog_link($lt{'catalog'});
+    $coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />';
 }
 my $newuserlink;
 if ($shownewuserlink) {
-    $newuserlink = &newuser_link($lt{'newuser'});
+    $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
 }
 my $logintitle;
 if ($loginheader eq 'text') {
@@ -405,7 +416,7 @@ my $noscript_warning='<noscript><span cl
                     .'</b></span></noscript>';
 my $helpdeskscript;
 my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
-                            $version,$authdomain,\$helpdeskscript);
+                                   $authdomain,\$helpdeskscript);
 
 my $loginform=(<<LFORM);
 <form name="client" action="" onsubmit="return(send())">
@@ -424,13 +435,9 @@ LFORM
     if ($showbanner) {
         $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->
-<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
- <tr>
-  <td align="left" valign="top" bgcolor="$pgbg">
-      <img src="$img" border="0" alt="The Learning Online Network with CAPA" />
-  </td>
- </tr>
-</table>
+<div style="background:$pgbg;margin:0;width:100%;">
+  <img src="$img" border="0" alt="The Learning Online Network with CAPA" />
+</div>
 HEADER
     }
     $r->print(<<ENDTOP);
@@ -449,12 +456,10 @@ HEADER
 </div>
   
 <div class="LC_loginpage_loginInfo">
-  $loginhelp<br />
-  $forgotpw<br />
-  <br />
-  $contactblock<br />
-  <br />
-  $newuserlink<br />
+  $loginhelp
+  $forgotpw
+  $contactblock
+  $newuserlink
   $coursecatalog
 </div>
 </div>
@@ -472,7 +477,7 @@ $r->print(<<ENDDOCUMENT);
      <table border="0" cellspacing="0" cellpadding="0">
       <tr>
        <td  align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
+        <small><b>$lt{'dom'}:&nbsp;</b></small>
        </td>
        <td  align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>
@@ -480,7 +485,7 @@ $r->print(<<ENDDOCUMENT);
       </tr>
       <tr>
        <td  align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
+        <small><b>$lt{'serv'}:&nbsp;</b></small>
        </td>
        <td align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
@@ -488,7 +493,7 @@ $r->print(<<ENDDOCUMENT);
       </tr>
       <tr>
        <td align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
+        <small><b>$lt{'load'}:&nbsp;</b></small>
        </td>
        <td align="left" valign="top">
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
@@ -496,12 +501,17 @@ $r->print(<<ENDDOCUMENT);
       </tr>
       <tr>
        <td align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
+        <small><b>$lt{'userload'}:&nbsp;</b></small>
        </td>
        <td align="left" valign="top">
         <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
+      <tr>
+       <td colspan="2" align="left">
+        <small>$version</small>
+       </td>
+      </tr>
      </table>
  </div>
 
@@ -534,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'};
@@ -564,7 +574,6 @@ function helpdesk() {
 </script>
 ENDSCRIPT
     }
-    $contactblock .= $version;
     return $contactblock;
 }
 
@@ -581,7 +590,14 @@ sub loginhelpdisplay {
     my (%lt) = @_;
     my $login_help = 1;
     if ($login_help) {
-        return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>';
+    	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 '<a href="'.$loginhelp_url.'">'.$lt{'help'}.'</a>';
+        } else {
+        	return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>';
+       	}
     }
     return;
 }