[LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml loncom loncapa_apache.conf loncom/interface lonmainmenu.pm lonmenu.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Fri, 07 Apr 2006 22:29:24 -0000
albertel Fri Apr 7 18:29:24 2006 EDT
Added files:
/loncom/interface lonmainmenu.pm
Modified files:
/loncom/interface lonmenu.pm
/loncom loncapa_apache.conf
/doc/loncapafiles loncapafiles.lpml
Log:
- moving main menu handler into seperate file
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.170 loncom/interface/lonmenu.pm:1.171
--- loncom/interface/lonmenu.pm:1.170 Fri Apr 7 17:56:01 2006
+++ loncom/interface/lonmenu.pm Fri Apr 7 18:28:40 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.170 2006/04/07 21:56:01 albertel Exp $
+# $Id: lonmenu.pm,v 1.171 2006/04/07 22:28:40 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,6 @@
use strict;
use Apache::lonnet;
-use Apache::Constants qw(:common);
use Apache::lonhtmlcommon();
use Apache::loncommon();
use Apache::lonenc();
@@ -1226,56 +1225,6 @@
return $navstatus;
}
-# ================================================ Handler when called directly
-
-
-sub handler {
- my $r = shift;
- &Apache::loncommon::no_cache($r);
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- return OK if $r->header_only;
-
- my $form;
- if ($env{'environment.remote'} ne 'off' &&
- $env{'browser.interface'} ne 'textual') {
- $form=&serverform();
- }
- my $function='student';
- if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
- $function='coordinator';
- }
- if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
- $function='admin';
- }
- if (($env{'request.role'}=~/^(au|ca)/) ||
- ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) {
- $function='author';
- }
- my $domain=&Apache::loncommon::determinedomain();
- $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
- $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
- $font=&Apache::loncommon::designparm($function.'.font',$domain);
- my $script_tag;
- if ($env{'environment.remote'} ne 'off') {
- my $utility=&utilityfunctions('/adm/menu');
- $script_tag=(<<ENDSCRIPT);
-<script type="text/javascript">
-$utility
-</script>
-ENDSCRIPT
- }
-# ---- Print the screen, pretend to be in text mode to generate text-based menu
- unless ($env{'browser.interface'} eq 'textual') {
- $env{'browser.interface'}='faketextual';
- $env{'environment.remote'}='off';
- }
- $r->print(&Apache::loncommon::start_page('Main Menu',$script_tag));
- $r->print('<table>'.&inlinemenu().'</table>'.$form);
- $r->print(&Apache::loncommon::end_page());
- return OK;
-}
-
# ================================================================ Main Program
BEGIN {
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.127 loncom/loncapa_apache.conf:1.128
--- loncom/loncapa_apache.conf:1.127 Fri Apr 7 18:15:34 2006
+++ loncom/loncapa_apache.conf Fri Apr 7 18:28:57 2006
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.127 2006/04/07 22:15:34 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.128 2006/04/07 22:28:57 albertel Exp $
##
#
@@ -427,7 +427,7 @@
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
-PerlHandler Apache::lonmenu
+PerlHandler Apache::lonmainmenu
ErrorDocument 403 /adm/login
ErrorDocument 500 /adm/errorhandler
</Location>
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.477 doc/loncapafiles/loncapafiles.lpml:1.478
--- doc/loncapafiles/loncapafiles.lpml:1.477 Fri Apr 7 18:17:30 2006
+++ doc/loncapafiles/loncapafiles.lpml Fri Apr 7 18:29:21 2006
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.477 2006/04/07 22:17:30 albertel Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.478 2006/04/07 22:29:21 albertel Exp $ -->
<!--
@@ -4065,6 +4065,15 @@
<status>works/unverified</status>
</file>
<file>
+ <source>loncom/interface/lonmainmenu.pm</source>
+ <target dist='default'>home/httpd/lib/perl/Apache/lonmainmenu.pm</target>
+ <categoryname>handler</categoryname>
+ <description>
+Displays the Main menu
+ </description>
+ <status>works/unverified</status>
+</file>
+<file>
<source>loncom/interface/lonremote.pm</source>
<target dist='default'>home/httpd/lib/perl/Apache/lonremote.pm</target>
<categoryname>handler</categoryname>
Index: loncom/interface/lonmainmenu.pm
+++ loncom/interface/lonmainmenu.pm
# The LearningOnline Network with CAPA
# displays the main menu
#
# $Id: lonmainmenu.pm,v 1.1 2006/04/07 22:28:40 albertel Exp $
#
# 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/
#
#
# There are two parameters controlling the action of this module:
#
# browser.interface - if this is 'textual', it overrides the second parameter
# and goes to screen reader PDA mode
#
# environment.remote - if this is 'on', the routines controll the remote
# control, otherwise they render the main window controls; ignored it
# browser.interface is 'textual'
#
package Apache::lonmainmenu;
use strict;
use Apache::Constants qw(:common);
use Apache::loncommon();
sub handler {
my $r = shift;
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
my $form;
if ($env{'environment.remote'} ne 'off' &&
$env{'browser.interface'} ne 'textual') {
$form=&Apache::lonmenu::serverform();
}
my $function='student';
if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
$function='coordinator';
}
if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
$function='admin';
}
if (($env{'request.role'}=~/^(au|ca)/) ||
($env{'request.noversionuri'}=~/^(\/priv|\~)/)) {
$function='author';
}
my $domain=&Apache::loncommon::determinedomain();
$pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
$tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
$font=&Apache::loncommon::designparm($function.'.font',$domain);
my $script_tag;
if ($env{'environment.remote'} ne 'off') {
my $utility=&Apache::lonmenu::utilityfunctions('/adm/menu');
$script_tag=(<<ENDSCRIPT);
<script type="text/javascript">
$utility
</script>
ENDSCRIPT
}
# ---- Print the screen, pretend to be in text mode to generate text-based menu
unless ($env{'browser.interface'} eq 'textual') {
$env{'browser.interface'}='faketextual';
$env{'environment.remote'}='off';
}
$r->print(&Apache::loncommon::start_page('Main Menu',$script_tag));
$r->print('<table>'.&Apache::lonmenu::inlinemenu().'</table>'.$form);
$r->print(&Apache::loncommon::end_page());
return OK;
}
1;
__END__