[BACK]Return to lonlogin.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / modules / relate

Diff for /modules/relate/lonlogin.pm between versions 1.1 and 1.8

version 1.1, 2012/02/07 14:49:47 version 1.8, 2012/03/01 00:23:46
Line 266  sub handler { Line 266  sub handler {
           .'<body bgcolor="#FFFFFF">'            .'<body bgcolor="#FFFFFF">'
           .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'            .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
           .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'            .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
           .'<h3>'.&mt("This Learn Physics server is temporarily not available for login.").'</h3>'            .'<h3>'.&mt("This Mechanics Online course server is temporarily not available for login.").'</h3>'
           .'</body>'            .'</body>'
           .'</html>'            .'</html>'
         );          );
Line 277  sub handler { Line 277  sub handler {
     $servadm=~s/\,/\<br \/\>/g;      $servadm=~s/\,/\<br \/\>/g;
   
 # ----------------------------------------------------------------------- Texts  # ----------------------------------------------------------------------- Texts
     my $pagetitle = 'Learn Physics Login'; # Do not localize.      my $pagetitle = 'Mechanics Online Log-in'; # Do not localize.
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
           'needu'    => 'You must provide a username',            'needu'    => 'You must provide a username',
           'needp'    => 'You must provide a password',            'needp'    => 'You must provide a password',
Line 293  sub handler { Line 293  sub handler {
           'serv'     => 'Server',            'serv'     => 'Server',
           'servadm'  => 'Server Administration',            'servadm'  => 'Server Administration',
           'helpdesk' => 'Contact Helpdesk',            'helpdesk' => 'Contact Helpdesk',
             'exist'    => 'Existing user?',
           'forgotpw' => 'Forgot your password?',            'forgotpw' => 'Forgot your password?',
           'newuser'  => 'New User?',            'newuser'  => 'New User?',
           'learn'    => 'Learn Physics includes an online physics course, to which you may receive admission after successfully completing a pre-course test.',            'click'   => 'Click here to sign up',
            'click'   => 'Click here to sign up',            'plea'    => 'Please log-in',
            'plea'    => 'Please log-in',            'supp'    => 'Support from NSF, NIH, Google',
            'supp'    => 'Support from NSF, NIH, Google',            'note'    => 'Please Note:',
            'note'    => 'Please Note:',            'jscr'    => 'Javascript must be enabled in your web browser in order to use this web site.',
            'jscr'    => 'Javascript must be enabled in your web browser in order to use this web site.',  
        );         );
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
     my $font=&Apache::loncommon::designparm('login.font',$domain);      my $font=&Apache::loncommon::designparm('login.font',$domain);
Line 386  ENDSCRIPT Line 386  ENDSCRIPT
                alink        => "$alink",                 alink        => "$alink",
                onload       => 'javascript:enableInput();',);                 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";      $js .= "\n".'<link type="text/css" rel="stylesheet" href="'.$css_url.'" />'."\n";
     $r->print(&Apache::loncommon::start_page($pagetitle,$js,      $r->print(&Apache::loncommon::start_page($pagetitle,$js,
                                        {'redirect'   => [$expire,'/adm/roles'],                                          {'redirect'   => [$expire,'/adm/roles'], 
                                         'add_entries' => \%add_entries,                                          'add_entries' => \%add_entries,
                                         'only_body'   => 1,}));                                          'only_body'   => 1,}));
   
 # ------------------------------------------------------------ Additional Texts  # ------------------------------------------------------------ Additional Texts
     $lt{'newto'} = &mt('New to the [_1]Learn Physics[_2] site?','<i>','</i>');      $lt{'newto'} = &mt('New to the [_1]Mechanics Online[_2] site?','<i>','</i>');
     $lt{'runson'} = &mt('Learn Physics runs on [_1]LON-CAPA[_2] - an open source freeware distributed learning content management and assessment system.',      $lt{'mech'} = &mt('Mechanics Online is a Newtonian Mechanics course developed by Professor David Pritchard and the RELATE education group at MIT. [_1]Learn more[_2]','<a href="http://relate.mit.edu/physicscourse" style="text-decoration: underline;">','</a>');
                         '<a href="http://loncapa.org/">','</a>');      $lt{'runson'} = &mt('Mechanics Online runs on [_1]LON-CAPA[_2] - an open source, freeware, distributed learning content management and assessment system.',
     $lt{'newhere'} = &mt('New to [_1]Learn Physics[_2]:','<i>','</i>');                          '<a href="http://loncapa.org/" style="text-decoration: underline;">',
     $lt{'exist'} = &mt('Existing [_1]Learn Physics[_2] user','<i>','</i>');                          '</a>');
       $lt{'newhere'} = &mt('New to [_1]Mechanics Online[_2]:','<i>','</i>');
     $lt{'browser'} = &mt('Your browser must allow [_1]cookies[_2]',      $lt{'browser'} = &mt('Your browser must allow [_1]cookies[_2]',
                          '<a href="http://loncapa.msu.edu/cookies.html" style="color: #ffffff">','</a>');                           '<a href="http://loncapa.msu.edu/cookies.html" style="color: #ffffff; text-decoration:underline;">','</a>');
   
       my ($contactrow,$domainrow,$serverrow,$loadrow,$userloadrow,$versionrow);
       $contactrow = <<"END";
         <tr>
          <td align="left" colspan="2">
          $contactblock
          </td>
         </tr>
   END
       $domainrow = <<"END";
         <tr>
          <td align="left" valign="top">
           <small><b>$lt{'dom'}:&nbsp;</b></small>
          </td>
          <td align="left" valign="top">
           <small><tt>&nbsp;$domain</tt></small>
          </td>
         </tr>
   END
       $serverrow = <<"END";
         <tr>
          <td align="left" valign="top">
           <small><b>$lt{'serv'}:&nbsp;</b></small>
          </td>
          <td align="left" valign="top">
           <small><tt>&nbsp;$lonhost ($role)</tt></small>
          </td>
         </tr>
   END
       if ($loadlim) {
           $loadrow = <<"END";
         <tr>
          <td align="left" valign="top">
           <small><b>$lt{'load'}:&nbsp;</b></small>
          </td>
          <td align="left" valign="top">
           <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
          </td>
         </tr>
   END
       }
       if ($uloadlim) {
           $userloadrow = <<"END";
         <tr>
          <td align="left" valign="top">
           <small><b>$lt{'userload'}:&nbsp;</b></small>
          </td>
          <td align="left" valign="top">
           <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
          </td>
         </tr>
   END
       }
       if (($version ne '') && ($version ne '<!-- VERSION -->')) {
           $versionrow = <<"END";
         <tr>
          <td colspan="2" align="left">
           <a href="/adm/about.html">
           <img src="/images/login/lclogosm.gif" width="16" height="14" alt="LC" border="0" />&nbsp;<small>$version</small></a>
          </td>
         </tr>
   END
       }
   
 # -------------------------------------------- Static cid for prerequisite test  # -------------------------------------------- Static cid for prerequisite test
     $prereqcid = 'relate_9615072b469884921relatel1';      my $prereqcid = 'relate_3e100973b27484f2drelatel1';
   
 # ---------------------------------------------------- Warning if no Javascript   # ---------------------------------------------------- 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'}.'                              '<b>'.$lt{'note'}.'</b>'.$lt{'jscr'}.
                            '</span></noscript>';                             '</span></noscript>';
   
 # ---------------------------------------------------- Serve out DES JavaScript  # ---------------------------------------------------- Serve out DES JavaScript
Line 422  ENDSCRIPT Line 486  ENDSCRIPT
 <div align="center">  <div align="center">
 <table class="LC_loginbox">  <table class="LC_loginbox">
   <tr>    <tr>
     <td align="left" valign="top" width="11">      <td align="left" valign="top" width="11"><img src="/images/login/tlc_11_ffffff_e2e2e2.gif" width="10" height="10" border="0" alt="" /></td>
      <img src="/images/login/tlc_11_ffffff_e2e2e2.gif" width="10" height="10" border="0" alt="">  
     </td>  
     <td width="450" valign="top">      <td width="450" valign="top">
       <table class="LC_loginbox_left">        <table class="LC_loginbox_left">
         <tr>          <tr>
           <td width="411" align="left"><br />            <td width="441" align="left"><br />
            <img src="/images/login/LCrelateheader_sm.png" width="411" height="100" alt="Relate @ MIT" align="left"></td>             <img src="/images/login/LCrelateheader_sm.png" width="441" height="100" alt="Relate @ MIT" align="left" /></td>
         </tr>          </tr>
         <tr>          <tr>
          <td>           <td>
Line 444  ENDSCRIPT Line 506  ENDSCRIPT
        <tr>         <tr>
         <td width="10">&nbsp;</td>          <td width="10">&nbsp;</td>
         <td valign="top" class="bodyred" width="430" align="left"><br />          <td valign="top" class="bodyred" width="430" align="left"><br />
          <span style="font-size: 18px; line-height: 22px; ">$lt{'newt'}</span>           <span style="font-size: 18px; line-height: 22px; ">$lt{'newto'}</span>
            <p class="bodyred">$lt{'mech'}</p>
            <p class="bodyred">$lt{'runson'}</p>
          <br />           <br />
          <span class="bodyred">$lt{'learn'}<br /><br />$lt{'runson'}           <form name="signup" method="post" action="/adm/createaccount?courseid=$prereqcid"><input type="hidden" name="process" value="signup" />
          <br /><br />  
          <form name="signup" method="post" action="/adm/createaccount?courseid=$prereqcid"><input type="hidden" name="process" value="signup"/>  
          <table class="LC_signup">           <table class="LC_signup">
            <tr>             <tr>
              <td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt=""></td>               <td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt="" /></td>
              <td>&nbsp;</td>               <td>&nbsp;</td>
              <td align="right" valign="top" width="11" height="11"><img src="/images/login/tr_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>               <td align="right" valign="top" width="11" height="11"><img src="/images/login/tr_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
            </tr>             </tr>
            <tr>             <tr>
              <td>&nbsp;</td>               <td>&nbsp;</td>
              <td align="center" valign="middle"><span style="white-space: nowrap;"><b>$lt{'newhere'}</b>:&nbsp;<a href="javascript:send('newaccount')" style="color: #ffffff">$lt{'click'}</a></span></td>               <td align="center" valign="middle"><span style="white-space: nowrap;"><b>$lt{'newhere'}</b>&nbsp;<a href="javascript:send('newaccount')" style="color: #ffffff; text-decoration:underline;">$lt{'click'}</a></span></td>
              <td>&nbsp;</td>               <td>&nbsp;</td>
            </tr>             </tr>
            <tr>             <tr>
              <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/bl_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>               <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/bl_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
   
              <td>&nbsp;</td>               <td>&nbsp;</td>
              <td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>               <td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
            </tr>             </tr>
          </table>           </table>
          </form>           </form>
Line 474  ENDSCRIPT Line 535  ENDSCRIPT
      </td>       </td>
      <td width="10">&nbsp;</td>       <td width="10">&nbsp;</td>
      <td valign="top">       <td valign="top">
       <form name="client" method="post" onsubmit="return(send());">        <form name="client" method="post" onsubmit="return(send());" action="">
       <table class="LC_loginbox_right">        <table class="LC_loginbox_right">
        <tr>         <tr>
         <td colspan="3" height="23" class="LC_loginbox_strip">&nbsp;</td>          <td colspan="3" height="23" class="LC_loginbox_strip">&nbsp;</td>
 i       </tr>         </tr>
        <tr>         <tr>
         <td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt=""></td>          <td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt="" /></td>
         <td>&nbsp;</td>          <td>&nbsp;</td>
         <td align="right" valign="top" width="11" height="11"><img src="/images/login/tr_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>          <td align="right" valign="top" width="11" height="11"><img src="/images/login/tr_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
        </tr>         </tr>
        <tr>         <tr>
         <td width="10">&nbsp;</td>          <td width="10">&nbsp;</td>
         <td>          <td>
          <table border="0" cellspacing="0" cellpadding="0">           <table border="0" cellspacing="0" cellpadding="0">
           <tr>            <tr>
            <td align="right" class="bodywhite" heighta"=50"><br>             <td align="right" class="bodywhite" height="50"><br />
             <span style="font-size: 15px; line-height: 17px; font-weight: bold;">              <span style="font-size: 15px; line-height: 17px; font-weight: bold;">
              $lt{'exist'}</span>               $lt{'exist'}</span>
              <br />$lt{'plea'}<br />               <br />$lt{'plea'}<br />
              <hr class="login"><br /><br />               <hr class="login" /><br /><br />
             </td>              </td>
            </tr>             </tr>
            <tr>             <tr>
             <td>              <td>
              <table border="0" cellpadding="2" cellspacing="0">               <table border="0" cellpadding="2" cellspacing="0">
               <tr>                <tr>
                <td align="right" class="bodywhite"><label for="uname">$lt{'un'}</label>:</td>                 <td align="right" class="bodywhite"><label>$lt{'un'}</label>:</td>
                <td align="right"><input type="text" name="uname" size="17" value="" /></td>                 <td align="right"><input type="text" name="uname" size="17" value="" /></td>
                </tr>                 </tr>
                <tr>                 <tr>
                 <td align="right" class="bodywhite"><label for="upass$now">$lt{'pw'}</label>:</td>                  <td align="right" class="bodywhite"><label>$lt{'pw'}</label>:</td>
                 <td align="right"><input name="upass$now" size="17" value="" type="password"><input type="hidden" name="udom" value="relate" /></td>                  <td align="right"><input name="upass$now" size="17" value="" type="password" /><input type="hidden" name="udom" value="$domain" /></td>
                </tr>                 </tr>
                <tr><td>&nbsp;</td></tr>                 <tr><td>&nbsp;</td></tr>
                <tr>                 <tr>
                <tr>  
                 <td colspan="2" align="right"><input name="signin" type="submit" value="$lt{'log'}" class="buttonwhite" /></td>                  <td colspan="2" align="right"><input name="signin" type="submit" value="$lt{'log'}" class="buttonwhite" /></td>
                </tr>                 </tr>
               </table>                </table>
Line 522  i       </tr> Line 582  i       </tr>
               <span style="font-size: smaller;">$lt{'browser'}</span><br />                <span style="font-size: smaller;">$lt{'browser'}</span><br />
               <hr class="login" />                <hr class="login" />
               <br />                <br />
               <a href="/adm/resetpw" style="color: #ffffff">$lt{forgotpw'}</a><br>                <a href="/adm/resetpw" style="color: #ffffff; text-decoration:underline;">$lt{'forgotpw'}</a><br />
               <br />                <br />
              </td>               </td>
             </tr>              </tr>
Line 531  i       </tr> Line 591  i       </tr>
           <td width="9">&nbsp;</td>            <td width="9">&nbsp;</td>
         </tr>          </tr>
         <tr>          <tr>
           <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/bl_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>            <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/bl_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
           <td>&nbsp;</td>            <td>&nbsp;</td>
             <td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
           <td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>  
         </tr>  
         <tr>  
           <td colspan="3" height="10" class="LC_loginbox_strip">&nbsp;$contactblock</td>  
         </tr>          </tr>
       </table>        </table>
         <input type="hidden" name="lextkey" value="$lextkey" />
         <input type="hidden" name="uextkey" value="$uextkey" />
         </form>
     </td>      </td>
     <td align="right" valign="top" width="11"><img src="/images/login/tr_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt=""></td>      <td align="right" valign="top" width="11"><img src="/images/login/tr_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt="" /></td>
     </tr>
     <tr>
      <td width="10">&nbsp;</td>
      <td colspan="3">
       <br />
       $noscript_warning
       <hr style="clear:both;" />
      </td>
      <td width="10">&nbsp;</td>
   </tr>    </tr>
   <tr>    <tr>
       <td width="10">&nbsp;</td>
     <td colspan="4">      <td colspan="4">
       <div align="right">      <div style="float: left;">
           <img src="/images/login/sponsors.png" alt="$lt{'supp'}" align="right" />       <table border="0" cellspacing="0" cellpadding="0">
      </div>  $contactrow
   $domainrow
   $serverrow
   $loadrow
   $userloadrow
   $versionrow
        </table>
       </div>
       <div style="float: right;">
        <img src="/images/login/sponsors.png" alt="$lt{'supp'}" align="right" />
       <br style="clear:both;" />
       </div>
    </td>     </td>
   </tr>    </tr>
   <tr>    <tr>
     <td align="left" valign="bottom" width="11"><img src="/images/login/bl_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt=""></td>      <td align="left" valign="bottom" width="11"><img src="/images/login/bl_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt="" /></td>
     <td colspan="3" width="698">&nbsp;</td>      <td colspan="3" width="698">&nbsp;</td>
     <td align="right" valign="bottom" width="11"><img src="/images/login/br_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt=""></td>      <td align="right" valign="bottom" width="11"><img src="/images/login/br_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt="" /></td>
   </tr>    </tr>
 </table>  </table>
 </div>  </div>
 <p>&nbsp;</p>  <p>&nbsp;</p>
 $noscript_warning  
      <input type="hidden" name="lextkey" value="$lextkey" />  
      <input type="hidden" name="uextkey" value="$uextkey" />  
   </form>  
   <form name="server" action="/adm/authenticate" method="post" target="_top">    <form name="server" action="/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />     <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />     <input type="hidden" name="serverid" value="$lonhost" />
Line 659  sub contactdisplay { Line 735  sub contactdisplay {
                          '<tt>'.$servadm.'</tt><br />';                           '<tt>'.$servadm.'</tt><br />';
     }      }
     if ($showhelpdesk) {      if ($showhelpdesk) {
         $contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';          $contactblock .= '<a href="javascript:helpdesk()" style="text-decoration:underline;">'.$lt->{'helpdesk'}.'</a><br />';
         my $thisurl = &escape('/adm/login');          my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";          $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">  <script type="text/javascript">
Removed from v.1.1  
changed lines
  Added in v.1.8

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>