--- loncom/auth/lonlogin.pm	2008/10/02 11:28:49	1.106
+++ loncom/auth/lonlogin.pm	2009/08/12 19:52:15	1.106.4.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.106 2008/10/02 11:28:49 bisitz Exp $
+# $Id: lonlogin.pm,v 1.106.4.3 2009/08/12 19:52:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@ sub handler {
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token']);
+	  'token','role','symb']);
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
@@ -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
@@ -179,8 +179,18 @@ sub handler {
     if ($uextkey>2147483647) { $uextkey-=4294967296; }
 
 # -------------------------------------------------------- Store away log token
+    my $tokenextras;
+    if ($env{'form.role'}) {
+        $tokenextras = '&role='.&escape($env{'form.role'});
+    }
+    if ($env{'form.symb'}) {
+        if (!$tokenextras) {
+            $tokenextras = '&';
+        }
+        $tokenextras .= '&symb='.&escape($env{'form.symb'});
+    }
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.'&'.$firsturl,
+       'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);
 
 # ------------------- If we cannot talk to ourselves, we are in serious trouble
@@ -266,6 +276,14 @@ sub handler {
     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 +293,8 @@ sub handler {
     my $now=time;
     my $js = (<<ENDSCRIPT);
 
- <script language="JavaScript">
+ <script type="text/javascript">
+ // <![CDATA[
     function send()
     {
         this.document.server.elements.uname.value
@@ -319,6 +338,7 @@ sub handler {
         this.document.server.submit();
         return false;
     }
+ // ]]>
  </script>
 
 ENDSCRIPT
@@ -346,7 +366,6 @@ my %lt=&Apache::lonlocal::texthash(
 		  'un'  => 'Username',
 		  'pw'  => 'Password',
 		  'dom' => 'Domain',
-		  'perc' => 'percent',
 		  'load' => 'Server Load',
                   'userload' => 'User Load',
                   'about'  => 'About LON-CAPA',
@@ -379,7 +398,7 @@ my %lt=&Apache::lonlocal::texthash(
 
     if ($fullgraph) {
 	$r->print(
-		  '<table width="100%" cellpadding=0 cellspacing=0 border=0>');
+		  '<table width="100%" cellpadding="0" cellspacing="0" border="0">');
     }
 
     $r->print(<<ENDSERVERFORM);
@@ -410,12 +429,21 @@ ENDSERVERFORM
     if ($shownewuserlink) {
         $newuserlink = &newuser_link($lt{'newuser'});
     }
-    if ($fullgraph) { $r->print(<<ENDTOP);
+    if ($fullgraph) {
+        $r->print(<<HEADER);
   <!-- The LON-CAPA Header -->
   <tr>
 
    <!-- Row 1 Columns 2-4 -->
-   <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>
+   <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg">
+HEADER
+        if ($showbanner) {
+            $r->print(<<ENDBANNER);
+<img src="$img" border="0" alt="The Learning Online Network with CAPA" />
+ENDBANNER
+        }
+        $r->print(<<ENDSTART);
+   </td>
   </tr>
 
   <!-- The gray bar that starts the two table frames -->
@@ -459,9 +487,15 @@ ENDSERVERFORM
    <!-- The right main column holding the large LON-CAPA logo-->
    <!-- Rows 3-4 Column 3 -->
    <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
+ENDSTART
+        if ($showmainlogo) {
+            $r->print(<<ENDLOGO);
     <center>
      <img src="$logo" alt="" />
     </center>
+ENDLOGO
+        }
+        $r->print(<<ENDTOP);
    </td>
 
    <!-- Row 3 Column 4 -->
@@ -473,12 +507,12 @@ ENDSERVERFORM
    <!-- Row 4 Column 1 -->
    <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP
-} else {
-    $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1>'
-             .'<h2>'.&mt('Text-based Interface Login').'</h2>'
-             .$announcements);
-}
-    $r->print('<form name="client" onsubmit="return(send())">');
+    } else {
+        $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1>'
+                 .'<h2>'.&mt('Text-based Interface Login').'</h2>'
+                 .$announcements);
+    }
+    $r->print('<form name="client" action="" onsubmit="return(send())">');
     unless ($fullgraph) {
         $r->print(<<ENDACCESSOPTIONS);
 <h3>$lt{'options_headline'}</h3>
@@ -490,8 +524,8 @@ ENDTOP
 <br />
 <input type="checkbox" name="remember" /> $lt{'remember'}<hr />
 ENDACCESSOPTIONS
-} else {
-    $r->print(<<ENDNOOPT);
+    } else {
+        $r->print(<<ENDNOOPT);
 <input type="hidden" name="imagesuppress"  value="" />
 <input type="hidden" name="embedsuppress"  value="" />
 <input type="hidden" name="appletsuppress"  value="" />
@@ -499,7 +533,7 @@ ENDACCESSOPTIONS
 <input type="hidden" name="blackwhite"  value="" />
 <input type="hidden" name="remember"  value="" />
 ENDNOOPT
-}
+    }
     my $logintitle;
     if ($loginheader eq 'text') {
         $logintitle = '<td bgcolor="'.$bgcol.'" colspan="2">&nbsp;&nbsp;&nbsp;<b><font size="+1" color="'.$textcol.'">'.$lt{'log'}.'</font></b></td>';
@@ -512,11 +546,11 @@ ENDNOOPT
                         .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
                         .'</font></div></noscript></td>';
     $r->print(<<ENDLOGIN);
-     <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" />
 
      <!-- Start the sub-table for text and input alignment -->
-     <table border=0 cellspacing=0 cellpadding=0>
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>$logintitle</tr>
       <tr>$noscript_warning</tr>
       <tr>
@@ -571,12 +605,12 @@ ENDLOGIN
    <!-- Row 5 Column 1 -->
    <td bgcolor="$sidebg" valign="middle" align="left">
      <br />
-     <table border=0 cellspacing=0 cellpadding=0>
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>
        <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td bgcolor="$sidebg" align="left" valign="middle">
         <small><tt>&nbsp;$domain</tt></small>
        </td>
       </tr>
@@ -584,24 +618,24 @@ ENDLOGIN
        <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td bgcolor="$sidebg" align="left" valign="middle">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
+       <td bgcolor="$sidebg" align="left" valign="top"><span class="LC_nobreak">
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small></span>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
+       <td bgcolor="$sidebg" align="left" valign="middle">
+        <small><tt>&nbsp;$loadpercent%</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
+       <td bgcolor="$sidebg" align="left" valign="top"><span class="LC_nobreak">
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small></span>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
+       <td bgcolor="$sidebg" align="left" valign="middle">
+        <small><tt>&nbsp;$userloadpercent%</tt></small>
        </td>
       </tr>
      </table>
@@ -637,8 +671,10 @@ $domainlogo
  </table>
 
 <script type="text/javascript">
+// <![CDATA[
 // the if prevents the script error if the browser can not handle this
 if ( document.client.uname ) { document.client.uname.focus(); }
+// ]]>
 </script>
 $helpdeskscript
 
@@ -666,6 +702,7 @@ sub contactdisplay {
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function helpdesk() {
     var codedom = document.client.udom.value;
     if (codedom == '') {
@@ -675,6 +712,7 @@ function helpdesk() {
     document.location.href = "/adm/helpdesk?"+querystr;
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
     }