[BACK]Return to lonmenu.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmenu.pm between versions 1.65 and 1.101

version 1.65, 2003/04/18 17:51:32 version 1.101, 2003/11/10 16:51:12
Line 44  use Apache::Constants qw(:common); Line 44  use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::File;  use Apache::File;
   use Apache::lonlocal;
   
 use vars qw(@desklines $readdesk);  use vars qw(@desklines $readdesk);
   
   
 my @inlineremote;  my @inlineremote;
 my $font;  my $font;
 my $tabbg;  my $tabbg;
 my $pgbg;  my $pgbg;
   
   # ================================================================ Little texts
   
   sub initlittle {
       return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
          'nav' => 'Navigate Contents',
          'main' => 'Main Menu',
          'launch' => 'Launch Remote Control');
   }
   
 # ============================= 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 58  sub menubuttons { Line 71  sub menubuttons {
     my $registration=shift;      my $registration=shift;
     my $navmaps='';      my $navmaps='';
     my $reloadlink='';      my $reloadlink='';
     my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'});      my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'});
     my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});      my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
     if ($ENV{'browser.interface'} eq 'textual') {      if ($ENV{'browser.interface'} eq 'textual') {
 # Textual display only  # Textual display only
    my %lt=&initlittle();
           $pgbg='#FFFFFF';
           $tabbg='#FFFFFF';
    $font='#000000';
         if ($ENV{'request.course.id'}) {          if ($ENV{'request.course.id'}) {
     $navmaps=(<<ENDNAV);      $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>  <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>
 ENDNAV  ENDNAV
             if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&              if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
          ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&           ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
          ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {           ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');                  my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);                  $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a>  <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
 ENDRELOAD  ENDRELOAD
             }              }
         }          }
Line 79  ENDRELOAD Line 96  ENDRELOAD
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
 </script>  </script>
 <a href="/adm/menu" target="_top">Main Menu</a>  <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps<br />  $reloadlink $navmaps<br />
 <script>  <script>
 // END LON-CAPA Internal  // END LON-CAPA Internal
Line 90  ENDMAINMENU Line 107  ENDMAINMENU
     } elsif ($ENV{'environment.remote'} eq 'off') {      } elsif ($ENV{'environment.remote'} eq 'off') {
 # Remote Control is switched off  # Remote Control is switched off
 # figure out colors  # figure out colors
    my %lt=&initlittle();
  my $function='student';   my $function='student';
         if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {          if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
     $function='coordinator';      $function='coordinator';
Line 98  ENDMAINMENU Line 116  ENDMAINMENU
             $function='admin';              $function='admin';
         }          }
         if (($ENV{'request.role'}=~/^(au|ca)/) ||          if (($ENV{'request.role'}=~/^(au|ca)/) ||
             ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {              ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) {
             $function='author';              $function='author';
         }          }
         my $domain=&Apache::loncommon::determinedomain();          my $domain=&Apache::loncommon::determinedomain();
Line 113  ENDMAINMENU Line 131  ENDMAINMENU
         if ($ENV{'request.course.id'}) {          if ($ENV{'request.course.id'}) {
     $navmaps=(<<ENDNAVREM);      $navmaps=(<<ENDNAVREM);
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">Navigate Contents</font></a></td>  <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAVREM  ENDNAVREM
             if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&              if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
                 ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&                  ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
          ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {           ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');                  my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);                  $reloadlink=(<<ENDRELOAD);
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a></td>  <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a></td>
 ENDRELOAD  ENDRELOAD
             }              }
         }          }
Line 133  ENDRELOAD Line 151  ENDRELOAD
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
 </script>  </script>
 <table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">  <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>  <tr>
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/menu" target="_top"><font color="$font">Main Menu</font></a>  <a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a>
 </td>  </td>
 $reloadlink  $reloadlink
 $navmaps  $navmaps
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/remote?action=launch&url=$escurl" target="_top">  <a href="/adm/remote?action=launch&url=$escurl" target="_top">
 <font color="$font">Launch Remote Control</font></a></td>  <font color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <img align="right" src="/adm/lonIcons/minilogo.gif" />  <img align="right" src="/adm/lonIcons/minilogo.gif" />
 <b>LON-CAPA</b></td>  <b>LON-CAPA</b></td>
 </tr>  </tr>
 </table>  </table>
   </font>
 <script>  <script>
 // END LON-CAPA Internal  // END LON-CAPA Internal
 </script>  </script>
