[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /interface loncommon.pm /publisher publisher.html
www
lon-capa-cvs@mail.lon-capa.org
Thu, 26 Dec 2002 15:38:54 -0000
This is a MIME encoded message
--www1040917134
Content-Type: text/plain
www Thu Dec 26 10:38:54 2002 EDT
Modified files:
/loncom/auth lonroles.pm
/loncom/interface loncommon.pm
/loncom/publisher publisher.html
Log:
Bug #1061 - less aggressive color combinations.
--www1040917134
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20021226103854.txt"
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.46 loncom/auth/lonroles.pm:1.47
--- loncom/auth/lonroles.pm:1.46 Mon Nov 25 11:05:56 2002
+++ loncom/auth/lonroles.pm Thu Dec 26 10:38:54 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.46 2002/11/25 16:05:56 matthew Exp $
+# $Id: lonroles.pm,v 1.47 2002/12/26 15:38:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -250,6 +250,7 @@
my $tstatus='is';
my $tpstart=' ';
my $tpend=' ';
+ my $tfont='#000000';
if ($tstart) {
if ($tstart>$then) {
$tstatus='future';
@@ -273,6 +274,7 @@
($ENV{'form.showall'})) {
if ($tstatus eq 'is') {
$tbg='#77FF77';
+ $tfont='#003300';
} elsif ($tstatus eq 'future') {
$tbg='#FFFF77';
} elsif ($tstatus eq 'will') {
@@ -280,11 +282,13 @@
$tremark.='Active at next login. ';
} elsif ($tstatus eq 'expired') {
$tbg='#FF7777';
+ $tfont='#330000';
} elsif ($tstatus eq 'will_not') {
$tbg='#AAFF77';
$tremark.='Expired after logout. ';
} elsif ($tstatus eq 'selected') {
$tbg='#11CC55';
+ $tfont='#002200';
$tremark.='Currently selected. ';
}
my $trole;
@@ -326,15 +330,18 @@
}
my $tcourseid=$tdom.'_'.$trest;
if ($ENV{'course.'.$tcourseid.'.description'}) {
- $twhere=
-&Apache::loncommon::syllabuswrapper($ENV{'course.'.$tcourseid.'.description'},
-$trest,$tdom);
+ $twhere=$ENV{'course.'.$tcourseid.'.description'};
+ unless ($twhere eq 'Currently not available') {
+ $twhere=
+ &Apache::loncommon::syllabuswrapper($twhere,$trest,$tdom,$tfont);
+ }
} else {
my %newhash=Apache::lonnet::coursedescription
($tcourseid);
if (%newhash) {
$twhere=
-&Apache::loncommon::syllabuswrapper($newhash{'description'},$trest,$tdom);
+&Apache::loncommon::syllabuswrapper($newhash{'description'},$trest,$tdom,
+ $tfont);
} else {
$twhere='Currently not available';
$ENV{'course.'.$tcourseid.'.description'}=$twhere;
@@ -365,17 +372,22 @@
$r->print('<td> </td>');
}
}
- $r->print('<td>'.$trole.'</td><td>'.
- $ttype.'</td><td>'.$twhere.'</td><td>'.$tpstart.
- '</td><td>'.$tpend.
- '</td><td>'.$tremark.' </td></tr>'."\n");
+ $r->print('<td><font color="'.$tfont.'">'.$trole.
+ '</font></td><td><font color="'.$tfont.'">'.$ttype.
+ '</font></td><td><font color="'.$tfont.'">'.$twhere.
+ '</font></td><td><font color="'.$tfont.'">'.$tpstart.
+ '</font></td><td><font color="'.$tfont.'">'.$tpend.
+ '</font></td><td><font color="'.$tfont.'">'.$tremark.
+ ' </font></td></tr>'."\n");
}
}
}
my $tremark='';
+ my $tfont='#003300';
if ($ENV{'request.role'} eq 'cm') {
$r->print('<tr bgcolor="#11CC55">');
$tremark='Currently selected.';
+ $tfont='#002200';
} else {
$r->print('<tr bgcolor="#77FF77">');
}
@@ -386,8 +398,9 @@
$r->print('<td> </td>');
}
}
- $r->print('<td colspan=5>No role specified'.
- '</td><td>'.$tremark.' </td></tr>'."\n");
+ $r->print('<td colspan=5><font color="'.$tfont.'">No role specified'.
+ '</font></td><td><font color="'.$tfont.'">'.$tremark.
+ ' </font></td></tr>'."\n");
$r->print('</table>');
unless ($nochoose) {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.72 loncom/interface/loncommon.pm:1.73
--- loncom/interface/loncommon.pm:1.72 Thu Dec 12 11:47:27 2002
+++ loncom/interface/loncommon.pm Thu Dec 26 10:38:54 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.72 2002/12/12 16:47:27 bowersj2 Exp $
+# $Id: loncommon.pm,v 1.73 2002/12/26 15:38:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1021,7 +1021,8 @@
sub syllabuswrapper {
- my ($link,$un,$do)=@_;
+ my ($link,$un,$do,$tf)=@_;
+ if ($tf) { $link='<font color="'.$tf.'">'.$link.'</font>'; }
return "<a href='/public/$do/$un/syllabus'>$link</a>";
}
Index: loncom/publisher/publisher.html
diff -u loncom/publisher/publisher.html:1.22 loncom/publisher/publisher.html:1.23
--- loncom/publisher/publisher.html:1.22 Mon Nov 18 10:28:50 2002
+++ loncom/publisher/publisher.html Thu Dec 26 10:38:54 2002
@@ -75,22 +75,22 @@
}
</script>
</head>
-<body bgcolor="#ccffff" text='#004400' link='#003333' vlink='#006666'>
+<body bgcolor="#ccffdd" text='#002200' link='#003333' vlink='#006666'>
<font size="-2">
<table border=0><tr><th bgcolor="#004400" height=20>
<table border=0><tr valign="middle">
<form name="publisher" action="/adm/publish" target="_parent" method="post">
-<td bgcolor="#ccffcc">
+<td bgcolor="#ccddaa">
<input type="hidden" name="filename" value="">
<input type="button" value="Publish this Resource" onClick="getfilename();">
</td></form>
<form name="dpublisher" action="/adm/pubdir" target="LONCAPAToBePublished" method="post">
-<td bgcolor="#ccffcc">
+<td bgcolor="#ccddaa">
<input type="hidden" name="filename" value="">
<input type="button" value="List Directory" onClick="getdfilename();">
</td></form>
<form name="cp" action="/adm/cfile" target="_parent" method="post" onSubmit="getcpfilename();">
-<td bgcolor="#ccffcc">
+<td bgcolor="#ccddaa">
<input type="hidden" name="filename" value="">
<input type="hidden" name="action" value="copy">
<input type="text" size=10 name="newfilename" value="">
@@ -98,14 +98,14 @@
</td></form>
<form name="upublisher" action="/adm/upload" target="_parent"
method="post" enctype="multipart/form-data">
-<td bgcolor="#ccffcc" valign="top">
+<td bgcolor="#ccddaa" valign="top">
<input type="hidden" name="filename" value="">
<input type="file" name="upfile" size="10">
<input type="button" value="Upload file" onClick="getufilename();">
</td></form>
<form name="printout" target="_parent" action="/adm/printout" target="LONCAPAToBePublished"
method="post" onSubmit="getpostdata();">
-<td rowspan=2 bgcolor="#ccffcc">
+<td rowspan=2 bgcolor="#ccddaa">
<input type="hidden" name="postdata" value="">
<input type="button" value="Printout" onClick="getpostdata();">
</td>
@@ -114,25 +114,25 @@
<tr valign="middle">
<form name="rpublisher" action="/adm/retrieve" target="_parent" method="post">
-<td bgcolor="#ccffcc">
+<td bgcolor="#ccddaa">
<input type="hidden" name="filename" value="">
<input type="button" value="Retrieve Old Version" onClick="getrfilename();">
</td></form>
<form name="del" action="/adm/cfile" target="_parent" method="post">
-<td bgcolor="#ccffcc">
+<td bgcolor="#ccddaa">
<input type="hidden" name="filename" value="">
<input type="hidden" name="action" value="delete">
<input type="button" value="Delete" onClick="getdelfilename();">
</td></form>
<form name="rename" action="/adm/cfile" target="_parent" method="post" onSubmit="getrenamefilename();">
-<td bgcolor="#ccffcc">
+<td bgcolor="#ccddaa">
<input type="hidden" name="filename" value="">
<input type="hidden" name="action" value="rename">
<input type="text" size=10 name="newfilename" value="">
<input type="button" value="Rename" onClick="getrenamefilename();">
</td></form>
<form name="newdir" action="/adm/cfile" target="_parent" method="post" onSubmit="getnewdirfilename();">
-<td bgcolor="#ccffcc">
+<td bgcolor="#ccddaa">
<input type="hidden" name="filename" value="">
<input type="hidden" name="action" value="newdir">
<input type="text" size=10 name="newfilename" value="">
--www1040917134--