[LON-CAPA-cvs] cvs: rat / lonwrapper.pm loncom/auth lonauth.pm loncom/interface coursecatalog.pm lonhelper.pm lonmainmenu.pm
www
www@source.lon-capa.org
Wed, 27 May 2009 16:55:03 -0000
www Wed May 27 16:55:03 2009 EDT
Modified files:
/loncom/auth lonauth.pm
/loncom/interface coursecatalog.pm lonhelper.pm lonmainmenu.pm
/rat lonwrapper.pm
Log:
Redesign: no separate accessibility interface, cleaning up a bit
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.97 loncom/auth/lonauth.pm:1.98
--- loncom/auth/lonauth.pm:1.97 Wed Apr 1 14:43:19 2009
+++ loncom/auth/lonauth.pm Wed May 27 16:54:52 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.97 2009/04/01 14:43:19 hauer Exp $
+# $Id: lonauth.pm,v 1.98 2009/05/27 16:54:52 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -84,8 +84,7 @@
my $end_page =&Apache::loncommon::end_page();
my $continuelink;
- if (($env{'browser.interface'} eq 'textual') ||
- ($env{'environment.remote'} eq 'off')) {
+ if ($env{'environment.remote'} eq 'off') {
$continuelink="<a href=\"$lowerurl\">".&mt('Continue')."</a>";
}
# ------------------------------------------------- Output for successful login
Index: loncom/interface/coursecatalog.pm
diff -u loncom/interface/coursecatalog.pm:1.51 loncom/interface/coursecatalog.pm:1.52
--- loncom/interface/coursecatalog.pm:1.51 Fri May 1 01:30:08 2009
+++ loncom/interface/coursecatalog.pm Wed May 27 16:54:57 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for displaying the course catalog interface
#
-# $Id: coursecatalog.pm,v 1.51 2009/05/01 01:30:08 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.52 2009/05/27 16:54:57 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -306,7 +306,7 @@
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
}
my $onchange;
- unless (($env{'browser.interface'} eq 'textual') || ($env{'form.interface'} eq 'textual')) {
+ unless ($env{'form.interface'} eq 'textual') {
$onchange = 1;
}
$r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.172 loncom/interface/lonhelper.pm:1.173
--- loncom/interface/lonhelper.pm:1.172 Mon May 11 16:51:27 2009
+++ loncom/interface/lonhelper.pm Wed May 27 16:54:57 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.172 2009/05/11 16:51:27 bisitz Exp $
+# $Id: lonhelper.pm,v 1.173 2009/05/27 16:54:57 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3565,8 +3565,7 @@
my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
my $target = " target='loncapaclient'";
- if (($env{'browser.interface'} eq 'textual') ||
- ($env{'environment.remote'} eq 'off')) { $target=''; }
+ if ($env{'environment.remote'} eq 'off') { $target=''; }
$result .= "<center>\n" .
"<form action='".$actionURL."' method='post' $target>\n" .
"<input type='button' onclick='history.go(-1)' value='$previous' />" .
Index: loncom/interface/lonmainmenu.pm
diff -u loncom/interface/lonmainmenu.pm:1.6 loncom/interface/lonmainmenu.pm:1.7
--- loncom/interface/lonmainmenu.pm:1.6 Sat May 16 21:50:52 2009
+++ loncom/interface/lonmainmenu.pm Wed May 27 16:54:57 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# displays the main menu
#
-# $Id: lonmainmenu.pm,v 1.6 2009/05/16 21:50:52 droeschl Exp $
+# $Id: lonmainmenu.pm,v 1.7 2009/05/27 16:54:57 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,8 +52,7 @@
return OK if $r->header_only;
my $form;
- if ($env{'environment.remote'} ne 'off' &&
- $env{'browser.interface'} ne 'textual') {
+ if ($env{'environment.remote'} ne 'off') {
$form=&Apache::lonmenu::serverform();
}
@@ -67,10 +66,9 @@
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';
- }
+ $env{'browser.interface'}='faketextual';
+ $env{'environment.remote'}='off';
+
$r->print(&Apache::loncommon::start_page( 'Main Menu',
$script_tag,
{'bread_crumbs' => 1}));
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.32 rat/lonwrapper.pm:1.33
--- rat/lonwrapper.pm:1.32 Fri Dec 19 14:30:51 2008
+++ rat/lonwrapper.pm Wed May 27 16:55:03 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.32 2008/12/19 14:30:51 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.33 2009/05/27 16:55:03 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,20 +53,6 @@
sub wrapper {
my ($topurl,$bottomurl) = @_;
- if ($env{'browser.interface'} eq 'textual') {
-#
-# ssi-based rendering for text-based interface
-#
- return
- &Apache::loncommon::start_page('Menu',undef,
- {'bgcolor' => '#FFFFFF',
- 'force_register' => 1,
- }).
- &Apache::lonnet::ssi_body($bottomurl).
- &Apache::loncommon::end_page();
- }
-
-
my %layout = ('border' => 0);
if ($env{'environment.remote'} eq 'off') {
if ($env{'environment.icons'} eq 'iconsonly') {