Line 164  sub registerurl { Line 183  sub registerurl {
     my $forcereg=shift;      my $forcereg=shift;
     my $target = shift;      my $target = shift;
     my $result = '';      my $result = '';
           if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
       my $force_title='';
       if ($ENV{'request.state'} eq 'construct') {
    $force_title=&Apache::lonxml::display_title();
       }
     if ($target eq 'edit') {      if ($target eq 'edit') {
         $result .="<script type=\"text/javascript\">\n".          $result .="<script type=\"text/javascript\">\n".
             "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".              "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
Line 174  sub registerurl { Line 197  sub registerurl {
     if (($ENV{'browser.interface'} eq 'textual') ||      if (($ENV{'browser.interface'} eq 'textual') ||
         ($ENV{'environment.remote'} eq 'off') ||          ($ENV{'environment.remote'} eq 'off') ||
         ((($ENV{'request.publicaccess'}) ||           ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&           (!&Apache::lonnet::is_on_map(
      &Apache::lonnet::unescape($ENV{'request.noversionuri'})))) &&
         (!$forcereg))) {          (!$forcereg))) {
  return $result.    return $result.
          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';            '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }      }
 # Graphical display after login only  # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }      if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $result.=&innerregister($forcereg,$target);      if ($target ne 'edit') {
     return $result;   $result.=&innerregister($forcereg,$target);
       }
       return $result.$force_title;
 }  }
   
 # =========== This gets called in order to register a URL, both with the Remote  # =========== This gets called in order to register a URL, both with the Remote
Line 192  sub innerregister { Line 218  sub innerregister {
     my $forcereg=shift;      my $forcereg=shift;
     my $target = shift;      my $target = shift;
     my $result = '';      my $result = '';
       if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
   
     $Apache::lonxml::registered=1;      $Apache::lonxml::registered=1;
   
Line 207  sub innerregister { Line 234  sub innerregister {
   
     my $newmail='';      my $newmail='';
     if ($noremote) {      if ($noremote) {
  $newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';   $newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }      }
     if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {      if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
  my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'});   my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
         $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};          $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
         my $maptitle=&Apache::lonnet::gettitle($mapurl);          my $maptitle=&Apache::lonnet::gettitle($mapurl);
  my $restitle=&Apache::lonnet::gettitle($resurl);   my $restitle=&Apache::lonnet::gettitle($resurl);
Line 224  sub innerregister { Line 251  sub innerregister {
     }      }
     if (&Apache::lonmsg::newmail()) {       if (&Apache::lonmsg::newmail()) { 
        $newmail=($textual?         $newmail=($textual?
  '<b><a href="/adm/communicate">You have new messages</a></b><br />':   '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');                            'swmenu.setstatus("you have","messages");');
     }      }
     if ($noremote) {      if ($noremote) {
  $newmail.='</td></tr></table>';   $newmail.='</td></tr></table></font>';
     }      }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');      my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
     my $tablestart=($noremote?'<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%">':'');      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 $tableend=($noremote?'</table>':'');      my $tableend=($noremote?'</table></font>':'').($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_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {      if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges  # -- This applies to homework problems for users with grading privileges
         my $hwkadd='';          my $hwkadd='';
         if           if 
       ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {        ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
     if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {      my $crs='/'.$ENV{'request.course.id'};
  $hwkadd.=&switch('','',7,1,'subm.gif','view sub','missions',      if ($ENV{'request.course.sec'}) {
           $crs.='_'.$ENV{'request.course.sec'};
       }
       $crs=~s/\_/\//g;
   
       if (&Apache::lonnet::allowed('vgr',$crs)) {
    $hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions',
                        "gocmd('/adm/grades','submission')",                         "gocmd('/adm/grades','submission')",
        'View user submissions for this assessment resource');         'View user submissions for this assessment resource');
             }              }
     if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgr',$crs)) {
  $hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',   $hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
                        "gocmd('/adm/grades','gradingmenu')",                         "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');                         'Modify user grades for this assessment resource');
             }              }
     if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {      if (&Apache::lonnet::allowed('opa',$crs)) {
  $hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',   $hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
                        "gocmd('/adm/parmset','set')",                         "gocmd('/adm/parmset','set')",
                        'Modify deadlines, etc, for this assessment resource');                         'Modify deadlines, etc, for this assessment resource');
Line 318  sub innerregister { Line 351  sub innerregister {
 c&3&1  c&3&1
 s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1  s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
 s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3  s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
 s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information  c&6&3
 s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource  c&8&1
 s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource  c&8&2
 s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document  s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
 s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2  s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
 s&9&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2  
 s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2  s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS  ENDMENUITEMS
           unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
       $menuitems.=(<<ENDREALRES);
   s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
   s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
   s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
   ENDREALRES
    }
         my $buttons='';          my $buttons='';
         foreach (split(/\n/,$menuitems)) {          foreach (split(/\n/,$menuitems)) {
     my ($command,@rest)=split(/\&/,$_);      my ($command,@rest)=split(/\&/,$_);
Line 359  $form Line 398  $form
 ENDREGTEXT  ENDREGTEXT
 # Registered, graphical output  # Registered, graphical output
         } else {          } else {
       my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];
       $requri=&Apache::lonnet::unescape($requri);
     $result = (<<ENDREGTHIS);      $result = (<<ENDREGTHIS);
             
 <script language="JavaScript">  <script language="JavaScript">
Line 371  var swmenu=null; Line 412  var swmenu=null;
           $timesync            $timesync
           $newmail            $newmail
           $buttons            $buttons
   swmenu.currentURL=window.location.pathname;    swmenu.currentURL="$requri";
           swmenu.reloadURL=window.location.pathname+window.location.search;            swmenu.reloadURL=swmenu.currentURL+window.location.search;
           swmenu.currentSymb="$ENV{'request.symb'}";            swmenu.currentSymb="$ENV{'request.symb'}";
           swmenu.reloadSymb="$ENV{'request.symb'}";            swmenu.reloadSymb="$ENV{'request.symb'}";
           swmenu.currentStale=0;            swmenu.currentStale=0;
Line 394  var swmenu=null; Line 435  var swmenu=null;
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+   'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
  'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',   'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
   2000);    2000);
   
       }        }
   
 // END LON-CAPA Internal  // END LON-CAPA Internal
Line 446  ENDDONOTREGTHIS Line 486  ENDDONOTREGTHIS
 }  }
   
 sub loadevents() {  sub loadevents() {
       if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAreg();';      return 'LONCAPAreg();';
 }  }
   
 sub unloadevents() {  sub unloadevents() {
       if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAstale();';      return 'LONCAPAstale();';
 }  }
   
Line 562  ENDRESIZE Line 604  ENDRESIZE
 window.status='Opening LON-CAPA Remote Control';  window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html","$menuname",  var menu=window.open("/res/adm/pages/menu.html","$menuname",
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");  "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
   self.name='loncapaclient';
 ENDOPEN  ENDOPEN
     return '<script>'.$returnval.'</script>';      return '<script>'.$returnval.'</script>';
 }  }
Line 588  sub switch { Line 631  sub switch {
     my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_;      my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_;
     $act=~s/\$uname/$uname/g;      $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;      $act=~s/\$udom/$udom/g;
       $top=&mt($top);
       $bot=&mt($bot);
       $desc=&mt($desc);
     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 597  sub switch { Line 643  sub switch {
 # Accessibility  # Accessibility
        if ($nobreak==2) { return ''; }         if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;         my $text=$top.' '.$bot;
        $text=~s/\- //;         $text=~s/\s*\-\s*//gs;
        $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').         if ($nobreak) {
         '<a href="javascript:'.$act.';">'.$text.'</a> '.     $inlineremote[10*$row+$col]=
         ($nobreak?'':$desc);         '<a href="javascript:'.$act.';">'.$text.'</a>';
          } else {
      $inlineremote[10*$row+$col]="\n<br />".
          $desc.' <a href="javascript:'.$act.';">'.$text.'</a>';
          }
    } else {     } else {
 # Inline Remote  # Inline Remote
        if ($nobreak==2) { return ''; }         if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;         my $text=$top.' '.$bot;
        $text=~s/\- //;         $text=~s/\s*\-\s*//gs;
        $inlineremote[10*$row+$col]="\n".         my $pic=
          ($nobreak==3?'<td width="50%" colspan="2" align="right"':'<tr><td').     '<img border="0" alt="'.$text.'" src="/res/adm/pages/'.$img.'" />';
          ' bgcolor="'.$tabbg.'"'.($nobreak==1?' width="50%" colspan="2"':'').         if ($nobreak==3) {
      '"><a href="javascript:'.$act.';"><font color="'.$font.'"'.     $inlineremote[10*$row+$col]="\n".
           ($nobreak?' size="+1"':'').       '<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.
      '>'.$text.'</font></a></td>'.       '</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.
      ($nobreak?'':'<td colspan="3" width="80%"><font color="'.$font.'" size="-1">'.$desc.'</font>').($nobreak!=1?'</tr>':'');       '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
          } elsif ($nobreak) {
      $inlineremote[10*$row+$col]="\n<tr>".
        '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
        '<a href="javascript:'.$act.';">'.$pic.
        '</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>';
          } else {
      $inlineremote[10*$row+$col]="\n<tr>".
        '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
        '<a href="javascript:'.$act.';">'.$pic.
        '</a></td><td colspan="3"><font color="'.$font.'">'.$desc.
        '</font></td></tr>';       
          }
    }     }
     return '';      return '';
 }  }
Line 694  sub rawconfig { Line 756  sub rawconfig {
                $output.=&secondlevel(                 $output.=&secondlevel(
   $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);    $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
             }              }
         } elsif (($pro=~/p(\w+)/) && ($prt)) {          } elsif (($pro=~/^p(\w+)/) && ($prt)) {
     if (&Apache::lonnet::allowed($1,$prt)) {      if (&Apache::lonnet::allowed($1,$prt)) {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);                 $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
             }              }
Line 702  sub rawconfig { Line 764  sub rawconfig {
             if ($ENV{'request.course.fn'}) {              if ($ENV{'request.course.fn'}) {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);                 $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
     }      }
           } elsif ($pro =~ /^course_(.*)$/) {
               # Check for permissions inside of a course
               if (($ENV{'request.course.id'}) &&
                   (&Apache::lonnet::allowed($1,$ENV{'request.course.id'}.
               ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))
                    )) {
                   $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
       }
         } elsif ($pro eq 'author') {          } elsif ($pro eq 'author') {
             if ($author) {              if ($author) {
                 if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||                  if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||
Line 760  sub footer { Line 830  sub footer {
 sub utilityfunctions {  sub utilityfunctions {
     unless (($ENV{'browser.interface'} eq 'textual')  ||      unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($ENV{'environment.remote'} eq 'off')) { return ''; }          ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $currenturl=$ENV{'REQUEST_URI'};      my $currenturl=$ENV{'request.noversionuri'};
     my $currentsymb=$ENV{'request.symb'};      my $currentsymb=$ENV{'request.symb'};
 return (<<ENDUTILITY)  return (<<ENDUTILITY)
   
Line 824  ENDSERVERFORM Line 894  ENDSERVERFORM
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     $r->content_type('text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
Line 838  sub handler { Line 908  sub handler {
  $function='admin';   $function='admin';
     }      }
     if (($ENV{'request.role'}=~/^(au|ca)/) ||      if (($ENV{'request.role'}=~/^(au|ca)/) ||
  ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {   ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) {
  $function='author';   $function='author';
     }      }
     my $domain=&Apache::loncommon::determinedomain();      my $domain=&Apache::loncommon::determinedomain();
Removed from v.1.65  
changed lines
  Added in v.1.101

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