--- loncom/auth/lonlogin.pm	2005/06/07 13:42:03	1.66
+++ loncom/auth/lonlogin.pm	2005/08/30 21:14:20	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.66 2005/06/07 13:42:03 www Exp $
+# $Id: lonlogin.pm,v 1.68 2005/08/30 21:14:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,6 +108,10 @@ ENDFAILED
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');
+    my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
+    foreach my $posdom (&Apache::lonnet::current_machine_domains()) {
+	if ($posdom eq $testdomain) { $domain=$testdomain; }
+    }
     if (($env{'form.domain'}) && 
 	 ($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
 	$domain=$env{'form.domain'};
@@ -420,11 +424,11 @@ ENDTOP
     unless ($fullgraph) {
         $r->print(<<ENDACCESSOPTIONS);
 <h3>Select Accessibility Options</h3>
-<input type="checkbox" name="imagesuppress" /> Suppress rendering of images<br />
-<input type="checkbox" name="appletsuppress" /> Suppress Java applets<br />
-<input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia<br />
-<input type="checkbox" name="fontenhance" /> Increase font size<br />
-<input type="checkbox" name="blackwhite" /> Switch to black and white mode<br />
+<label><input type="checkbox" name="imagesuppress" /> Suppress rendering of images</label><br />
+<label><input type="checkbox" name="appletsuppress" /> Suppress Java applets</label><br />
+<label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />
+<label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />
+<label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />
 <p>If you have accessibility needs that are not addressed by this interface, 
 please
 contact the system administrator at <tt>$sysadm</tt>.</p><br />