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

Diff for /loncom/interface/lonmenu.pm between versions 1.191 and 1.195

version 1.191, 2006/07/01 00:39:54 version 1.195, 2006/07/14 16:46:36
Line 118  sub menubuttons { Line 118  sub menubuttons {
 ENDNAV  ENDNAV
             if (($env{'request.noversionuri'}=~/^\/adm\//) &&              if (($env{'request.noversionuri'}=~/^\/adm\//) &&
          ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&           ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
          ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|grppg|bulletinboard|aboutme)(\?|$)/)) {           ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&escape('return:');                  my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);                  $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>  <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
Line 129  ENDRELOAD Line 129  ENDRELOAD
 <a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>  <a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
 ENDDOCS  ENDDOCS
             }              }
             if ($showgroups) {  #            if ($showgroups) {
                 $groups =(<<ENDGROUPS);  #                $groups =(<<ENDGROUPS);
 <a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>  #<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a>
 ENDGROUPS  #ENDGROUPS
             }  #            }
  }   }
         my $form=&serverform();          my $form=&serverform();
         my $utility=&utilityfunctions();          my $utility=&utilityfunctions();
Line 198  my $is_group = (&Apache::loncommon::cour Line 198  my $is_group = (&Apache::loncommon::cour
 <td><a href="/adm/coursedocs" target="_top">$text</a></td>  <td><a href="/adm/coursedocs" target="_top">$text</a></td>
 ENDDOCS  ENDDOCS
             }              }
             if ($showgroups) {  #            if ($showgroups) {
                 my $text = ($is_group) ? $lt{'teams'} : $lt{'groups'};  #                my $text = ($is_group) ? $lt{'teams'} : $lt{'groups'};
                 $groups =(<<ENDGROUPS);  #                $groups =(<<ENDGROUPS);
 <td><a href="/adm/coursegroups" target="_top">$text</a></td>  #<td><a href="/adm/coursegroups" target="_top">$text</a></td>
 ENDGROUPS  #ENDGROUPS
             }  #            }
     if (      if (
  ($env{'request.noversionuri'}=~m[^/(res|public)/] &&   ($env{'request.noversionuri'}=~m[^/(res|public)/] &&
  $env{'request.symb'} eq '')   $env{'request.symb'} eq '')
Line 211  ENDGROUPS Line 211  ENDGROUPS
  (($env{'request.noversionuri'}=~/^\/adm\//) &&   (($env{'request.noversionuri'}=~/^\/adm\//) &&
  ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&   ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
  ($env{'request.noversionuri'}!~   ($env{'request.noversionuri'}!~
         m[^/adm/.*/(smppg|grppg|bulletinboard|aboutme)($|\?)])          m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
   )    )
  ) {   ) {
                 my $escreload=&escape('return:');                  my $escreload=&escape('return:');
Line 237  ENDCRELOAD Line 237  ENDCRELOAD
  if ($env{'user.adv'}) {   if ($env{'user.adv'}) {
     $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'      $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
  }   }
           my $helptopic='Student_Intro';
           if ($env{'request.role'}=~/^(ca|au)/) {
       $helptopic='Authoring_Intro';
    } elsif ($env{'request.role'}=~/^cc/) {
       $helptopic='Course_Coordination_Intro';
    }
           my $helplink=&Apache::loncommon::help_open_topic($helptopic,'Help');
  return (<<ENDINLINEMENU);   return (<<ENDINLINEMENU);
 <script type="text/javascript">  <script type="text/javascript">
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
Line 246  $utility Line 253  $utility
 </script>  </script>
 <table id="LC_top_nav">  <table id="LC_top_nav">
 <tr>  <tr>
   <td class="LC_top_nav_logo">
   <a href="/adm/about.html"><img src="$logo" alt="LON-CAPA Logo" align="left" border="0" /></a></td>
 <td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>  <td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
 $reloadlink  $reloadlink
 $navmaps  $navmaps
Line 253  $docs Line 262  $docs
 $groups  $groups
 $remote  $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>$helplink</td>
 <td class="LC_top_nav_logo">LON-CAPA<img src="$logo" alt="Logo" /></td>  <td class="LC_top_logout"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
 </tr>  </tr>
 </table>  </table>
 $form  $form
Line 478  s&8&3&prt.gif&prepare[_1]&printout[_1]&g Line 487  s&8&3&prt.gif&prepare[_1]&printout[_1]&g
 s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&1  s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&1
 s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&1  s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&1
 ENDMENUITEMS  ENDMENUITEMS
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|grppg|navmaps|syllabus|aboutme)(\?|$)/) {              unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
         $menuitems.=(<<ENDREALRES);          $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information  s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
 s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource  s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
Removed from v.1.191  
changed lines
  Added in v.1.195

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