[LON-CAPA-cvs] cvs: modules /relate lonlogin.pm

[raeburn]

raeburn		Sat Feb 11 18:19:26 2012 EDT

  Modified files:              
    /modules/relate	lonlogin.pm 
  Log:
  - Fix link to login.css where user's domain is not relate. 
  - Fix width for LCrelateheader_sm.png and enclosing tabe cell.
  - Move noscript warning so it is more prominent. 
  
  
Index: modules/relate/lonlogin.pm
diff -u modules/relate/lonlogin.pm:1.3 modules/relate/lonlogin.pm:1.4
--- modules/relate/lonlogin.pm:1.3	Fri Feb 10 20:30:01 2012
+++ modules/relate/lonlogin.pm	Sat Feb 11 18:19:26 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.3 2012/02/10 20:30:01 raeburn Exp $
+# $Id: lonlogin.pm,v 1.4 2012/02/11 18:19:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -386,7 +386,7 @@
                alink        => "$alink",
                onload       => 'javascript:enableInput();',);
 
-    my $css_url = "/css/$domain/login.css";
+    my $css_url = "/css/relate/login.css";
     $js .= "\n".'<link type="text/css" rel="stylesheet" href="'.$css_url.'" />'."\n";
     $r->print(&Apache::loncommon::start_page($pagetitle,$js,
                                        {'redirect'   => [$expire,'/adm/roles'], 
@@ -469,7 +469,7 @@
     my $prereqcid = 'relate_3H121116c19344ff3relatel1';
 
 # ---------------------------------------------------- Warning if no Javascript 
-    my $noscript_warning = '<noscript><span class="LC_warning">'.
+    my $noscript_warning = '<noscript><br /><span class="LC_warning">'.
                            '<b>'.$lt{'note'}.'</b>'.$lt{'jscr'}.
                            '</span></noscript>';
 
@@ -491,8 +491,8 @@
     <td width="450" valign="top">
       <table class="LC_loginbox_left">
         <tr>
-          <td width="411" align="left"><br />
-           <img src="/images/login/LCrelateheader_sm.png" width="411" height="100" alt="Relate @ MIT" align="left" /></td>
+          <td width="441" align="left"><br />
+           <img src="/images/login/LCrelateheader_sm.png" width="441" height="100" alt="Relate @ MIT" align="left" /></td>
         </tr>
         <tr>
          <td>
@@ -608,6 +608,7 @@
    <td width="10"> </td>
    <td colspan="3">
     <br />
+    $noscript_warning
     <hr style="clear:both;" />
    </td>
    <td width="10"> </td>
@@ -639,7 +640,6 @@
 </table>
 </div>
 <p> </p>
-$noscript_warning
   <form name="server" action="/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />