Diff for /loncom/interface/lonmenu.pm between versions 1.8 and 1.13

version 1.8, 2001/08/07 21:47:34 version 1.13, 2002/02/08 23:52:37
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Routines to control the menu  # Routines to control the menu
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # (TeX Conversion Module  # (TeX Conversion Module
 #  #
 # 05/29/00,05/30 Gerd Kortemeyer)  # 05/29/00,05/30 Gerd Kortemeyer)
Line 84  sub rawconfig { Line 108  sub rawconfig {
     my $pub=($ENV{'request.state'} eq 'published');      my $pub=($ENV{'request.state'} eq 'published');
     my $con=($ENV{'request.state'} eq 'construct');      my $con=($ENV{'request.state'} eq 'construct');
     my $rol=$ENV{'request.role'};      my $rol=$ENV{'request.role'};
     map {      foreach (@desklines) {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act)=split(/\:/,$_);          my ($row,$col,$pro,$prt,$img,$top,$bot,$act)=split(/\:/,$_);
         $prt=~s/\$uname/$uname/g;          $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;          $prt=~s/\$udom/$udom/g;
Line 121  sub rawconfig { Line 145  sub rawconfig {
                 }                  }
             }              }
         }          }
     } @desklines;      }
     return $output;      return $output;
 }  }
   
Line 146  sub footer { Line 170  sub footer {
   
 # ================================================================ Main Program  # ================================================================ Main Program
   
 sub BEGIN {  BEGIN {
 if ($readdesk ne 'done') {    unless ($readdesk) {
   {    {
     my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.      my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
                                  '/mydesk.tab');    '/mydesk.tab');
     while (my $configline=<$config>) {      while (my $configline=<$config>) {
        chomp($configline);         chomp($configline);
        $desklines[$#desklines+1]=$configline;         $desklines[$#desklines+1]=$configline;

Removed from v.1.8  
changed lines
  Added in v.1.13


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