--- loncom/auth/lonlogin.pm	2008/11/22 19:07:02	1.107
+++ loncom/auth/lonlogin.pm	2008/12/10 10:14:55	1.111
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.107 2008/11/22 19:07:02 tempelho Exp $
+# $Id: lonlogin.pm,v 1.111 2008/12/10 10:14:55 muellerd Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -253,8 +253,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 =
@@ -266,6 +264,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);
@@ -311,7 +317,7 @@ my %add_entries = (topmargin    => "0",
 	       leftmargin   => "0",
 	       marginheight => "0",
 	       marginwidth  => "0",
-	       bgcolor      => "$pgbg",
+	       bgcolor      => "$mainbg",
 	       text         => "$font",
 	       link         => "$link",
 	       vlink        => "$vlink",
@@ -340,13 +346,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);
@@ -376,124 +376,130 @@ $r->print(<<ENDSERVERFORM);
    <input type="hidden" name="localres" value="$env{'form.localres'}" />
   </form>
 ENDSERVERFORM
-    my $coursecatalog;
-    if (($showcoursecat eq '') || ($showcoursecat)) {
-        $coursecatalog = &coursecatalog_link($lt{'catalog'});
-    }
-    my $newuserlink;
-    if ($shownewuserlink) {
-        $newuserlink = &newuser_link($lt{'newuser'});
-    }
-    my $logintitle;
-    if ($loginheader eq 'text') {
-        $logintitle = $lt{'log'};
-    } else {
-        $logintitle = '<img src="'.$login.'" alt="'.
-                      &mt('User Authentication').'" />';
-    }
-    
-     my $noscript_warning='<noscript>'
-                        .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
-                        .'</noscript>';
-      my $helpdeskscript;
-      my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
-                                  $version,$authdomain,\$helpdeskscript);
-                 
-    if ($fullgraph) { 
-    $r->print(<<ENDTOP);
-  <!-- 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>
+my $coursecatalog;
+if (($showcoursecat eq '') || ($showcoursecat)) {
+    $coursecatalog = &coursecatalog_link($lt{'catalog'});
+}
+my $newuserlink;
+if ($shownewuserlink) {
+    $newuserlink = &newuser_link($lt{'newuser'});
+}
+my $logintitle;
+if ($loginheader eq 'text') {
+    $logintitle = $lt{'log'};
+} else {
+    $logintitle = '<img src="'.$login.'" alt="'.
+                  &mt('User Authentication').'" />';
+}
 
- <div class="LC_loginpage_space">&nbsp;</div>
-    <img src="$logo" alt="" />
- <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%">
-	<tr>
-		<td width="50%" align="center" valign="top">$domainlogo</td>
-		<td>
-ENDTOP
-		
-$r->print('<form name="client" onsubmit="return(send())">');
+my $noscript_warning='<noscript><span class="LC_warning"><b>'
+                     .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
+                    .'</b></span></noscript>';
+my $helpdeskscript;
+my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
+                            $version,$authdomain,\$helpdeskscript);
+
+my $loginform=(<<LFORM);
+<form name="client" onsubmit="return(send())">
+  <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 />
+  <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
+  <input type="password" name="upass$now" size="10" /><br />
+  <b><label for="udom">$lt{'dom'}</label>:</b><br />
+  <input type="text" name="udom" size="10" value="$authdomain" /><br />
+  <input type="submit" value="$lt{'log'}" />
+</form>
+LFORM
 
-$r->print(<<ENDTOPP)
-			<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 />
-       			<b><label for="upass$now">$lt{'pw'}</label>:</b><br />
-      			<input type="password" name="upass$now" size="10" /><br />
-      			<b><label for="udom">$lt{'dom'}</label>:</b><br />
-       			<input type="text" name="udom" size="10" value="$authdomain" /><br />
-       			<input type="submit" value="$lt{'log'}" />
-       			</form>	
-		</td>
-		</tr>
-</table>   	
-$noscript_warning
-</fieldset></div>
+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_loginContainer">
+ <fieldset class="LC_loginpage_fieldset">
+  <legend class="LC_loginpage_legend">$logintitle</legend>
+   <table border="0" align="left" cellspacing="1" cellpadding="1" 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 />
         $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><br/>
+	$contactblock
 </div>
+
 <div class="LC_loginpage_space">&nbsp;</div>
 $announcements
-ENDTOPP
+ENDTOP
 }
-if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}
-
 
-   if ($fullgraph) {
-      
-	$r->print(<<ENDDOCUMENT);
-   
+if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}
 
+if ($fullgraph) {
+$r->print(<<ENDDOCUMENT);
      <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">
@@ -522,7 +528,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 .= '<b><a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a></b><br />';
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">