Diff for /loncom/interface/lonmenu.pm between versions 1.176 and 1.182

version 1.176, 2006/04/21 20:45:42 version 1.182, 2006/05/15 17:27:51
Line 64  sub initlittle { Line 64  sub initlittle {
                                        'groups' => 'Groups');                                         'groups' => 'Groups');
 }  }
   
 sub get_colors {  
     my ($font,$pgbg,$tabbg);  
     if ($env{'browser.interface'} eq 'textual') {  
  $pgbg='#FFFFFF';  
         $tabbg='#FFFFFF';  
  $font='#000000';  
     } else {  
  my $domain   =&Apache::loncommon::determinedomain();  
  my $function =&Apache::loncommon::get_users_function();  
   
         $pgbg  =&Apache::loncommon::designparm($function.'.pgbg', $domain);  
         $tabbg =&Apache::loncommon::designparm($function.'.tabbg',$domain);  
         $font  =&Apache::loncommon::designparm($function.'.font', $domain);  
     }  
     return ($font,$pgbg,$tabbg);  
 }  
 # ============================= This gets called at the top of the body section  # ============================= This gets called at the top of the body section
   
 sub menubuttons {  sub menubuttons {
Line 125  sub menubuttons { Line 109  sub menubuttons {
 # Textual display only  # Textual display only
         if ($env{'request.course.id'}) {          if ($env{'request.course.id'}) {
     $navmaps=(<<ENDNAV);      $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>  <a href="/adm/navmaps?postdata=$escurl&amp;postsymb=$escsymb" target="_top">$lt{'nav'}</a>
 ENDNAV  ENDNAV
             if (($env{'request.noversionuri'}=~/^\/adm\//) &&              if (($env{'request.noversionuri'}=~/^\/adm\//) &&
          ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&           ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
Line 244  ENDCRELOAD Line 228  ENDCRELOAD
         my $form=&serverform();          my $form=&serverform();
  my $utility=&utilityfunctions();   my $utility=&utilityfunctions();
  my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");   my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
    my $remote;
    if ($env{'user.adv'}) {
       $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
    }
  return (<<ENDINLINEMENU);   return (<<ENDINLINEMENU);
 <script type="text/javascript">  <script type="text/javascript">
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
Line 259  $reloadlink Line 246  $reloadlink
 $navmaps  $navmaps
 $docs  $docs
 $groups  $groups
 <td><a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">$lt{'launch'}</td>  $remote
 <td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>  <td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>
 <td><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>  <td><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
 <td><img align="right" src="$logo" alt="Logo" /><b>LON-CAPA</b></td>  <td class="LC_top_nav_logo"><img align="right" src="$logo" alt="Logo" /><b>LON-CAPA</b></td>
 </tr>  </tr>
 </table>  </table>
 $form  $form
Line 320  sub innerregister { Line 307  sub innerregister {
           
     my $textual=($textinter || $noremote);      my $textual=($textinter || $noremote);
   
     @inlineremote=();      undef(@inlineremote);
     undef @inlineremote;  
   
     my $reopen=&Apache::lonmenu::reopenmenu();      my $reopen=&Apache::lonmenu::reopenmenu();
   
     my ($font,$pgbg,$tabbg) = &get_colors();  
   
     my $newmail='';      my $newmail='';
     if ($noremote) {      if ($noremote) {
  $newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'"><font face="Arial,Helvetica,sans-serif">';   $newmail='<table id="LC_nav_location"><tr>';
     }      }
     if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) {      if (&Apache::lonmsg::newmail()) { 
    if ($textual) {
       $newmail.= '<td class="LC_new_mail">
                      <a href="/adm/communicate" target="_top">'.
      &mt('You have new messages').'</a></td>';
    } else {
       $newmail= 'swmenu.setstatus("you have","messages");';
    }
       } elsif (($textual) 
        && ($env{'request.symb'}) 
        && ($env{'request.course.id'})) {
    $newmail.= '<td class="LC_current_location">';
  my ($mapurl,$rid,$resurl)=   my ($mapurl,$rid,$resurl)=
     &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());      &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
         $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'};          $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'};
Line 343  sub innerregister { Line 338  sub innerregister {
         if ($restitle) {          if ($restitle) {
     $newmail.=': '.$restitle;      $newmail.=': '.$restitle;
         }          }
         $newmail.='&nbsp;&nbsp;&nbsp;';          $newmail.='&nbsp;&nbsp;&nbsp;</td>';
     }  
     if (&Apache::lonmsg::newmail()) {   
        $newmail=($textual?  
  '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':  
                           'swmenu.setstatus("you have","messages");');  
     }      }
     if ($env{'request.state'} eq 'construct') {      if ($env{'request.state'} eq 'construct') {
         $newmail = $titletable;          $newmail = $titletable;
     } else {      } else {
  if ($noremote) {   if ($noremote) {
     $newmail.='</font></td></tr></table>';      $newmail.='</tr></table>';
  }   }
     }      }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');      my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
     my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');      my $tablestart=($noremote?'<table id="LC_menubuttons">':'').
     my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');   ($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
       my $tableend=($noremote?'</table>':'').($textinter?'<a name="content" />':'');
 # =============================================================================  # =============================================================================
 # ============================ This is for URLs that actually can be registered  # ============================ This is for URLs that actually can be registered
     if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {      if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
Line 740  sub load_remote_msg { Line 731  sub load_remote_msg {
   
     my $esclowerurl=&Apache::lonnet::escape($lowerurl);      my $esclowerurl=&Apache::lonnet::escape($lowerurl);
     my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',      my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
     "/adm/remote?action=collapse?url=$esclowerurl");   "/adm/remote?action=collapse&amp;url=$esclowerurl");
     return(<<ENDREMOTEFORM);      return(<<ENDREMOTEFORM);
 <p>  <p>
 <form name="wheel">  <form name="wheel">
Line 814  sub switch { Line 805  sub switch {
     $desc=&mt($desc);      $desc=&mt($desc);
     $img=&mt($img);      $img=&mt($img);
   
     my ($font,$pgbg,$tabbg) = &get_colors();  
   
     unless (($env{'browser.interface'} eq 'textual')  ||      unless (($env{'browser.interface'} eq 'textual')  ||
             ($env{'environment.remote'} eq 'off')) {              ($env{'environment.remote'} eq 'off')) {
 # Remote  # Remote
Line 842  sub switch { Line 831  sub switch {
        my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};         my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
        if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }         if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
        my $pic=         my $pic=
    '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.     '<img alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
    ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.     ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.
    ($nobreak==3?'right':'left').'" />';     ($nobreak==3?'right':'left').'" />';
        if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) {         if ($env{'browser.interface'} eq 'faketextual') {
 # Accessibility  # Accessibility
    if ($nobreak==3) {     if ($nobreak==3) {
        $inlineremote[10*$row+$col]="\n".         $inlineremote[10*$row+$col]="\n".
    '<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.     '<td class="LC_menubuttons_text" align="right">'.$text.
    '</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.     '</td><td class="LC_menubuttons_img" align="left">'.
    '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';     '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
    } elsif ($nobreak) {     } elsif ($nobreak) {
        $inlineremote[10*$row+$col]="\n<tr>".         $inlineremote[10*$row+$col]="\n<tr>".
    '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.     '<td class="LC_menubuttons_img" align="left">'.
    '<a href="javascript:'.$act.';">'.$pic.     '<a href="javascript:'.$act.';">'.$pic.'</a></td>
    '</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>';                      <td class="LC_menubuttons_text" align="left">'.$text.'</td>';
    } else {     } else {
        $inlineremote[10*$row+$col]="\n<tr>".         $inlineremote[10*$row+$col]="\n<tr>".
    '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.     '<td class="LC_menubuttons_img" align="left">'.
    '<a href="javascript:'.$act.';">'.$pic.     '<a href="javascript:'.$act.';">'.$pic.
    '</a></td><td colspan="3"><font color="'.$font.'">'.$desc.     '</a></td><td class="LC_menubuttons_text" colspan="3">'.
    '</font></td></tr>';            $desc.'</td></tr>';
    }     }
        } else {         } else {
 # Inline Menu  # Inline Menu
    $inlineremote[10*$row+$col]=     $inlineremote[10*$row+$col]=
    '<a href="javascript:'.$act.';">'.$pic.     '<a href="javascript:'.$act.';">'.$pic.
    '</a><font color="'.$font.'" size="2">'.$desc.     '</a><span class="LC_menubuttons_inline_text">'.$desc.'</span>';
    '</font>';  
        }         }
    }     }
     return '';      return '';
Line 1195  function annotate() { Line 1183  function annotate() {
   +"<form name='goannotate' target='Annotator' method='post' "    +"<form name='goannotate' target='Annotator' method='post' "
   +"action='/adm/annotations'>"    +"action='/adm/annotations'>"
   +"<input type='hidden' name='urlnew' value='"+currentURL+"' />"    +"<input type='hidden' name='urlnew' value='"+currentURL+"' />"
   +"</form>"    +"<\\/form>"
   +'$end_page');    +'$end_page');
    annotator.document.close();     annotator.document.close();
 }  }
Line 1211  function set_bookmark() { Line 1199  function set_bookmark() {
    +"<center><form method='post'"     +"<center><form method='post'"
    +" name='newlink' action='/adm/bookmarks' target='bmquery' "     +" name='newlink' action='/adm/bookmarks' target='bmquery' "
    +">\\n <table width=340 height=150 "     +">\\n <table width=340 height=150 "
    +"bgcolor='ffffff' align=center><tr><td>Link Name:<br><input "     +"bgcolor='ffffff' align=center><tr><td>Link Name:<br /><input "
    +"type='text' name='title' size=45 value='"+clienttitle+"'>"     +"type='text' name='title' size=45 value='"+clienttitle+"' />"
    +"<br>Address:<br><input type='text' name='address' size='45' "     +"<br />Address:<br /><input type='text' name='address' size='45' "
    +"value='"+clienthref+"'><br><center><input type='submit' "     +"value='"+clienthref+"' /><br /><center><input type='submit' "
    +"value='Save'> <input type='button' value='Close (no save)' "     +"value='Save' /> <input type='button' value='Close (no save)' "
    +"onclick='javascript:window.close();'></center></td>"     +"onclick='javascript:window.close();' /><\\/center><\\/td>"
    +"</tr></table></form></center>"     +"<\\/tr><\\/table><\\/form><\\/center>"
    +'$end_page' );     +'$end_page' );
    bmquery.document.close();     bmquery.document.close();
 }  }
Line 1227  ENDUTILITY Line 1215  ENDUTILITY
   
 sub serverform {  sub serverform {
     return(<<ENDSERVERFORM);      return(<<ENDSERVERFORM);
 <form name="server" action="/adm/logout" method="POST" target="_top">  <form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />  <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />  <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />  <input type="hidden" name="url" value="none" />
Line 1238  ENDSERVERFORM Line 1226  ENDSERVERFORM
   
 sub constspaceform {  sub constspaceform {
     return(<<ENDCONSTSPACEFORM);      return(<<ENDCONSTSPACEFORM);
 <form name="constspace" action="/adm/logout" method="POST" target="_top">  <form name="constspace" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="filename" value="" />  <input type="hidden" name="filename" value="" />
 </form>  </form>
 <form name="cstrdelete" action="/adm/cfile" method="POST" target="_top">  <form name="cstrdelete" action="/adm/cfile" method="post" target="_top">
 <input type="hidden" name="action" value="delete" />   <input type="hidden" name="action" value="delete" /> 
 <input type="hidden" name="filename" value="" />  <input type="hidden" name="filename" value="" />
 </form>  </form>
 <form name="cstrprint" action="/adm/printout" target="_parent" method="POST">  <form name="cstrprint" action="/adm/printout" target="_parent" method="post">
 <input type="hidden" name="postdata" value="" />  <input type="hidden" name="postdata" value="" />
 <input type="hidden" name="curseed" value="" />  <input type="hidden" name="curseed" value="" />
 <input type="hidden" name="problemtype" value="" />  <input type="hidden" name="problemtype" value="" />

Removed from v.1.176  
changed lines
  Added in v.1.182


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