[LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm /interface loncommon.pm
tempelho
tempelho@source.lon-capa.org
Tue, 28 Apr 2009 21:54:57 -0000
tempelho Tue Apr 28 21:54:57 2009 EDT
Modified files:
/loncom/auth lonlogin.pm
/loncom/interface loncommon.pm
Log:
Removed unused textual interface code
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.118 loncom/auth/lonlogin.pm:1.119
--- loncom/auth/lonlogin.pm:1.118 Wed Apr 8 10:13:13 2009
+++ loncom/auth/lonlogin.pm Tue Apr 28 21:54:51 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.118 2009/04/08 10:13:13 tempelho Exp $
+# $Id: lonlogin.pm,v 1.119 2009/04/28 21:54:51 tempelho Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -103,8 +103,6 @@
$env{'form.interface'}=~s/\W//g;
my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
-
- my $fullgraph=($env{'form.interface'} ne 'textual');
my $iconpath=
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -235,17 +233,12 @@
$servadm=~s/\,/\<br \/\>/g;
# ----------------------------------------------------------- Front page design
-my $pgbg=
-($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
-my $font=
-($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
-my $link=
-($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
-my $vlink=
-($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
+my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain);
+my $font=&Apache::loncommon::designparm('login.font',$domain);
+my $link=&Apache::loncommon::designparm('login.link',$domain);
+my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
my $alink=&Apache::loncommon::designparm('login.alink',$domain);
-my $mainbg=
-($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
+my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
my $logo=&Apache::loncommon::designparm('login.logo',$domain);
my $img=&Apache::loncommon::designparm('login.img',$domain);
my $domainlogo=&Apache::loncommon::domainlogo($domain);
@@ -323,7 +316,6 @@
'perc' => 'percent',
'load' => 'Server Load',
'userload' => 'User Load',
- 'about' => 'About LON-CAPA',
'catalog' => 'Course Catalog',
'log' => 'Log in',
'help' => 'Log-in Help',
@@ -344,10 +336,8 @@
}
# ---------------------------------------------------------- Serve rest of page
-if ($fullgraph) {
$r->print(
'<div class="LC_loginpage_container">');
-}
$r->print(<<ENDSERVERFORM);
<form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
@@ -399,7 +389,6 @@
</form>
LFORM
-if ($fullgraph) {
if ($showbanner) {
$r->print(<<HEADER);
<!-- The LON-CAPA Header -->
@@ -432,8 +421,7 @@
$forgotpw<br />
$contactblock<br />
$newuserlink
- $coursecatalog<br /><br />
- <a href="/adm/about.html"><b>$lt{'about'}</b></a>
+ $coursecatalog
</div>
</div>
ENDTOP
@@ -445,9 +433,7 @@
$domainlogo
<div class="LC_loginpage_space"> </div>
ENDTOP
-}
-if ($fullgraph) {
$r->print(<<ENDDOCUMENT);
<table border="0" cellspacing="0" cellpadding="0">
<tr>
@@ -492,7 +478,6 @@
$helpdeskscript
ENDDOCUMENT
-}
my %endargs = ( 'noredirectlink' => 1, );
$r->print(&Apache::loncommon::end_page(\%endargs));
return OK;
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.797 loncom/interface/loncommon.pm:1.798
--- loncom/interface/loncommon.pm:1.797 Sat Apr 25 21:35:13 2009
+++ loncom/interface/loncommon.pm Tue Apr 28 21:54:57 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.797 2009/04/25 21:35:13 www Exp $
+# $Id: loncommon.pm,v 1.798 2009/04/28 21:54:57 tempelho Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -931,9 +931,6 @@
my ($topic, $text, $stayOnPage, $width, $height) = @_;
$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);
- if ($env{'browser.interface'} eq 'textual') {
- $stayOnPage=1;
- }
$width = 350 if (not defined $width);
$height = 400 if (not defined $height);
my $filename = $topic;
@@ -1039,8 +1036,7 @@
$stayOnPage = 0 if (not defined $stayOnPage);
# only use pop-up help (stayOnPage == 0)
# if environment.remote is on (using remote control UI)
- if ($env{'browser.interface'} eq 'textual' ||
- $env{'environment.remote'} eq 'off' ) {
+ if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;
}
my $output;
@@ -1064,8 +1060,7 @@
my ($text) = @_;
$text = &mt($text);
my $stay_on_page =
- ($env{'browser.interface'} eq 'textual' ||
- $env{'environment.remote'} eq 'off' );
+ ($env{'environment.remote'} eq 'off' );
my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
: "javascript:helpMenu('open')";
my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
@@ -1082,8 +1077,7 @@
my ($text) = @_;
my $stayOnPage =
- ($env{'browser.interface'} eq 'textual' ||
- $env{'environment.remote'} eq 'off' );
+ ($env{'environment.remote'} eq 'off' );
my $width = 620;
my $height = 600;
@@ -1142,8 +1136,7 @@
unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);
- if ($env{'browser.interface'} eq 'textual' ||
- $env{'environment.remote'} eq 'off' ) {
+ if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;
}
$width = 600 if (not defined $width);
@@ -1187,8 +1180,7 @@
unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);
- if ($env{'browser.interface'} eq 'textual' ||
- $env{'environment.remote'} eq 'off' ) {
+ if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;
}
$width = 350 if (not defined $width);
@@ -4268,15 +4260,7 @@
if ($bodyonly) {
return $bodytag;
- } elsif ($env{'browser.interface'} eq 'textual') {
-# Accessibility
-
- $bodytag.=&Apache::lonmenu::menubuttons($forcereg,$forcereg);
- if (!$notitle) {
- $bodytag.='<h1>LON-CAPA: '.$title.'</h1>';
- }
- return $bodytag;
- }
+ }
my $name = &plainname($env{'user.name'},$env{'user.domain'});
if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {