[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /interface lonannounce.pm loncommon.pm loncommunicate.pm loncreateuser.pm londocs.pm londropadd.pm lonhtmlcommon.pm lonindexer.pm lonnavmaps.pm lonparmset.pm lonpreferences.pm lonsearchcat.pm lonspreadsheet.pm lonstatistics.pm lontest.pm doc/loncapafiles loncapafiles.lpml
www
lon-capa-cvs@mail.lon-capa.org
Wed, 21 Aug 2002 17:18:08 -0000
This is a MIME encoded message
--www1029950288
Content-Type: text/plain
www Wed Aug 21 13:18:08 2002 EDT
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom/auth lonroles.pm
/loncom/interface lonannounce.pm loncommon.pm loncommunicate.pm
loncreateuser.pm londocs.pm londropadd.pm
lonhtmlcommon.pm lonindexer.pm lonnavmaps.pm
lonparmset.pm lonpreferences.pm lonsearchcat.pm
lonspreadsheet.pm lonstatistics.pm lontest.pm
Log:
Starting to implement common header and color scheme for LON-CAPA handlers
(non-content pages).
Instead of <body bgcolor="#...."><h1>... call
&Apache::loncommon::bodytag(title,[role],[add_body_parms]);
title: what it says in the header
role (OPTIONAL): override role choice
('admin','coordinator','student','author')
add_body_parms: additional parameters to be put into the body tag, for
example 'onLoad="init();" or stuff
Colors and layout will likely change in the future, including domain
customization, help function calls, (css?)
--www1029950288
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20020821131808.txt"
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.164 doc/loncapafiles/loncapafiles.lpml:1.165
--- doc/loncapafiles/loncapafiles.lpml:1.164 Wed Aug 14 19:04:34 2002
+++ doc/loncapafiles/loncapafiles.lpml Wed Aug 21 13:18:08 2002
@@ -3,7 +3,7 @@
<!-- loncapafiles.lpml -->
<!-- Scott Harrison -->
-<!-- $Id: loncapafiles.lpml,v 1.164 2002/08/14 23:04:34 harris41 Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.165 2002/08/21 17:18:08 www Exp $ -->
<!--
@@ -517,6 +517,11 @@
<description>LCD font for remote control</description>
</directory>
<directory dist='default'>
+ <targetdir dist='default'>home/httpd/html/adm/lonInterFace</targetdir>
+ <categoryname>server readonly</categoryname>
+ <description>Page headers and graphical interface files</description>
+</directory>
+<directory dist='default'>
<targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu
</targetdir>
<categoryname>server readonly</categoryname>
@@ -3530,6 +3535,20 @@
Define unit prefixing and conversion for CAPA problem handling.
</description>
</file>
+<fileglob>
+<glob>*.jpg</glob>
+<sourcedir>loncom/html/adm/lonInterFace/</sourcedir>
+<targetdir dist='default'>home/httpd/html/adm/lonInterFace/</targetdir>
+<categoryname>graphic file</categoryname>
+<description>Pages headers</description>
+<filenames>
+admin.jpg;
+author.jpg;
+coordinator.jpg;
+header.jpg;
+student.jpg;
+</filenames>
+</fileglob>
<fileglob>
<glob>*.gif</glob>
<sourcedir>loncom/html/adm/lonLCDfont/</sourcedir>
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.40 loncom/auth/lonroles.pm:1.41
--- loncom/auth/lonroles.pm:1.40 Thu Aug 8 15:29:30 2002
+++ loncom/auth/lonroles.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.40 2002/08/08 19:29:30 matthew Exp $
+# $Id: lonroles.pm,v 1.41 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -148,11 +148,13 @@
return OK if $r->header_only;
my $swinfo=&Apache::lonmenu::rawconfig($r);
+ my $bodytag=&Apache::loncommon::bodytag('User Roles');
$r->print(<<ENDHEADER);
<html>
<head>
<title>LON-CAPA User Roles</title>
-</head><body bgcolor="#FFFFFF">
+</head>
+$bodytag
<script>
$swinfo
window.focus();
@@ -186,7 +188,6 @@
$r->print("Resource: $fn\n");
$r->print("Action : $msg\n</pre><hr>");
} else {
- $r->print("<h1>LON-CAPA User Roles</h1>");
if ($ENV{'user.error.msg'}) {
$r->print(
'<h3><font color=red>You need to choose another user role or '.
@@ -209,8 +210,6 @@
}
} else {
if ($advanced) {
- $r->print
- ("<h2>$ENV{'user.name'}, Please Select a Role</h2>\n");
$r->print("Your home server is ".
$Apache::lonnet::hostname{&Apache::lonnet::homeserver
($ENV{'user.name'},$ENV{'user.domain'})}.
Index: loncom/interface/lonannounce.pm
diff -u loncom/interface/lonannounce.pm:1.5 loncom/interface/lonannounce.pm:1.6
--- loncom/interface/lonannounce.pm:1.5 Fri Aug 9 16:39:13 2002
+++ loncom/interface/lonannounce.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.5 2002/08/09 20:39:13 www Exp $
+# $Id: lonannounce.pm,v 1.6 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -175,10 +175,8 @@
}
</script>
</head>
-<body bgcolor="#FFFFFF">
-<h1>Announcements</h1>
ENDDOCUMENT
-
+ $r->print(&Apache::loncommon::bodytag("Announcements and Calendar"));
# does this user have privileges to post, etc?
my $allowed=0;
if ($ENV{'request.course.id'}) {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.54 loncom/interface/loncommon.pm:1.55
--- loncom/interface/loncommon.pm:1.54 Tue Aug 20 17:29:34 2002
+++ loncom/interface/loncommon.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.54 2002/08/20 21:29:34 www Exp $
+# $Id: loncommon.pm,v 1.55 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1195,7 +1195,20 @@
###############################################
sub bodytag {
- my ($function,$title,$addentries)=@_;
+ my ($title,$function,$addentries)=@_;
+ unless ($function) {
+ $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_URI'}=~/^(\/priv|\~)/)) {
+ $function='author';
+ }
+ }
my $img='';
my $pgbg='';
my $tabbg='';
@@ -1214,49 +1227,61 @@
$img='coordinator';
$pgbg='#CCFFFF';
$tabbg='#CCCCFF';
- $font='#000033';
+ $font='#000044';
$link='#003333';
$vlink='#006633';
} elsif ($function eq 'author') {
$img='author';
$pgbg='#CCFFFF';
$tabbg='#CCFFCC';
- $font='#003300';
+ $font='#004400';
$link='#003333';
$vlink='#006666';
} else {
$img='student';
- $pgbg='#FFFF99';
+ $pgbg='#FFFFAA';
$tabbg='#FF9900';
$font='#991100';
$link='#993300';
$vlink='#996600';
}
- my $role=&Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]);
+# role and realm
+ my ($role,$realm)
+ =&Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]);
+# realm
if ($ENV{'request.course.id'}) {
- $role.='<br>'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ $realm=
+ $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
}
+ unless ($realm) { $realm=' '; }
+# Set messages
+ my $messages=localtime();
+# Output
return(<<ENDBODY);
<body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
$addentries>
-<table cellspacing="0" border="0" cellpadding="2">
-<tr><td colspan="2" bgcolor="$tabbg">
-<img src="/adm/lonInterFace/$img.jpg" /></td></tr>
+<table width="100%" cellspacing="0" border="0" cellpadding="0">
+<tr><td bgcolor="$font">
+<img src="/adm/lonInterFace/$img.jpg" /></td>
+<td bgcolor="$font"><font color='$pgbg'>$messages</font></td>
+</tr>
<tr>
-<td rowspan="2" bgcolor="$tabbg">
-<font size="5"><b>$title</b></font>
+<td rowspan="3" bgcolor="$tabbg">
+ <font size="5"><b>$title</b></font>
<td bgcolor="$tabbg" align="right">
<font size="2">
$ENV{'environment.firstname'}
$ENV{'environment.middlename'}
$ENV{'environment.lastname'}
$ENV{'environment.generation'}
-</font>
+ </font>
</td>
</tr>
<tr><td bgcolor="$tabbg" align="right">
-<font size="2">$role</font>
+<font size="2">$role</font>
</td></tr>
+<tr>
+<td bgcolor="$tabbg" align="right"><font size="2">$realm</font> </td></tr>
</table><br>
ENDBODY
}
Index: loncom/interface/loncommunicate.pm
diff -u loncom/interface/loncommunicate.pm:1.10 loncom/interface/loncommunicate.pm:1.11
--- loncom/interface/loncommunicate.pm:1.10 Mon Jun 24 10:33:21 2002
+++ loncom/interface/loncommunicate.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Communicate
#
-# $Id: loncommunicate.pm,v 1.10 2002/06/24 14:33:21 www Exp $
+# $Id: loncommunicate.pm,v 1.11 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,6 +41,7 @@
use strict;
use Apache::Constants qw(:common);
use Apache::lonmsg();
+use Apache::loncommon;
sub handler {
my $r = shift;
@@ -55,10 +56,8 @@
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Communicate</h1>
END
+ $r->print(&Apache::loncommon::bodytag("Communication and Messages"));
$r->print(<<END);
<table cellspacing="10" cellpadding="2">
<tr><td bgcolor="#FFFFAA">
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.39 loncom/interface/loncreateuser.pm:1.40
--- loncom/interface/loncreateuser.pm:1.39 Thu Aug 8 15:27:35 2002
+++ loncom/interface/loncreateuser.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.39 2002/08/08 19:27:35 matthew Exp $
+# $Id: loncreateuser.pm,v 1.40 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,7 +47,7 @@
# 11/12,11/13,11/15 Scott Harrison
# 02/11/02 Matthew Hall
#
-# $Id: loncreateuser.pm,v 1.39 2002/08/08 19:27:35 matthew Exp $
+# $Id: loncreateuser.pm,v 1.40 2002/08/21 17:18:08 www Exp $
###
package Apache::loncreateuser;
@@ -87,13 +87,14 @@
my $defdom=$ENV{'user.domain'};
my @domains = &Apache::loncommon::get_domains();
my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
+ my $bodytag =&Apache::loncommon::bodytag(
+ 'Create Users, Change User Privileges');
$r->print(<<"ENDDOCUMENT");
<html>
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
-<body bgcolor="#FFFFFF">
-<h1>Create User, Change User Privileges</h1>
+$bodytag
<form action=/adm/createuser method=post>
<input type=hidden name=phase value=two>
<p>
@@ -154,9 +155,9 @@
</script>
</head>
-<body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif">
ENDDOCHEAD
+ $r->print(&Apache::loncommon::bodytag(
+ 'Create Users, Change User Privileges'));
my $forminfo =<<"ENDFORMINFO";
<form action="/adm/createuser" method="post" name="cu">
<input type="hidden" name="phase" value="three">
@@ -498,9 +499,14 @@
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
-<body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif">
ENDTHREEHEAD
+ my $title;
+ if (exists($ENV{'form.makeuser'})) {
+ $title='Set Privileges for New User';
+ } else {
+ $title='Modify User Privileges';
+ }
+ $r->print(&Apache::loncommon::bodytag($title));
# Check Inputs
if (! $ENV{'form.ccuname'} ) {
$r->print($error.'No login name specified.'.$end);
@@ -560,7 +566,6 @@
if ($ENV{'form.makeuser'}) {
# Create a new user
$r->print(<<ENDNEWUSERHEAD);
-<h1>Create User</h1>
<h3>Creating user "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
ENDNEWUSERHEAD
# Check for the authentication mode and password
@@ -596,7 +601,6 @@
($ENV{'form.login'} ne '' )) {
# Modify user privileges
$r->print(<<ENDMODIFYUSERHEAD);
-<h1>Change User Privileges</h1>
<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
ENDMODIFYUSERHEAD
if (! $amode || ! $genpwd) {
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.8 loncom/interface/londocs.pm:1.9
--- loncom/interface/londocs.pm:1.8 Tue Aug 20 09:02:41 2002
+++ loncom/interface/londocs.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.8 2002/08/20 13:02:41 www Exp $
+# $Id: londocs.pm,v 1.9 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -152,9 +152,8 @@
<title>The LearningOnline Network with CAPA</title>
<script>$script</script>
</head>
-<body bgcolor="#FFFFFF">
-<h1>Course Documents</h1>
ENDDOCUMENT
+$r->print(&Apache::loncommon::bodytag('Course Documents'));
# --------------------------------------------------0------ Standard documents
if (($standard) && ($allowed) && (!$forcesupplement)) {
$r->print('<h2>Main Course Documents</h2>');
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.45 loncom/interface/londropadd.pm:1.46
--- loncom/interface/londropadd.pm:1.45 Thu Aug 8 15:27:35 2002
+++ loncom/interface/londropadd.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.45 2002/08/08 19:27:35 matthew Exp $
+# $Id: londropadd.pm,v 1.46 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,15 +59,13 @@
# ================================================================ Print header
sub header {
+ my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
return(<<ENDHEAD);
<html>
<head>
<title>LON-CAPA Enrollment Manager</title>
</head>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>$ENV{'course.'.$ENV{'request.course.id'}.'.description'}</h1>
-<h2>Enrollment Manager</h2>
+$bodytag
<form method="post" enctype="multipart/form-data"
action="/adm/dropadd" name="studentform">
ENDHEAD
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.7 loncom/interface/lonhtmlcommon.pm:1.8
--- loncom/interface/lonhtmlcommon.pm:1.7 Mon Aug 12 20:37:18 2002
+++ loncom/interface/lonhtmlcommon.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.7 2002/08/13 00:37:18 stredwic Exp $
+# $Id: lonhtmlcommon.pm,v 1.8 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -175,15 +175,9 @@
my $Str = '';
$Str .= '<html><head><title>'.$pageName.'</title></head>'."\n";
- $Str .= '<body bgcolor="#FFFFFF">'."\n";
+ $Str .= &Apache::loncommon::bodytag($pageName)."\n";
$Str .= '<script>window.focus(); window.width=500;window.height=500;';
$Str .= '</script>'."\n";
- $Str .= '<table width="100%"><tr><td valign="top">';
- $Str .= '<h1> Course: ';
- $Str .= $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
- $Str .= '</h1></td><td align="right">'."\n";
- $Str .= '<img align="right" src=/adm/lonIcons/lonlogos.gif>';
- $Str .= '</td></tr></table>'."\n";
return $Str;
}
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.51 loncom/interface/lonindexer.pm:1.52
--- loncom/interface/lonindexer.pm:1.51 Tue Aug 20 09:01:53 2002
+++ loncom/interface/lonindexer.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.51 2002/08/20 13:01:53 www Exp $
+# $Id: lonindexer.pm,v 1.52 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -327,9 +327,8 @@
</script>
</head>
-<body bgcolor="#FFFFFF">
ENDHEADER
-
+$r->print(&Apache::loncommon::bodytag('Browse Resources'));
# - Evaluate actions from previous page (both cumulatively and chronologically)
if ($ENV{'form.catalogmode'} eq 'groupimport') {
my $acts=$ENV{'form.acts'};
@@ -372,10 +371,6 @@
}
}
-# ---------------------------------------------------------------- output title
- $r->print(
-'<h2><font color="#339933">The Learning<i>Online</i> Network with CAPA '.
- 'Network Directory Browser</font></h2>'."\n");
# ---------------------------------- get state of file attributes to be showing
if ($ENV{'form.attrs'} ne '') {
for (my $i=0; $i<=7; $i++) {
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.42 loncom/interface/lonnavmaps.pm:1.43
--- loncom/interface/lonnavmaps.pm:1.42 Sun Aug 18 17:45:41 2002
+++ loncom/interface/lonnavmaps.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.42 2002/08/18 21:45:41 www Exp $
+# $Id: lonnavmaps.pm,v 1.43 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -569,15 +569,16 @@
}
}
# ----------------------------------------------------------- Start Page Output
- $r->print('<html><head><title>Navigate LON-CAPA Maps</title></head>');
- $r->print('<body bgcolor="#FFFFFF"');
+ my $bodytagadd='';
+ $r->print(
+ '<html><head><title>Navigate Course Map</title></head>');
if (($currenturl=~/^\/res/) &&
($currenturl!~/^\/res\/adm/)) {
- $r->print(' onLoad="window.location.hash='."'curloc'".'"');
+ $bodytagadd='onLoad="window.location.hash='."'curloc'".'"';
}
- $r->print('><script>window.focus();</script>'.
- '<img align=right src=/adm/lonIcons/lonlogos.gif>'.
- '<h1>Navigate Course Map</h1>');
+ $r->print(&Apache::loncommon::bodytag('Navigate Course Map','',
+ $bodytagadd));
+ $r->print('<script>window.focus();</script>');
my $desc=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
if (defined($desc)) { $r->print("<h2>$desc</h2>\n"); }
$r->print("<h3>$date</h3>\n");
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.63 loncom/interface/lonparmset.pm:1.64
--- loncom/interface/lonparmset.pm:1.63 Mon Aug 19 19:01:27 2002
+++ loncom/interface/lonparmset.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.63 2002/08/19 23:01:27 bowersj2 Exp $
+# $Id: lonparmset.pm,v 1.64 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -249,6 +249,9 @@
my ($r,$id,$udom,$csec,$uname)=@_;
$r->content_type('text/html');
$r->send_http_header;
+
+ my $bodytag=&Apache::loncommon::bodytag('Set Course Parameters','',
+ 'onUnload="pclose()"');
$r->print(<<ENDHEAD);
<html>
<head>
@@ -303,9 +306,7 @@
}
</script>
</head>
-<body bgcolor="#FFFFFF" onUnload="pclose()">
-<h1>Set Course Parameters for Course:
-$ENV{'course.'.$ENV{'request.course.id'}.'.description'}</h1>
+$bodytag
<form method="post" action="/adm/parmset" name="envform">
<h3>Course Environment</h3>
<input type="submit" name="crsenv" value="Set Course Environment">
@@ -1287,6 +1288,8 @@
sub crsenv {
my $r=shift;
my $setoutput='';
+ my $bodytag=&Apache::loncommon::bodytag(
+ 'Set Course Environment Parameters');
my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
# -------------------------------------------------- Go through list of changes
@@ -1428,11 +1431,8 @@
<head>
<title>LON-CAPA Course Environment</title>
</head>
-<body bgcolor="#FFFFFF">
-<h1>Set Course Parameters</h1>
+$bodytag
<form method="post" action="/adm/parmset" name="envform">
-<h2>Course: $ENV{'course.'.$ENV{'request.course.id'}.'.description'}</h2>
-<h3>Course Environment</h3>
$setoutput
<p>
<table border=2>
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.9 loncom/interface/lonpreferences.pm:1.10
--- loncom/interface/lonpreferences.pm:1.9 Mon Aug 19 09:10:55 2002
+++ loncom/interface/lonpreferences.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.9 2002/08/19 13:10:55 matthew Exp $
+# $Id: lonpreferences.pm,v 1.10 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -108,14 +108,12 @@
my $domain = $ENV{'user.domain'};
my %userenv = &Apache::lonnet::get('environment',['screenname']);
my $screenname=$userenv{'screenname'};
+ my $bodytag=&Apache::loncommon::bodytag(
+ 'Change Your Anonymous Screen Name');
$r->print(<<ENDSCREEN);
<html>
-<body bgcolor="#FFFFFF">
-<h1>Preferences for $user</h1>
-<h3>$user is a member of domain $domain</h3>
-<p>
-Change anonymous discussion screen name for $user
-</p>
+$bodytag
+
<form name="server" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_screenname" />
New screenname:
@@ -143,13 +141,11 @@
&Apache::lonnet::delenv('environment\.screenname');
$message='Reset screenname';
}
+ my $bodytag=&Apache::loncommon::bodytag(
+ 'Change Your Anonymous Screen Name');
$r->print(<<ENDVCSCREEN);
<html>
-<body bgcolor="#FFFFFF">
-<h1>Preferences for $user</h1>
-<h3>$user is a member of domain $domain</h3>
-<p>
-Change anonymous discussion screen name for $user
+$bodytag
</p>
$message
</body></html>
@@ -198,9 +194,11 @@
my $jsh=Apache::File->new($include."/londes.js");
$r->print(<$jsh>);
}
+ my $bodytag=&Apache::loncommon::bodytag('Change Password','',
+ 'onLoad="init();"');
$r->print(<<ENDFORM);
</head>
-<body bgcolor="#FFFFFF" onLoad="init();">
+$bodytag
<script language="JavaScript">
@@ -228,12 +226,8 @@
}
</script>
-<h1>Preferences for $user</h1>
-<h3>$user is a member of domain $domain</h3>
$errormessage
-<p>
-Change password for $user
-</p>
+
<p>
<!-- We seperate the forms into 'server' and 'client' in order to
ensure that unencrypted passwords will not be sent out by a
@@ -401,10 +395,8 @@
<head>
<title>LON-CAPA Preferences</title>
</head>
-<body bgcolor="#FFFFFF" >
-<h1>Preferences for $user</h1>
-<h3>$user is a member of domain $domain</h3>
ENDHEADER
+ $r->print(&Apache::loncommon::bodytag('Change Your Preferences'));
# Determine current authentication method
my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
if ($currentauth =~ /^(unix|internal):/) {
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.153 loncom/interface/lonsearchcat.pm:1.154
--- loncom/interface/lonsearchcat.pm:1.153 Fri Aug 16 09:52:51 2002
+++ loncom/interface/lonsearchcat.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.153 2002/08/16 13:52:51 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.154 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -390,6 +390,7 @@
sub print_basic_search_form{
my ($r,$closebutton) = @_;
+ my $bodytag=&Apache::loncommon::bodytag('Catalog Search');
my $scrout=<<"ENDDOCUMENT";
<html>
<head>
@@ -402,13 +403,10 @@
}
</script>
</head>
-<body bgcolor="#FFFFFF">
-<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Search Catalog</h1>
+$bodytag
<form method="post" action="/adm/searchcat">
<input type="hidden" name="phase" value="basic_search" />
$hidden_fields
-<h3>Basic Search</h3>
<p>
Enter terms or phrases separated by AND, OR, or NOT
then press SEARCH below.
@@ -474,6 +472,7 @@
if (!defined($ENV{'form.viewselect'})) {
$ENV{'form.viewselect'} ="Detailed Citation View";
}
+ my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search');
my $scrout=<<"ENDHEADER";
<html>
<head>
@@ -486,10 +485,7 @@
}
</script>
</head>
-<body bgcolor="#FFFFFF">
-<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Advanced Catalog Search</h1>
-<hr />
+$bodytag
Enter terms or phrases separated by search operators
such as AND, OR, or NOT.<br />
<form method="post" action="/adm/searchcat">
Index: loncom/interface/lonspreadsheet.pm
diff -u loncom/interface/lonspreadsheet.pm:1.100 loncom/interface/lonspreadsheet.pm:1.101
--- loncom/interface/lonspreadsheet.pm:1.100 Fri Aug 16 14:25:24 2002
+++ loncom/interface/lonspreadsheet.pm Wed Aug 21 13:18:08 2002
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.100 2002/08/16 18:25:24 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.101 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2529,9 +2529,7 @@
</script>
ENDSCRIPT
- $r->print('</head><body bgcolor="#FFFFFF">'.
- '<img align=right src=/adm/lonIcons/lonlogos.gif>'.
- '<h1>LON-CAPA Spreadsheet</h1>'.
+ $r->print('</head>'.&Apache::loncommon::bodytag('Grades Spreadsheet').
'<form action="'.$r->uri.'" name=sheet method=post>'.
&hiddenfield('uname',$ENV{'form.uname'}).
&hiddenfield('udom',$ENV{'form.udom'}).
@@ -2594,12 +2592,6 @@
$r->print('<br><b>Assessment:</b> <tt>'.$ENV{'form.usymb'}.'</tt>');
}
}
-
-# ---------------------------------------------------------------- Course title
-
- $r->print('<h1>'.
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
- '</h1><h3>'.localtime().'</h3>');
# ---------------------------------------------------- See if user can see this
Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.46 loncom/interface/lonstatistics.pm:1.47
--- loncom/interface/lonstatistics.pm:1.46 Wed Aug 14 16:42:48 2002
+++ loncom/interface/lonstatistics.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.46 2002/08/14 20:42:48 stredwic Exp $
+# $Id: lonstatistics.pm,v 1.47 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -516,7 +516,7 @@
my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
"_$ENV{'user.domain'}_$courseID\_statistics.db";
- $r->print(&Apache::lonhtmlcommon::Title('LON-CAPA Statistics'));
+ $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
my ($returnValue, $students) = &PrepareData($c, $cacheDB,
\@studentInformation,
Index: loncom/interface/lontest.pm
diff -u loncom/interface/lontest.pm:1.7 loncom/interface/lontest.pm:1.8
--- loncom/interface/lontest.pm:1.7 Tue Aug 20 17:29:34 2002
+++ loncom/interface/lontest.pm Wed Aug 21 13:18:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# A debugging harness.
#
-# $Id: lontest.pm,v 1.7 2002/08/20 21:29:34 www Exp $
+# $Id: lontest.pm,v 1.8 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,7 +52,7 @@
$r->send_http_header;
return OK if $r->header_only;
- my $bodytag=&Apache::loncommon::bodytag("admin","List Environment");
+ my $bodytag=&Apache::loncommon::bodytag("List Environment","admin");
$r->print('<html>'.$bodytag);
my $envkey;
--www1029950288--