--- loncom/auth/lonlogin.pm	2008/11/23 11:01:01	1.108
+++ loncom/auth/lonlogin.pm	2009/04/01 14:43:19	1.117
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.108 2008/11/23 11:01:01 tempelho Exp $
+# $Id: lonlogin.pm,v 1.117 2009/04/01 14:43:19 hauer Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,7 +84,7 @@ sub handler {
 	$r->print(
                   $start_page
                  .'<h1>'.&mt('You are already logged in!').'</h1>'
-                 .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].',
+                 .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
                   '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
                  .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
                  .$end_page
@@ -102,15 +102,8 @@ sub handler {
 # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;
 
-   # my $textbrowsers=$r->dir_config('lonTextBrowsers');
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
     
-   # foreach (split(/\:/,$textbrowsers)) {
-#	if ($httpbrowser=~/$_/i) {
-#	    $env{'form.interface'}='textual';
-#        }
-#    }
-
     my $fullgraph=($env{'form.interface'} ne 'textual');
 
     my $iconpath= 
@@ -253,12 +246,6 @@ my $vlink=
 my $alink=&Apache::loncommon::designparm('login.alink',$domain);
 my $mainbg=
 ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
-my $sidebg=
-($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
-my $textcol = 
-($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');
-my $bgcol =
-($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF');
 my $logo=&Apache::loncommon::designparm('login.logo',$domain);
 my $img=&Apache::loncommon::designparm('login.img',$domain);
 my $domainlogo=&Apache::loncommon::domainlogo($domain);
@@ -266,6 +253,14 @@ my $login=&Apache::loncommon::designparm
 if ($login eq '') {
 $login = $iconpath.'/'.&mt('userauthentication.gif');
 }
+my $showbanner = 1;
+my $showmainlogo = 1;
+if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
+    $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);
+}
+if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {
+    $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);
+}
 my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
 my $showcoursecat =
 &Apache::loncommon::designparm('login.coursecatalog',$domain);
@@ -275,7 +270,7 @@ my $shownewuserlink =
 my $now=time;
 my $js = (<<ENDSCRIPT);
 
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
 function send()
 {
 this.document.server.elements.uname.value
@@ -340,13 +335,7 @@ my %lt=&Apache::lonlocal::texthash(
 	  'helpdesk' => 'Contact Helpdesk',
 	  'forgotpw' => 'Forgot password?',
 	  'newuser'  => 'New User?',
-	  'options_headline' => 'Select Accessibility Options',
-	  'sprs_img' => 'Suppress rendering of images',
-	  'sprs_applet' => 'Suppress Java applets',
-	  'sprs_embed' => 'Suppress rendering of embedded multimedia',
-	  'sprs_font' => 'Increase font size',
-	  'sprs_blackwhite' => 'Switch to black and white mode',
-	  'remember' => 'Remember these settings for next login');
+	  );
 # -------------------------------------------------- Change password field name
 my $forgotpw = &forgotpwdisplay(%lt);
 my $loginhelp = &loginhelpdisplay(%lt);
@@ -382,11 +371,11 @@ if (($showcoursecat eq '') || ($showcour
 }
 my $newuserlink;
 if ($shownewuserlink) {
-    $newuserlink = &newuser_link($lt{'newuser'});
+    $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
 }
 my $logintitle;
 if ($loginheader eq 'text') {
-    $logintitle = $lt{'log'};
+    $logintitle ='<h2>'.$lt{'log'}.'</h2>';
 } else {
     $logintitle = '<img src="'.$login.'" alt="'.
                   &mt('User Authentication').'" />';
@@ -398,61 +387,59 @@ my $noscript_warning='<noscript><span cl
 my $helpdeskscript;
 my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
                             $version,$authdomain,\$helpdeskscript);
-my $loncapaheader=(<<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>
-HEADER
 
 my $loginform=(<<LFORM);
 <form name="client" onsubmit="return(send())">
-  <input type="hidden" name="lextkey" value="$lextkey">
-  <input type="hidden" name="uextkey" value="$uextkey">
+  <input type="hidden" name="lextkey" value="$lextkey" />
+  <input type="hidden" name="uextkey" value="$uextkey" />
   <b><label for="uname">$lt{'un'}</label>:</b><br />
-  <input type="text" name="uname" size="10" value="$authusername" /><br />
+  <input type="text" name="uname" size="15" value="$authusername" /><br />
   <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
-  <input type="password" name="upass$now" size="10" /><br />
+  <input type="password" name="upass$now" size="15" /><br />
   <b><label for="udom">$lt{'dom'}</label>:</b><br />
-  <input type="text" name="udom" size="10" value="$authdomain" /><br />
+  <input type="text" name="udom" size="15" value="$authdomain" /><br />
   <input type="submit" value="$lt{'log'}" />
 </form>
 LFORM
 
-if ($fullgraph) { 
-$r->print(<<ENDTOP);
-$loncapaheader
-<div class="LC_loginpage_space">&nbsp;</div>
-    <img src="$logo" alt="" />
-
+if ($fullgraph) {
+    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>
+HEADER
+    }
+    if ($showmainlogo) {
+        $r->print('<div class="LC_loginpage_space">&nbsp;</div>'."\n".
+                  '    <img src="'.$logo.'" alt="" />'."\n");
+    }
+    $r->print(<<ENDTOP);
+<div class="LC_loginpage_loginDomain">$domainlogo</div>
 <div class="LC_loginpage_loginContainer">
- <fieldset class="LC_loginpage_fieldset">
-  <legend class="LC_loginpage_legend">$logintitle</legend>
-   <table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">
+  $logintitle
+   <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
       <tr>
-   	   <td width="50%" align="center" valign="top">
-		$domainlogo
-	   </td>
 	   <td>
 		$loginform
            </td>
       </tr>
    </table>   	
    $noscript_warning
- </fieldset>
 </div>
   
 <div class="LC_loginpage_loginInfo">
         $loginhelp<br />
-        $forgotpw<br /><br />
-        $newuserlink<br />
+        $forgotpw<br />
+	$contactblock<br />
+        $newuserlink
         $coursecatalog<br /><br />
-        <a href="/adm/about.html"><b>$lt{'about'}</b></a><br />
-        $helpdeskscript
+        <a href="/adm/about.html"><b>$lt{'about'}</b></a>
 </div>
 
 <div class="LC_loginpage_space">&nbsp;</div>
@@ -464,43 +451,40 @@ if($announcements){$r->print('<div class
 
 if ($fullgraph) {
 $r->print(<<ENDDOCUMENT);
-     <table border=0 cellspacing=0 cellpadding=0>
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td  align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td  align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td  align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td align="left" valign="top">
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td align="left" valign="top">
         <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
      </table>
-     
-    $contactblock
-
  </div>
 
 <script type="text/javascript">
@@ -529,7 +513,7 @@ sub contactdisplay {
                          '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
     }
     if ($showhelpdesk) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />';
+        $contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">