Menu
▾
▴
openwebwork-cvs — WeBWorK CVS activity
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(53) |
Feb
(56) |
Mar
|
Apr
|
May
(30) |
Jun
(78) |
Jul
(121) |
Aug
(155) |
Sep
(77) |
Oct
(61) |
Nov
(45) |
Dec
(94) |
| 2006 |
Jan
(116) |
Feb
(33) |
Mar
(11) |
Apr
(23) |
May
(60) |
Jun
(89) |
Jul
(130) |
Aug
(109) |
Sep
(124) |
Oct
(63) |
Nov
(82) |
Dec
(45) |
| 2007 |
Jan
(31) |
Feb
(35) |
Mar
(123) |
Apr
(36) |
May
(18) |
Jun
(134) |
Jul
(133) |
Aug
(241) |
Sep
(126) |
Oct
(31) |
Nov
(15) |
Dec
(5) |
| 2008 |
Jan
(11) |
Feb
(6) |
Mar
(16) |
Apr
(29) |
May
(43) |
Jun
(149) |
Jul
(27) |
Aug
(29) |
Sep
(37) |
Oct
(20) |
Nov
(4) |
Dec
(6) |
| 2009 |
Jan
(34) |
Feb
(30) |
Mar
(16) |
Apr
(6) |
May
(1) |
Jun
(32) |
Jul
(22) |
Aug
(7) |
Sep
(18) |
Oct
(50) |
Nov
(22) |
Dec
(8) |
| 2010 |
Jan
(17) |
Feb
(15) |
Mar
(10) |
Apr
(9) |
May
(67) |
Jun
(30) |
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 23:38:29
|
Log Message:
-----------
re-add $courseDirs{DATA}, since it is still potentially useful.
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2/conf:
global.conf.dist
Revision Data
-------------
Index: global.conf.dist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.161
retrieving revision 1.161.2.1
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.161 -r1.161.2=
.1
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -239,6 +239,9 @@
# available in $courseName.)
$courseDirs{root} =3D "$webworkDirs{courses}/$courseName";
=20
+# Location of course-specific data files, such as WW1 (GDBM) database fi=
les.
+$courseDirs{DATA} =CA =CA =CA =CA=3D "$courseDirs{root}/DATA";
+
# Location of course HTML files, passed to PG.
$courseDirs{html} =3D "$courseDirs{root}/html";
$courseURLs{html} =3D "$webwork_courses_url/$courseName";
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 23:31:59
|
Log Message:
-----------
forward-port from rel-2-2-dev: (make webwork code output siblings div/h2
code, rather than template. this allows for the siblings box to be named
according to its contents.)
Modified Files:
--------------
webwork2/conf/templates/math:
system.template
webwork2/lib/WeBWorK/ContentGenerator:
Problem.pm
ProblemSet.pm
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
Stats.pm
StudentProgress.pm
Revision Data
-------------
Index: Problem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v
retrieving revision 1.192
retrieving revision 1.193
diff -Llib/WeBWorK/ContentGenerator/Problem.pm -Llib/WeBWorK/ContentGenerator/Problem.pm -u -r1.192 -r1.193
--- lib/WeBWorK/ContentGenerator/Problem.pm
+++ lib/WeBWorK/ContentGenerator/Problem.pm
@@ -697,6 +697,8 @@
my $eUserID = $r->param("effectiveUser");
my @problemIDs = sort { $a <=> $b } $db->listUserProblems($eUserID, $setID);
+ print CGI::start_div({class=>"info-box", id=>"fisheye"});
+ print CGI::h2("Problems");
#print CGI::start_ul({class=>"LinksMenu"});
#print CGI::start_li();
#print CGI::span({style=>"font-size:larger"}, "Problems");
@@ -715,6 +717,7 @@
print CGI::end_ul();
#print CGI::end_li();
#print CGI::end_ul();
+ print CGI::end_div();
return "";
}
Index: ProblemSet.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v
retrieving revision 1.75
retrieving revision 1.76
diff -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -u -r1.75 -r1.76
--- lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -146,6 +146,8 @@
@setIDs;
}
+ print CGI::start_div({class=>"info-box", id=>"fisheye"});
+ print CGI::h2("Sets");
#print CGI::start_ul({class=>"LinksMenu"});
#print CGI::start_li();
#print CGI::span({style=>"font-size:larger"}, "Homework Sets");
@@ -177,6 +179,7 @@
print CGI::end_ul();
#print CGI::end_li();
#print CGI::end_ul();
+ print CGI::end_div();
return "";
}
Index: system.template
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/templates/math/system.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lconf/templates/math/system.template -Lconf/templates/math/system.template -u -r1.4 -r1.5
--- conf/templates/math/system.template
+++ conf/templates/math/system.template
@@ -100,10 +100,7 @@
</div>
<!--#endif-->
<!--#if can="siblings"-->
- <div class="info-box" id="fisheye">
- <h2>Siblings</h2>
<!--#siblings-->
- </div>
<!--#endif-->
<!--#if can="options"-->
<div class="info-box" id="fisheye">
Index: Stats.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -Llib/WeBWorK/ContentGenerator/Instructor/Stats.pm -Llib/WeBWorK/ContentGenerator/Instructor/Stats.pm -u -r1.60 -r1.61
--- lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
@@ -104,9 +104,11 @@
my $stats = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::Stats",
courseID => $courseID);
- print CGI::start_ul({class=>"LinksMenu"});
- print CGI::start_li();
- print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($stats)}, 'Statistics'));
+ print CGI::start_div({class=>"info-box", id=>"fisheye"});
+ print CGI::h2("Statistics");
+ #print CGI::start_ul({class=>"LinksMenu"});
+ #print CGI::start_li();
+ #print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($stats)}, 'Statistics'));
print CGI::start_ul();
foreach my $setID (@setIDs) {
@@ -116,8 +118,9 @@
}
print CGI::end_ul();
- print CGI::end_li();
- print CGI::end_ul();
+ #print CGI::end_li();
+ #print CGI::end_ul();
+ print CGI::end_div();
return "";
}
Index: StudentProgress.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -Llib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm -Llib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm -u -r1.22 -r1.23
--- lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
@@ -103,9 +103,11 @@
my $progress = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::StudentProgress",
courseID => $courseID);
- print CGI::start_ul({class=>"LinksMenu"});
- print CGI::start_li();
- print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($progress)}, 'Student Progress'));
+ print CGI::start_div({class=>"info-box", id=>"fisheye"});
+ print CGI::h2("Student Progress");
+ #print CGI::start_ul({class=>"LinksMenu"});
+ #print CGI::start_li();
+ #print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($stats)}, 'Statistics'));
print CGI::start_ul();
foreach my $setID (@setIDs) {
@@ -115,8 +117,9 @@
}
print CGI::end_ul();
- print CGI::end_li();
- print CGI::end_ul();
+ #print CGI::end_li();
+ #print CGI::end_ul();
+ print CGI::end_div();
return "";
}
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 23:31:56
|
Log Message:
-----------
make webwork code output siblings div/h2 code, rather than template.
this allows for the siblings box to be named according to its contents.
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2/conf/templates/math:
system.template
webwork2/lib/WeBWorK/ContentGenerator:
Problem.pm
ProblemSet.pm
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
Stats.pm
StudentProgress.pm
Revision Data
-------------
Index: Problem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v
retrieving revision 1.191.2.1
retrieving revision 1.191.2.2
diff -Llib/WeBWorK/ContentGenerator/Problem.pm -Llib/WeBWorK/ContentGenerator/Problem.pm -u -r1.191.2.1 -r1.191.2.2
--- lib/WeBWorK/ContentGenerator/Problem.pm
+++ lib/WeBWorK/ContentGenerator/Problem.pm
@@ -697,6 +697,8 @@
my $eUserID = $r->param("effectiveUser");
my @problemIDs = sort { $a <=> $b } $db->listUserProblems($eUserID, $setID);
+ print CGI::start_div({class=>"info-box", id=>"fisheye"});
+ print CGI::h2("Problems");
#print CGI::start_ul({class=>"LinksMenu"});
#print CGI::start_li();
#print CGI::span({style=>"font-size:larger"}, "Problems");
@@ -715,6 +717,7 @@
print CGI::end_ul();
#print CGI::end_li();
#print CGI::end_ul();
+ print CGI::end_div();
return "";
}
Index: ProblemSet.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v
retrieving revision 1.70.2.6
retrieving revision 1.70.2.7
diff -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -u -r1.70.2.6 -r1.70.2.7
--- lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -146,6 +146,8 @@
@setIDs;
}
+ print CGI::start_div({class=>"info-box", id=>"fisheye"});
+ print CGI::h2("Sets");
#print CGI::start_ul({class=>"LinksMenu"});
#print CGI::start_li();
#print CGI::span({style=>"font-size:larger"}, "Homework Sets");
@@ -177,6 +179,7 @@
print CGI::end_ul();
#print CGI::end_li();
#print CGI::end_ul();
+ print CGI::end_div();
return "";
}
Index: system.template
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/templates/math/system.template,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lconf/templates/math/system.template -Lconf/templates/math/system.template -u -r1.1.2.3 -r1.1.2.4
--- conf/templates/math/system.template
+++ conf/templates/math/system.template
@@ -100,10 +100,7 @@
</div>
<!--#endif-->
<!--#if can="siblings"-->
- <div class="info-box" id="fisheye">
- <h2>Siblings</h2>
<!--#siblings-->
- </div>
<!--#endif-->
<!--#if can="options"-->
<div class="info-box" id="fisheye">
Index: Stats.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm,v
retrieving revision 1.60
retrieving revision 1.60.2.1
diff -Llib/WeBWorK/ContentGenerator/Instructor/Stats.pm -Llib/WeBWorK/ContentGenerator/Instructor/Stats.pm -u -r1.60 -r1.60.2.1
--- lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
@@ -104,9 +104,11 @@
my $stats = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::Stats",
courseID => $courseID);
- print CGI::start_ul({class=>"LinksMenu"});
- print CGI::start_li();
- print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($stats)}, 'Statistics'));
+ print CGI::start_div({class=>"info-box", id=>"fisheye"});
+ print CGI::h2("Statistics");
+ #print CGI::start_ul({class=>"LinksMenu"});
+ #print CGI::start_li();
+ #print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($stats)}, 'Statistics'));
print CGI::start_ul();
foreach my $setID (@setIDs) {
@@ -116,8 +118,9 @@
}
print CGI::end_ul();
- print CGI::end_li();
- print CGI::end_ul();
+ #print CGI::end_li();
+ #print CGI::end_ul();
+ print CGI::end_div();
return "";
}
Index: StudentProgress.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -Llib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm -Llib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm -u -r1.22 -r1.22.2.1
--- lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
@@ -103,9 +103,11 @@
my $progress = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::StudentProgress",
courseID => $courseID);
- print CGI::start_ul({class=>"LinksMenu"});
- print CGI::start_li();
- print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($progress)}, 'Student Progress'));
+ print CGI::start_div({class=>"info-box", id=>"fisheye"});
+ print CGI::h2("Student Progress");
+ #print CGI::start_ul({class=>"LinksMenu"});
+ #print CGI::start_li();
+ #print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($stats)}, 'Statistics'));
print CGI::start_ul();
foreach my $setID (@setIDs) {
@@ -115,8 +117,9 @@
}
print CGI::end_ul();
- print CGI::end_li();
- print CGI::end_ul();
+ #print CGI::end_li();
+ #print CGI::end_ul();
+ print CGI::end_div();
return "";
}
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 22:42:47
|
Log Message:
-----------
update README/LICENSE for 2.1.4
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2:
LICENSE
README
Revision Data
-------------
Index: README
===================================================================
RCS file: /webwork/cvs/system/webwork2/README,v
retrieving revision 1.10.2.7
retrieving revision 1.10.2.8
diff -LREADME -LREADME -u -r1.10.2.7 -r1.10.2.8
--- README
+++ README
@@ -1,65 +1,51 @@
WeBWorK
Online Homework Delivery System
- Version 2.1.3
+ Version 2.1.4
Copyright 2000-2006, The WeBWorK Project
All rights reserved.
Introduction
- This release builds on WeBWorK 2.1.2 by adding a number of incremental
- improvements.
+ This release fixes a security flaw in WeBWorK 2.1.3, as well as adding
+ a couple of bug fixes.
- * Site wide message on login page (in
- webwork2/htdocs/site_info.txt).
- * New sorting options on Instructor pages. All sorts are now case
- insensitive.
- * Ability to change password on Classlist Editor page as well a
- Instructor Tools page.
- * Reformatted scoring files.
- * Minor changes in navigation links.
- * Import/export of courses is now made to gzipped files in the
- templates directory rather than being downloaded directly to the
- administrators machine. This is still very slow, but it avoids the
- problem of browser timeouts.
- * Answer strings are base64 encoded to protect against problems of
- illegal characters in answers.
- * There is a big speed increase on using the Set Assigner page.
- * Courses can be renamed.
- * Davide Cervone has contributed a number of additions to the PG
- capabilities. One related to the WeBWorK 2 codebase allows macro
- files to be located in directories specified in global.conf. It is
- also possible to specify subdirectories: e.g.
- context/LimitedVector.pl.
+ * Security: WeBWorK 2.1.3 contained a security issue in which a
+ privileged user could execute arbitrary commands in the security
+ context of the web server. This has been fixed.
+ * Fixes a problem with base64-encoded answer strings.
+ * This version ships with an empty htdocs/site_info.txt file instead
+ if no file.
+ * Don't load experimental XMLRPC modules by default.
Availability
- WeBWorK 2.1.3 is available from our CVS repository. Read
+ WeBWorK 2.1.4 is available from our CVS repository. Read
[1]WeBWorKCVSReadOnly for more information on how to set up a CVS
connection. For those who already have a CVS connection, this update
- can be obtained by updating to the tag rel-2-1-3.
+ can be obtained by updating to the tag rel-2-1-4.
- WeBWorK 2.1.3 is also available as a tarball from our SourceForge
+ WeBWorK 2.1.4 is also available as a tarball from our SourceForge
project page:
[2]http://sourceforge.net/project/showfiles.php?group_id=93112
- We recommend you also install [3]PGLanguageRelease2pt1pt3 at the same
- time you install WeBWorK 2.1.3.
+ You must also have [3]PGLanguageRelease2pt1pt3 installed. The
+ [4]installation manual covers installing PG.
Installation
- Read the section in the installation manual on [4]Upgrading WeBWorK.
+ Read the section in the installation manual on [5]Upgrading WeBWorK.
Help
- If you need help installing or using WeBWorK 2.1.3, visit the
- [5]WeBWorK discussion group and post your question there. The
+ If you need help installing or using WeBWorK 2.1.4, visit the
+ [6]WeBWorK discussion group and post your question there. The
developers monitor this forum.
Bug Reports & Feature Requests
Submit bug reports and feature requests at
- [6]http://bugs.webwork.rochester.edu/. We can't fix bugs and add
+ [7]http://bugs.webwork.rochester.edu/. We can't fix bugs and add
features if you don't tell us about them!
Patches
@@ -68,14 +54,15 @@
CVS code, you save us and yourself time. A bug in this release may be
fixed in CVS, and we can more easily handle patches against the latest
code. Check out the latest development version from CVS and patch
- against that. Consult the [7]WeBWorKCVS topic for more information.
+ against that. Consult the [8]WeBWorKCVS topic for more information.
References
1. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVSReadOnly
2. http://sourceforge.net/project/showfiles.php?group_id=93112
3. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGLanguageRelease2pt1pt3
- 4. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Upgrading_WeBWorK
- 5. http://webhost.math.rochester.edu/webworkdocs/discuss/
- 6. http://bugs.webwork.rochester.edu/
- 7. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVS
+ 4. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2
+ 5. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Upgrading_WeBWorK
+ 6. http://webhost.math.rochester.edu/webworkdocs/discuss/
+ 7. http://bugs.webwork.rochester.edu/
+ 8. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVS
Index: LICENSE
===================================================================
RCS file: /webwork/cvs/system/webwork2/LICENSE,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -LLICENSE -LLICENSE -u -r1.5.2.6 -r1.5.2.7
--- LICENSE
+++ LICENSE
@@ -1,8 +1,8 @@
WeBWorK
Online Homework Delivery System
- Version 2.1.3
+ Version 2.1.4
- Copyright 2000-2004, The WeBWorK Project
+ Copyright 2000-2006, The WeBWorK Project
All rights reserved.
This program is free software; you can redistribute it and/or modify
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 22:10:07
|
Log Message:
-----------
disable experimental xmlrpc stuff (as in rel-2-2-dev and HEAD)
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2/conf:
webwork.apache-config.dist
Revision Data
-------------
Index: webwork.apache-config.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/webwork.apache-config.dist,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -Lconf/webwork.apache-config.dist -Lconf/webwork.apache-config.dist -u -r1.4.6.1 -r1.4.6.2
--- conf/webwork.apache-config.dist
+++ conf/webwork.apache-config.dist
@@ -48,8 +48,8 @@
# allows Webservice access to WeBWorK
##########################################
-eval "use WebworkWebservice";die $@ if $@; #FIXME, is there another way to initialize this?
-eval "use RQP"; die $@ if $@;
+#eval "use WebworkWebservice";die $@ if $@; #FIXME, is there another way to initialize this?
+#eval "use RQP"; die $@ if $@;
##########################################
@@ -103,14 +103,14 @@
</Directory>
########## XMLRPC installation ##########
-<Location /mod_xmlrpc>
- SetHandler perl-script
- PerlHandler Apache::XMLRPC::Lite
- PerlSetVar dispatch_to "WebworkXMLRPC"
- PerlSetVar options "compress_threshold => 10000"
- Order Allow,Deny
- Allow from All
-</Location>
+#<Location /mod_xmlrpc>
+# SetHandler perl-script
+# PerlHandler Apache::XMLRPC::Lite
+# PerlSetVar dispatch_to "WebworkXMLRPC"
+# PerlSetVar options "compress_threshold => 10000"
+# Order Allow,Deny
+# Allow from All
+#</Location>
########## RQP installation ##########
#<Location /rqp>
@@ -122,22 +122,22 @@
# Allow from All
#</Location>
-<Location /rqp>
- SetHandler perl-script
- PerlHandler MySOAP
- Order Allow,Deny
- Allow from All
-</Location>
+#<Location /rqp>
+# SetHandler perl-script
+# PerlHandler MySOAP
+# Order Allow,Deny
+# Allow from All
+#</Location>
########## SOAP installation ############
-<Location /mod_soap>
- SetHandler perl-script
- PerlHandler Apache::SOAP
- PerlSetVar dispatch_to "WebworkXMLRPC"
- PerlSetVar options "compress_threshold => 10000"
- Order Allow,Deny
- Allow from All
-</Location>
+#<Location /mod_soap>
+# SetHandler perl-script
+# PerlHandler Apache::SOAP
+# PerlSetVar dispatch_to "WebworkXMLRPC"
+# PerlSetVar options "compress_threshold => 10000"
+# Order Allow,Deny
+# Allow from All
+#</Location>
EOF
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 21:45:44
|
Log Message:
-----------
re-apply backport from HEAD: (roll back part of change in version 1.58.)
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
ProblemSets.pm
Revision Data
-------------
Index: ProblemSets.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm,v
retrieving revision 1.56.2.3
retrieving revision 1.56.2.4
diff -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -u -r1.56.2.3 -r1.56.2.4
--- lib/WeBWorK/ContentGenerator/ProblemSets.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSets.pm
@@ -61,11 +61,7 @@
} else {
print CGI::p(CGI::b("Course Info"));
}
- unless (-e $course_info_path) { # FIXME
- `echo "" >$course_info_path`; # we seem to need to have this file
- # around to prevent
- # spurious errors when editing it.
- }
+
if (-f $course_info_path) { #check that it's a plain file
my $text = eval { readFile($course_info_path) };
if ($@) {
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 21:44:14
|
Log Message:
-----------
re-apply backport from HEAD: (Fixed a bug in which the constant
'function' BASE64_ENCODED was not being evaluated inside the matching
and substitution statements. Replaced the constant by using the
construction
our $BASE64_ENCODED = 'base64_encoded:';
instead. The variable is properly interpolated inside the matching and
substitution statements.)
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2/lib/WeBWorK:
Utils.pm
Revision Data
-------------
Index: Utils.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Utils.pm,v
retrieving revision 1.59.2.3
retrieving revision 1.59.2.4
diff -Llib/WeBWorK/Utils.pm -Llib/WeBWorK/Utils.pm -u -r1.59.2.3 -r1.59.2.4
--- lib/WeBWorK/Utils.pm
+++ lib/WeBWorK/Utils.pm
@@ -648,12 +648,16 @@
$result .= defined $ref ? $ref : '<font color="red">undef</font>';
}
}
-use constant BASE64_ENCODED => 'base64_encoded:';
+our $BASE64_ENCODED = 'base64_encoded:';
+# use constant BASE64_ENCODED = 'base64_encoded;
+# was not evaluated in the matching and substitution
+# statements
sub decodeAnswers($) {
my $string = shift;
return unless defined $string and $string;
- if ($string =~/^BASE64_ENCODED/) {
- $string =~ s/^BASE64_ENCODED//;
+
+ if ($string =~/^$BASE64_ENCODED/o) {
+ $string =~ s/^$BASE64_ENCODED//o;
$string = decode_base64($string);
}
@@ -684,7 +688,7 @@
}
$string =~ s/##$//; # remove last pair of hashs
- $string = BASE64_ENCODED.encode_base64($string);
+ $string = $BASE64_ENCODED.encode_base64($string);
return $string;
}
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 21:40:22
|
Log Message:
-----------
added empty site_info.txt file.
Tags:
----
rel-2-1-patches
Added Files:
-----------
webwork2/htdocs:
site_info.txt
Revision Data
-------------
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 21:40:12
|
Log Message:
-----------
added missing newline
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2/conf:
global.conf.dist
Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.111.2.7
retrieving revision 1.111.2.8
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.111.2.7 -r1.111.2.8
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -261,6 +261,7 @@
# A site info "message of the day" file
$webworkFiles{site_info} = "$webworkDirs{htdocs}/site_info.txt";
+
################################################################################
# Course-specific files
################################################################################
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 21:31:12
|
Log Message:
-----------
updated license and readme for 2.1.3
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2:
LICENSE
README
Revision Data
-------------
Index: README
===================================================================
RCS file: /webwork/cvs/system/webwork2/README,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -LREADME -LREADME -u -r1.10.2.6 -r1.10.2.7
--- README
+++ README
@@ -1,81 +1,65 @@
-this is a test
WeBWorK
Online Homework Delivery System
- Version 2.1
+ Version 2.1.3
- Copyright 2000-2004, The WeBWorK Project
+ Copyright 2000-2006, The WeBWorK Project
All rights reserved.
Introduction
- The [8]WeBWorKTeam is pleased to announce the release of WeBWorK 2.1.
- This release includes new functionality and enhancements to the user
- interface, database system, and PG language:
-
- * New sql_single database layout, for more efficient access to SQL
- databases.
- * New [9]mathematical-expression parser (for use in writing PG
- problems).
- * New File Manager module provides full access to course files.
- (Will replace File Xfer module in a future release.)
- * New Problem Set Detail module allows editing of set data (dates,
- headers), editing of problems (source file, value, etc.), and
- reordering of problems.
- * Improvements to jsMath display mode.
- * Many usability and cosmetic improvements.
- * Many bugfixes.
+ This release builds on WeBWorK 2.1.2 by adding a number of incremental
+ improvements.
- (Contributiors: please feel free to add anything I've forgotten.)
+ * Site wide message on login page (in
+ webwork2/htdocs/site_info.txt).
+ * New sorting options on Instructor pages. All sorts are now case
+ insensitive.
+ * Ability to change password on Classlist Editor page as well a
+ Instructor Tools page.
+ * Reformatted scoring files.
+ * Minor changes in navigation links.
+ * Import/export of courses is now made to gzipped files in the
+ templates directory rather than being downloaded directly to the
+ administrators machine. This is still very slow, but it avoids the
+ problem of browser timeouts.
+ * Answer strings are base64 encoded to protect against problems of
+ illegal characters in answers.
+ * There is a big speed increase on using the Set Assigner page.
+ * Courses can be renamed.
+ * Davide Cervone has contributed a number of additions to the PG
+ capabilities. One related to the WeBWorK 2 codebase allows macro
+ files to be located in directories specified in global.conf. It is
+ also possible to specify subdirectories: e.g.
+ context/LimitedVector.pl.
Availability
- WeBWorK 2.1 requires [10]PGLanguageRelease2pt1. Both WeBWorK and PG is
- available on our SourceForge project page:
- [11]http://sourceforge.net/project/showfiles.php?group_id=93112
+ WeBWorK 2.1.3 is available from our CVS repository. Read
+ [1]WeBWorKCVSReadOnly for more information on how to set up a CVS
+ connection. For those who already have a CVS connection, this update
+ can be obtained by updating to the tag rel-2-1-3.
+
+ WeBWorK 2.1.3 is also available as a tarball from our SourceForge
+ project page:
+ [2]http://sourceforge.net/project/showfiles.php?group_id=93112
- Installation directly from CVS is also possible. Refer to the
- [12]InstallationManualV2pt1 for more information.
+ We recommend you also install [3]PGLanguageRelease2pt1pt3 at the same
+ time you install WeBWorK 2.1.3.
Installation
- Documentation on installing and configuring WeBWorK is available in
- the [13]InstallationManualV2pt1. If you are upgrading an existing
- installation, be sure to read the section [14]Upgrading an existing
- WeBWorK installation.
-
- Using the new 'sql_single' database layout
-
- The new sql_single database layout stores the data for all courses
- using the layout in a single database, reducing the number of
- connections that need to be made to the SQL server and eliminates the
- need for database to be created and deleted as courses are created and
- deleted. It also adds indexing to data tables, improving system speed.
-
- To learn more about the database options available in WeBWorK 2.1,
- including the sql_single layout, consult the [15]Database
- configuration section of [16]InstallationManualV2pt1 and the
- [17]DatabaseLayoutManual.
-
- Before creating courses using the sql_single layout (or converting
- existing courses), you must [18]create a single database and grant
- access to it.
-
- We suggest that you convert all courses using the sql database layout
- to use sql_single instead and add indexing to converted courses.
- Instructions are available in the [19]CourseAdministrationManual.
+ Read the section in the installation manual on [4]Upgrading WeBWorK.
Help
- If you need help installing or using WeBWorK 2.1, consult
- [20]WeBWorKDocs and [21]WeBWorKFAQs.
-
- You can also visit the [22]WeBWorK discussion group and post your
- question there. The developers monitor this forum.
+ If you need help installing or using WeBWorK 2.1.3, visit the
+ [5]WeBWorK discussion group and post your question there. The
+ developers monitor this forum.
Bug Reports & Feature Requests
Submit bug reports and feature requests at
- [23]http://bugs.webwork.rochester.edu/. We can't fix bugs and add
+ [6]http://bugs.webwork.rochester.edu/. We can't fix bugs and add
features if you don't tell us about them!
Patches
@@ -84,27 +68,14 @@
CVS code, you save us and yourself time. A bug in this release may be
fixed in CVS, and we can more easily handle patches against the latest
code. Check out the latest development version from CVS and patch
- against that. Consult the [24]WeBWorKCVS topic for more information.
-
- -- [25]SamHathaway - 28 Oct 2004
+ against that. Consult the [7]WeBWorKCVS topic for more information.
References
- 8. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKTeam
- 9. http://devel.webwork.rochester.edu/doc/cvs/webwork2_rel-2-1/doc/parser/
- 10. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGLanguageRelease2pt1
- 11. http://sourceforge.net/project/showfiles.php?group_id=93112
- 12. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1
- 13. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1
- 14. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Upgrading_an_existing_WeBWorK_in
- 15. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Database_configuration
- 16. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1
- 17. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/DatabaseLayoutManual
- 18. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Configration_for_the_sql_single_
- 19. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/CourseAdministrationManual
- 20. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKDocs
- 21. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKFAQs
- 22. http://webhost.math.rochester.edu/webworkdocs/discuss/
- 23. http://bugs.webwork.rochester.edu/
- 24. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVS
- 25. http://devel.webwork.rochester.edu/twiki/bin/view/Main/SamHathaway
+ 1. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVSReadOnly
+ 2. http://sourceforge.net/project/showfiles.php?group_id=93112
+ 3. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGLanguageRelease2pt1pt3
+ 4. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Upgrading_WeBWorK
+ 5. http://webhost.math.rochester.edu/webworkdocs/discuss/
+ 6. http://bugs.webwork.rochester.edu/
+ 7. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVS
Index: LICENSE
===================================================================
RCS file: /webwork/cvs/system/webwork2/LICENSE,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -LLICENSE -LLICENSE -u -r1.5.2.5 -r1.5.2.6
--- LICENSE
+++ LICENSE
@@ -1,7 +1,6 @@
-
WeBWorK
Online Homework Delivery System
- Version 2.1
+ Version 2.1.3
Copyright 2000-2004, The WeBWorK Project
All rights reserved.
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 19:27:32
|
Log Message:
-----------
rel-2-1-3 was tagged on the wrong branch (MAIN), so this commit makes
rel-2-1-patches the same as rel-2-1-3, but in the correct branch. i will
then remove the tag rel-2-1-3 and re-tag rel-2-1-branches as rel-2-1-3.
THEN, I will add in the security fix, update the README, and tag
rel-2-1-4 for release.
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2:
LICENSE
README
webwork2/clients:
webwork_xmlrpc_client.pl
webwork2/conf:
global.conf.dist
webwork2/htdocs/css:
ur.css
webwork2/htdocs/jsMath:
jsMath-fallback-mac.js
webwork2/lib/WeBWorK:
Utils.pm
webwork2/lib/WeBWorK/ContentGenerator:
ProblemSets.pm
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
UserList.pm
Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.111.2.6
retrieving revision 1.111.2.7
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.111.2.6 -r1.111.2.7
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -256,13 +256,11 @@
# The set header is displayed on the problem set page. It is a PG file.
$webworkFiles{screenSnippets}{setHeader} = "$webworkDirs{conf}/snippets/setHeader.pg"; # screenSetHeader.pg"
-
# A PG template for creation of new problems.
$webworkFiles{screenSnippets}{blankProblem} = "$webworkDirs{conf}/snippets/blankProblem.pg"; # screenSetHeader.pg"
# A site info "message of the day" file
$webworkFiles{site_info} = "$webworkDirs{htdocs}/site_info.txt";
-
################################################################################
# Course-specific files
################################################################################
@@ -444,7 +442,6 @@
my $nobody = undef;
%permissionLevels = (
-
login => $guest,
report_bugs => $student,
submit_feedback => $student,
Index: README
===================================================================
RCS file: /webwork/cvs/system/webwork2/README,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -LREADME -LREADME -u -r1.10.2.5 -r1.10.2.6
--- README
+++ README
@@ -1,67 +1,81 @@
-
+this is a test
WeBWorK
Online Homework Delivery System
- Version 2.1.3
+ Version 2.1
- Copyright 2000-2005, The WeBWorK Project
+ Copyright 2000-2004, The WeBWorK Project
All rights reserved.
- * [1]Introduction
- * [2]Availability
- * [3]Installation
- * [4]Help
- * [5]Bug Reports & Feature Requests
- * [6]Patches
-
Introduction
- This release builds on WeBWorK 2.1.2 by adding a number of incremental
- improvements.
- * Site wide message on login page (in webwork2/htdocs/site_info.txt)
- * New sorting options on Instructor pages. All sorts are now case insensitive.
- * Ability to change password on "Classlist editor" page as well a "Instructor Tools" page
- * Reformatted scoring files
- * Minor changes in navigation links
- * import/export of courses is now made to gzipped files in the templates directory
- rather than being downloaded directly to the administrators machine. This is
- still very slow, but it avoids the problem of browser timeouts.
- * Answer strings are base64 encoded to protect against problems of illegal characters
- in answers.
- * There is a big speed increase on using the "Set Assigner" page
- * Hosted courses can be renamed
- * Davide Cervone has contributed a number of additions to the PG capabilities. One related
- to the =webwork2= code base allows macro files to be located in directories specified
- in =global.conf=. It is also possible to specify subdirectories: e.g.
- ="context/LimitedVector.pl"=
+ The [8]WeBWorKTeam is pleased to announce the release of WeBWorK 2.1.
+ This release includes new functionality and enhancements to the user
+ interface, database system, and PG language:
+
+ * New sql_single database layout, for more efficient access to SQL
+ databases.
+ * New [9]mathematical-expression parser (for use in writing PG
+ problems).
+ * New File Manager module provides full access to course files.
+ (Will replace File Xfer module in a future release.)
+ * New Problem Set Detail module allows editing of set data (dates,
+ headers), editing of problems (source file, value, etc.), and
+ reordering of problems.
+ * Improvements to jsMath display mode.
+ * Many usability and cosmetic improvements.
+ * Many bugfixes.
+
+ (Contributiors: please feel free to add anything I've forgotten.)
Availability
- WeBWorK 2.1.3 is available from our CVS repository. Read
- [7]WeBWorKCVSReadOnly for more information on how to set up a CVS
- connection. For those who already have a CVS connection, this update
- can be obtained by updating to the tag rel-2-1-patches.
-
- WeBWorK 2.1.3 is also available as a tarball from our SourceForge
- project page:
- [8]http://sourceforge.net/project/showfiles.php?group_id=93112
+ WeBWorK 2.1 requires [10]PGLanguageRelease2pt1. Both WeBWorK and PG is
+ available on our SourceForge project page:
+ [11]http://sourceforge.net/project/showfiles.php?group_id=93112
- We recommend you also install [9]PGLanguageRelease2pt1pt3 at the same
- time you install WeBWorK 2.1.3.
+ Installation directly from CVS is also possible. Refer to the
+ [12]InstallationManualV2pt1 for more information.
Installation
- Read the section in the installation manual on [10]Upgrading WeBWorK.
+ Documentation on installing and configuring WeBWorK is available in
+ the [13]InstallationManualV2pt1. If you are upgrading an existing
+ installation, be sure to read the section [14]Upgrading an existing
+ WeBWorK installation.
+
+ Using the new 'sql_single' database layout
+
+ The new sql_single database layout stores the data for all courses
+ using the layout in a single database, reducing the number of
+ connections that need to be made to the SQL server and eliminates the
+ need for database to be created and deleted as courses are created and
+ deleted. It also adds indexing to data tables, improving system speed.
+
+ To learn more about the database options available in WeBWorK 2.1,
+ including the sql_single layout, consult the [15]Database
+ configuration section of [16]InstallationManualV2pt1 and the
+ [17]DatabaseLayoutManual.
+
+ Before creating courses using the sql_single layout (or converting
+ existing courses), you must [18]create a single database and grant
+ access to it.
+
+ We suggest that you convert all courses using the sql database layout
+ to use sql_single instead and add indexing to converted courses.
+ Instructions are available in the [19]CourseAdministrationManual.
Help
- If you need help installing or using WeBWorK 2.1.3, visit the
- [11]WeBWorK discussion group and post your question there. The
- developers monitor this forum.
+ If you need help installing or using WeBWorK 2.1, consult
+ [20]WeBWorKDocs and [21]WeBWorKFAQs.
+
+ You can also visit the [22]WeBWorK discussion group and post your
+ question there. The developers monitor this forum.
Bug Reports & Feature Requests
Submit bug reports and feature requests at
- [12]http://bugs.webwork.rochester.edu/. We can't fix bugs and add
+ [23]http://bugs.webwork.rochester.edu/. We can't fix bugs and add
features if you don't tell us about them!
Patches
@@ -70,7 +84,27 @@
CVS code, you save us and yourself time. A bug in this release may be
fixed in CVS, and we can more easily handle patches against the latest
code. Check out the latest development version from CVS and patch
- against that. Consult the [13]WeBWorKCVS topic for more information.
+ against that. Consult the [24]WeBWorKCVS topic for more information.
+
+ -- [25]SamHathaway - 28 Oct 2004
+
+References
- -- MichaelGage - 10 Jun 2005
-
\ No newline at end of file
+ 8. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKTeam
+ 9. http://devel.webwork.rochester.edu/doc/cvs/webwork2_rel-2-1/doc/parser/
+ 10. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGLanguageRelease2pt1
+ 11. http://sourceforge.net/project/showfiles.php?group_id=93112
+ 12. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1
+ 13. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1
+ 14. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Upgrading_an_existing_WeBWorK_in
+ 15. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Database_configuration
+ 16. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1
+ 17. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/DatabaseLayoutManual
+ 18. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt1#Configration_for_the_sql_single_
+ 19. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/CourseAdministrationManual
+ 20. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKDocs
+ 21. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKFAQs
+ 22. http://webhost.math.rochester.edu/webworkdocs/discuss/
+ 23. http://bugs.webwork.rochester.edu/
+ 24. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVS
+ 25. http://devel.webwork.rochester.edu/twiki/bin/view/Main/SamHathaway
Index: LICENSE
===================================================================
RCS file: /webwork/cvs/system/webwork2/LICENSE,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -LLICENSE -LLICENSE -u -r1.5.2.4 -r1.5.2.5
--- LICENSE
+++ LICENSE
@@ -1,9 +1,9 @@
WeBWorK
Online Homework Delivery System
- Version 2.1.3
+ Version 2.1
- Copyright 2000-2005, The WeBWorK Project
+ Copyright 2000-2004, The WeBWorK Project
All rights reserved.
This program is free software; you can redistribute it and/or modify
Index: webwork_xmlrpc_client.pl
===================================================================
RCS file: /webwork/cvs/system/webwork2/clients/webwork_xmlrpc_client.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lclients/webwork_xmlrpc_client.pl -Lclients/webwork_xmlrpc_client.pl -u -r1.1.2.2 -r1.1.2.3
--- clients/webwork_xmlrpc_client.pl
+++ clients/webwork_xmlrpc_client.pl
@@ -274,4 +274,4 @@
webworkDocsURL => 'http://webwork.math.rochester.edu/webwork_gage_system_html',
};
$envir;
-};
\ No newline at end of file
+};
Index: ur.css
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/css/ur.css,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lhtdocs/css/ur.css -Lhtdocs/css/ur.css -u -r1.1.2.3 -r1.1.2.4
--- htdocs/css/ur.css
+++ htdocs/css/ur.css
@@ -1,5 +1,5 @@
/* hack to get around MSIE peekaboo bug */
-/* * {zoom: 1;} */
+* {zoom: 1;}
/********************/
/* template classes */
Index: jsMath-fallback-mac.js
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/jsMath/jsMath-fallback-mac.js,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -Lhtdocs/jsMath/jsMath-fallback-mac.js -Lhtdocs/jsMath/jsMath-fallback-mac.js -u -r1.2.4.1 -r1.2.4.2
--- htdocs/jsMath/jsMath-fallback-mac.js
+++ htdocs/jsMath/jsMath-fallback-mac.js
@@ -1053,4 +1053,4 @@
jsMath.absoluteHeightVaries = 1;
-jsMath.defaultH = 0.8;
+jsMath.defaultH = 0.8;
\ No newline at end of file
Index: Utils.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Utils.pm,v
retrieving revision 1.59.2.2
retrieving revision 1.59.2.3
diff -Llib/WeBWorK/Utils.pm -Llib/WeBWorK/Utils.pm -u -r1.59.2.2 -r1.59.2.3
--- lib/WeBWorK/Utils.pm
+++ lib/WeBWorK/Utils.pm
@@ -648,16 +648,12 @@
$result .= defined $ref ? $ref : '<font color="red">undef</font>';
}
}
-our $BASE64_ENCODED = 'base64_encoded:';
-# use constant BASE64_ENCODED = 'base64_encoded;
-# was not evaluated in the matching and substitution
-# statements
+use constant BASE64_ENCODED => 'base64_encoded:';
sub decodeAnswers($) {
my $string = shift;
return unless defined $string and $string;
-
- if ($string =~/^$BASE64_ENCODED/o) {
- $string =~ s/^$BASE64_ENCODED//o;
+ if ($string =~/^BASE64_ENCODED/) {
+ $string =~ s/^BASE64_ENCODED//;
$string = decode_base64($string);
}
@@ -688,7 +684,7 @@
}
$string =~ s/##$//; # remove last pair of hashs
- $string = $BASE64_ENCODED.encode_base64($string);
+ $string = BASE64_ENCODED.encode_base64($string);
return $string;
}
Index: ProblemSets.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm,v
retrieving revision 1.56.2.2
retrieving revision 1.56.2.3
diff -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -u -r1.56.2.2 -r1.56.2.3
--- lib/WeBWorK/ContentGenerator/ProblemSets.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSets.pm
@@ -61,7 +61,11 @@
} else {
print CGI::p(CGI::b("Course Info"));
}
-
+ unless (-e $course_info_path) { # FIXME
+ `echo "" >$course_info_path`; # we seem to need to have this file
+ # around to prevent
+ # spurious errors when editing it.
+ }
if (-f $course_info_path) { #check that it's a plain file
my $text = eval { readFile($course_info_path) };
if ($@) {
Index: UserList.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm,v
retrieving revision 1.60.2.3
retrieving revision 1.60.2.4
diff -Llib/WeBWorK/ContentGenerator/Instructor/UserList.pm -Llib/WeBWorK/ContentGenerator/Instructor/UserList.pm -u -r1.60.2.3 -r1.60.2.4
--- lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -343,7 +343,6 @@
if $self->{passwordMode} and not $authz->hasPermissions($user, "modify_student_data");
-
$self->{primarySortField} = $r->param("primarySortField") || "last_name";
$self->{secondarySortField} = $r->param("secondarySortField") || "first_name";
$self->{ternarySortField} = $r->param("ternarySortField") || "student_id";
@@ -392,7 +391,6 @@
my @prevVisibleUserIDs = @{ $self->{prevVisibleUserIDs} };
my @selectedUserIDs = @{ $self->{selectedUserIDs} };
my $editMode = $self->{editMode};
-
my $passwordMode = $self->{passwordMode};
my $primarySortField = $self->{primarySortField};
my $secondarySortField = $self->{secondarySortField};
@@ -434,7 +432,6 @@
byUserID
}
@Users;
-
my @PermissionLevels;
@@ -481,13 +478,11 @@
print CGI::hidden(-name=>"editMode", -value=>$editMode);
-
print CGI::hidden(-name=>"passwordMode", -value=>$passwordMode);
print CGI::hidden(-name=>"primarySortField", -value=>$primarySortField);
print CGI::hidden(-name=>"secondarySortField", -value=>$secondarySortField);
print CGI::hidden(-name=>"ternarySortField", -value=>$ternarySortField);
-
print "\n<!-- state data here -->\n";
@@ -695,7 +690,6 @@
return $result;
}
-
sub sort_form {
my ($self, $onChange, %actionParams) = @_;
return join ("",
@@ -791,7 +785,6 @@
return "Users sorted by $names{$primary}, then by $names{$secondary}, then by $names{$ternary}.";
}
-
sub edit_form {
my ($self, $onChange, %actionParams) = @_;
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 02:10:08
|
Log Message:
-----------
from rel-2-2-dev: (make templates validate)
Modified Files:
--------------
webwork2/conf/templates/math:
gateway.template
system.template
webwork2/htdocs/css:
math.css
Revision Data
-------------
Index: gateway.template
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/conf/templates/math/gateway.templa=
te,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lconf/templates/math/gateway.template -Lconf/templates/math/gateway=
.template -u -r1.5 -r1.6
--- conf/templates/math/gateway.template
+++ conf/templates/math/gateway.template
@@ -1,27 +1,30 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- WeBWorK Online Homework Delivery System
- -- Copyright =C2=A9 2000-2006 The WeBWorK Project, http://openwebwork.=
sf.net/
- -- $CVSHeader$
- --=20
- -- This program is free software; you can redistribute it and/or modif=
y it under
- -- the terms of either: (a) the GNU General Public License as publishe=
d by the
- -- Free Software Foundation; either version 2, or (at your option) any=
later
- -- version, or (b) the "Artistic License" which comes with this packag=
e.
- --=20
- -- This program 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 either the GNU General Public Licens=
e or the
- -- Artistic License for more details.
- -->
+<!--
+########################################################################=
########
+# WeBWorK Online Homework Delivery System
+# Copyright =C2=A9 2000-2003 The WeBWorK Project, http://openwebwork.sf.=
net/
+# $CVSHeader$
+#=20
+# This program is free software; you can redistribute it and/or modify i=
t under
+# the terms of either: (a) the GNU General Public License as published b=
y the
+# Free Software Foundation; either version 2, or (at your option) any la=
ter
+# version, or (b) the "Artistic License" which comes with this package.
+#=20
+# This program is distributed in the hope that it will be useful, but WI=
THOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or =
FITNESS
+# FOR A PARTICULAR PURPOSE. See either the GNU General Public License o=
r the
+# Artistic License for more details.
+########################################################################=
########
+-->
<html xmlns=3D"http://www.w3.org/1999/xhtml" xml:lang=3D"en" lang=3D"en"=
>
<head>
<meta http-equiv=3D"content-type" content=3D"text/html; charset=3Dutf-8"=
/>
<meta http-equiv=3D"Pragma" content=3D"no-cache"/>
<meta http-equiv=3D"expires" content=3D"Wed, 21 Dec 2005 00:00:01 GMT"/>
-<link rel=3D"stylesheet" type=3D"text/css" media=3D"All" href=3D"<!--#ur=
l type=3D"webwork" name=3D"htdocs"-->/css/math.css"/>
+<link rel=3D"stylesheet" type=3D"text/css" href=3D"<!--#url type=3D"webw=
ork" name=3D"htdocs"-->/css/math.css"/>
<!-- [gateway] since the left-side menus are gone, don't indent the main=
content area -->
-<link rel=3D"stylesheet" type=3D"text/css" media=3D"All" href=3D"<!--#ur=
l type=3D"webwork" name=3D"htdocs"-->/css/gateway.css"/>
+<link rel=3D"stylesheet" type=3D"text/css" href=3D"<!--#url type=3D"webw=
ork" name=3D"htdocs"-->/css/gateway.css"/>
<title><!--#path style=3D"text" text=3D" : " textonly=3D"1"--></title>
<!--#head-->
<script language=3D"javascript" type=3D"text/javascript">
Index: system.template
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/conf/templates/math/system.templat=
e,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lconf/templates/math/system.template -Lconf/templates/math/system.t=
emplate -u -r1.3 -r1.4
--- conf/templates/math/system.template
+++ conf/templates/math/system.template
@@ -1,23 +1,26 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- WeBWorK Online Homework Delivery System
- -- Copyright =C2=A9 2000-2006 The WeBWorK Project, http://openwebwork.=
sf.net/
- -- $CVSHeader$
- --=20
- -- This program is free software; you can redistribute it and/or modif=
y it under
- -- the terms of either: (a) the GNU General Public License as publishe=
d by the
- -- Free Software Foundation; either version 2, or (at your option) any=
later
- -- version, or (b) the "Artistic License" which comes with this packag=
e.
- --=20
- -- This program 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 either the GNU General Public Licens=
e or the
- -- Artistic License for more details.
- -->
+<!--
+########################################################################=
########
+# WeBWorK Online Homework Delivery System
+# Copyright =C2=A9 2000-2003 The WeBWorK Project, http://openwebwork.sf.=
net/
+# $CVSHeader$
+#=20
+# This program is free software; you can redistribute it and/or modify i=
t under
+# the terms of either: (a) the GNU General Public License as published b=
y the
+# Free Software Foundation; either version 2, or (at your option) any la=
ter
+# version, or (b) the "Artistic License" which comes with this package.
+#=20
+# This program is distributed in the hope that it will be useful, but WI=
THOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or =
FITNESS
+# FOR A PARTICULAR PURPOSE. See either the GNU General Public License o=
r the
+# Artistic License for more details.
+########################################################################=
########
+-->
<html xmlns=3D"http://www.w3.org/1999/xhtml" xml:lang=3D"en" lang=3D"en"=
>
<head>
<meta http-equiv=3D"content-type" content=3D"text/html; charset=3Dutf-8"=
/>
-<link rel=3D"stylesheet" type=3D"text/css" media=3D"All" href=3D"<!--#ur=
l type=3D"webwork" name=3D"htdocs"-->/css/math.css"/>
+<link rel=3D"stylesheet" type=3D"text/css" href=3D"<!--#url type=3D"webw=
ork" name=3D"htdocs"-->/css/math.css"/>
<title><!--#path style=3D"text" text=3D" : " textonly=3D"1"--></title>
<!--#head-->
</head>
Index: math.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/htdocs/css/math.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lhtdocs/css/math.css -Lhtdocs/css/math.css -u -r1.5 -r1.6
--- htdocs/css/math.css
+++ htdocs/css/math.css
@@ -25,9 +25,10 @@
}
=20
h1, h2, h3, h4, h5, h6 {
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
- background: transparent;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+ /* FIXME "You have no background-color with your color" */
color: #225;
+ background: transparent;
}
h1 { font-size: 170%; }
h2 { font-size: 140%; padding-bottom: 0; margin-bottom: .5ex }
@@ -84,9 +85,10 @@
* <a class=3D"more" href=3D"bar">Older announcements...</a>
* </div>
*/
-=20
+
.info-box {
border: 1px solid #559;
+ /* FIXME: these aren't valid CSS, but they sure look nice :-P */
border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
margin-bottom: 1ex;=20
@@ -97,6 +99,7 @@
.info-box h4,
.info-box h5,
.info-box h6 {
+ /* FIXME: these aren't valid CSS, but they sure look nice :-P */
border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
border-bottom: 1px solid #559;
@@ -152,7 +155,7 @@
=20
#mini-sitemap,
#fisheye {
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
padding: 0 0 1ex 0;
}
#mini-sitemap a,
@@ -219,7 +222,7 @@
* element should be placed at the very top of the <body> of our HTML do=
cument.
*/
#masthead {
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
font-size: 100%;
margin: 0;
padding: 0;
@@ -232,6 +235,7 @@
background-position: top left;
}
#masthead a {
+ /* FIXME "You have no background-color with your color" */
color: #fff;
background: transparent;
}
@@ -301,7 +305,7 @@
color: #fff;
text-align: left;=20
font-size: 100%;
- font-family: Trebuchet MS, Arial, sans-serif;
+ font-family: "Trebuchet MS", "Arial", sans-serif;
}
#breadcrumbs a {
font-size: 100%;
@@ -342,9 +346,9 @@
* screen.
*/
#content {
- margin: .5em 1em 0 10.4em;
- padding: 0 0 0 0;=20
- font-family: Times, serif;
+ margin: .5em 0 0 10.4em;
+ padding: 0 0 0 0;
+ font-family: "Times", serif;
/* border-left: 1px dotted #bbf; */
}
#content h1 { margin: .4ex 0; } /* for crappy MSIE */
@@ -356,12 +360,12 @@
/* border-top: 1px solid #559; */
margin: 0 .5em .2ex 10.4em;
padding: 0;
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
}
#copyright { font-size: 75%; margin: 0;}
#last-modified {
clear: both;
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
font-size: 75%;
background-color: inherit;
color: #444;
@@ -398,9 +402,9 @@
/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: =
0; }*/
=20
/* background styles for success and failure messages */
-div.ResultsWithoutError { color: #096; } /* green */
-div.ResultsWithError { color: #C33; } /* red */
-div.ResultsAlert { color: #F60; } /* orange */
+div.ResultsWithoutError { color: #096; background-color: inherit; } /* g=
reen */
+div.ResultsWithError { color: #C33; background-color: inherit; } /* red =
*/
+div.ResultsAlert { color: #F60; background-color: inherit; } /* orange *=
/
=20
/* styles used by WeBWorK::HTML::ScrollingRecordList */
div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thi=
n solid gray; }
@@ -428,6 +432,7 @@
text-align: center;=20
/*width: 15ex;*/ /* this was erroniously commented out with "#" */
padding: 2px 5px 2px 5px;
+ color: inherit;
background-color: #DDDDDD;
}
/* override above settings in tables used to display ans_array results *=
/
@@ -444,17 +449,18 @@
width: auto;
}
.attemptResultsSummary { font-style: italic; }
-.parsehilight { background-color: yellow; }
+.parsehilight { color: inherit; background-color: yellow; }
=20
/* the problem TEXT itself does in this box */
div.problem { clear: both; background-color: #E0E0E0; color: black; }
=20
/* jsMath emits this class when appropriate math fonts aren't available =
*/
div.NoFontMessage {
- padding: 10;
+ padding: 10px;
border-style: solid;
- border-width:3;
+ border-width: 3px;
border-color: #DD0000;
+ color: inherit;
background-color: #FFF8F8;
width: 75%;
text-align: left;
@@ -462,13 +468,13 @@
}
=20
/* text colors for published and unpublished sets */
-font.Published { font-style: normal; font-weight: normal; color: #0000=
00; } /* black */
-font.Unpublished { font-style: italic; font-weight: normal; color: #aaaa=
aa; } /* light grey */
+font.Published { font-style: normal; font-weight: normal; color: #0000=
00; background-color: inherit; } /* black */
+font.Unpublished { font-style: italic; font-weight: normal; color: #aaaa=
aa; background-color: inherit; } /* light grey */
=20
/* styles used when editing a temporary file */
-.temporaryFile { color: #F60; font-style: italic; }
+.temporaryFile { font-style: italic; color: #F60; background-color: inhe=
rit; }
=20
/* text colors for Auditing, Current, and Dropped students */
-.Audit { font-style: normal; color: purple; }
-.Enrolled { font-weight: normal; color: black; }
-.Drop { font-style: italic; color: grey; }
+.Audit { font-style: normal; color: purple; background-color: inherit; }
+.Enrolled { font-weight: normal; color: black; background-color: inherit=
; }
+.Drop { font-style: italic; color: gray; background-color: inherit; }
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-24 02:06:17
|
Log Message:
-----------
make templates validate
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2/conf/templates/math:
gateway.template
system.template
webwork2/htdocs/css:
math.css
Revision Data
-------------
Index: gateway.template
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/conf/templates/math/gateway.templa=
te,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -Lconf/templates/math/gateway.template -Lconf/templates/math/gateway=
.template -u -r1.3.2.2 -r1.3.2.3
--- conf/templates/math/gateway.template
+++ conf/templates/math/gateway.template
@@ -1,27 +1,30 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- WeBWorK Online Homework Delivery System
- -- Copyright =C2=A9 2000-2006 The WeBWorK Project, http://openwebwork.=
sf.net/
- -- $CVSHeader$
- --=20
- -- This program is free software; you can redistribute it and/or modif=
y it under
- -- the terms of either: (a) the GNU General Public License as publishe=
d by the
- -- Free Software Foundation; either version 2, or (at your option) any=
later
- -- version, or (b) the "Artistic License" which comes with this packag=
e.
- --=20
- -- This program 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 either the GNU General Public Licens=
e or the
- -- Artistic License for more details.
- -->
+<!--
+########################################################################=
########
+# WeBWorK Online Homework Delivery System
+# Copyright =C2=A9 2000-2003 The WeBWorK Project, http://openwebwork.sf.=
net/
+# $CVSHeader$
+#=20
+# This program is free software; you can redistribute it and/or modify i=
t under
+# the terms of either: (a) the GNU General Public License as published b=
y the
+# Free Software Foundation; either version 2, or (at your option) any la=
ter
+# version, or (b) the "Artistic License" which comes with this package.
+#=20
+# This program is distributed in the hope that it will be useful, but WI=
THOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or =
FITNESS
+# FOR A PARTICULAR PURPOSE. See either the GNU General Public License o=
r the
+# Artistic License for more details.
+########################################################################=
########
+-->
<html xmlns=3D"http://www.w3.org/1999/xhtml" xml:lang=3D"en" lang=3D"en"=
>
<head>
<meta http-equiv=3D"content-type" content=3D"text/html; charset=3Dutf-8"=
/>
<meta http-equiv=3D"Pragma" content=3D"no-cache"/>
<meta http-equiv=3D"expires" content=3D"Wed, 21 Dec 2005 00:00:01 GMT"/>
-<link rel=3D"stylesheet" type=3D"text/css" media=3D"All" href=3D"<!--#ur=
l type=3D"webwork" name=3D"htdocs"-->/css/math.css"/>
+<link rel=3D"stylesheet" type=3D"text/css" href=3D"<!--#url type=3D"webw=
ork" name=3D"htdocs"-->/css/math.css"/>
<!-- [gateway] since the left-side menus are gone, don't indent the main=
content area -->
-<link rel=3D"stylesheet" type=3D"text/css" media=3D"All" href=3D"<!--#ur=
l type=3D"webwork" name=3D"htdocs"-->/css/gateway.css"/>
+<link rel=3D"stylesheet" type=3D"text/css" href=3D"<!--#url type=3D"webw=
ork" name=3D"htdocs"-->/css/gateway.css"/>
<title><!--#path style=3D"text" text=3D" : " textonly=3D"1"--></title>
<!--#head-->
<script language=3D"javascript" type=3D"text/javascript">
Index: system.template
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/conf/templates/math/system.templat=
e,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lconf/templates/math/system.template -Lconf/templates/math/system.t=
emplate -u -r1.1.2.2 -r1.1.2.3
--- conf/templates/math/system.template
+++ conf/templates/math/system.template
@@ -1,23 +1,26 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- WeBWorK Online Homework Delivery System
- -- Copyright =C2=A9 2000-2006 The WeBWorK Project, http://openwebwork.=
sf.net/
- -- $CVSHeader$
- --=20
- -- This program is free software; you can redistribute it and/or modif=
y it under
- -- the terms of either: (a) the GNU General Public License as publishe=
d by the
- -- Free Software Foundation; either version 2, or (at your option) any=
later
- -- version, or (b) the "Artistic License" which comes with this packag=
e.
- --=20
- -- This program 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 either the GNU General Public Licens=
e or the
- -- Artistic License for more details.
- -->
+<!--
+########################################################################=
########
+# WeBWorK Online Homework Delivery System
+# Copyright =C2=A9 2000-2003 The WeBWorK Project, http://openwebwork.sf.=
net/
+# $CVSHeader$
+#=20
+# This program is free software; you can redistribute it and/or modify i=
t under
+# the terms of either: (a) the GNU General Public License as published b=
y the
+# Free Software Foundation; either version 2, or (at your option) any la=
ter
+# version, or (b) the "Artistic License" which comes with this package.
+#=20
+# This program is distributed in the hope that it will be useful, but WI=
THOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or =
FITNESS
+# FOR A PARTICULAR PURPOSE. See either the GNU General Public License o=
r the
+# Artistic License for more details.
+########################################################################=
########
+-->
<html xmlns=3D"http://www.w3.org/1999/xhtml" xml:lang=3D"en" lang=3D"en"=
>
<head>
<meta http-equiv=3D"content-type" content=3D"text/html; charset=3Dutf-8"=
/>
-<link rel=3D"stylesheet" type=3D"text/css" media=3D"All" href=3D"<!--#ur=
l type=3D"webwork" name=3D"htdocs"-->/css/math.css"/>
+<link rel=3D"stylesheet" type=3D"text/css" href=3D"<!--#url type=3D"webw=
ork" name=3D"htdocs"-->/css/math.css"/>
<title><!--#path style=3D"text" text=3D" : " textonly=3D"1"--></title>
<!--#head-->
</head>
Index: math.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/htdocs/css/math.css,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lhtdocs/css/math.css -Lhtdocs/css/math.css -u -r1.1.2.4 -r1.1.2.5
--- htdocs/css/math.css
+++ htdocs/css/math.css
@@ -25,9 +25,10 @@
}
=20
h1, h2, h3, h4, h5, h6 {
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
- background: transparent;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+ /* FIXME "You have no background-color with your color" */
color: #225;
+ background: transparent;
}
h1 { font-size: 170%; }
h2 { font-size: 140%; padding-bottom: 0; margin-bottom: .5ex }
@@ -84,9 +85,10 @@
* <a class=3D"more" href=3D"bar">Older announcements...</a>
* </div>
*/
-=20
+
.info-box {
border: 1px solid #559;
+ /* FIXME: these aren't valid CSS, but they sure look nice :-P */
border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
margin-bottom: 1ex;=20
@@ -97,6 +99,7 @@
.info-box h4,
.info-box h5,
.info-box h6 {
+ /* FIXME: these aren't valid CSS, but they sure look nice :-P */
border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
border-bottom: 1px solid #559;
@@ -152,7 +155,7 @@
=20
#mini-sitemap,
#fisheye {
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
padding: 0 0 1ex 0;
}
#mini-sitemap a,
@@ -219,7 +222,7 @@
* element should be placed at the very top of the <body> of our HTML do=
cument.
*/
#masthead {
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
font-size: 100%;
margin: 0;
padding: 0;
@@ -232,6 +235,7 @@
background-position: top left;
}
#masthead a {
+ /* FIXME "You have no background-color with your color" */
color: #fff;
background: transparent;
}
@@ -301,7 +305,7 @@
color: #fff;
text-align: left;=20
font-size: 100%;
- font-family: Trebuchet MS, Arial, sans-serif;
+ font-family: "Trebuchet MS", "Arial", sans-serif;
}
#breadcrumbs a {
font-size: 100%;
@@ -342,9 +346,9 @@
* screen.
*/
#content {
- margin: .5em 1em 0 10.4em;
- padding: 0 0 0 0;=20
- font-family: Times, serif;
+ margin: .5em 0 0 10.4em;
+ padding: 0 0 0 0;
+ font-family: "Times", serif;
/* border-left: 1px dotted #bbf; */
}
#content h1 { margin: .4ex 0; } /* for crappy MSIE */
@@ -356,12 +360,12 @@
/* border-top: 1px solid #559; */
margin: 0 .5em .2ex 10.4em;
padding: 0;
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
}
#copyright { font-size: 75%; margin: 0;}
#last-modified {
clear: both;
- font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+ font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
font-size: 75%;
background-color: inherit;
color: #444;
@@ -398,9 +402,9 @@
/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: =
0; }*/
=20
/* background styles for success and failure messages */
-div.ResultsWithoutError { color: #096; } /* green */
-div.ResultsWithError { color: #C33; } /* red */
-div.ResultsAlert { color: #F60; } /* orange */
+div.ResultsWithoutError { color: #096; background-color: inherit; } /* g=
reen */
+div.ResultsWithError { color: #C33; background-color: inherit; } /* red =
*/
+div.ResultsAlert { color: #F60; background-color: inherit; } /* orange *=
/
=20
/* styles used by WeBWorK::HTML::ScrollingRecordList */
div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thi=
n solid gray; }
@@ -428,6 +432,7 @@
text-align: center;=20
/*width: 15ex;*/ /* this was erroniously commented out with "#" */
padding: 2px 5px 2px 5px;
+ color: inherit;
background-color: #DDDDDD;
}
/* override above settings in tables used to display ans_array results *=
/
@@ -444,17 +449,18 @@
width: auto;
}
.attemptResultsSummary { font-style: italic; }
-.parsehilight { background-color: yellow; }
+.parsehilight { color: inherit; background-color: yellow; }
=20
/* the problem TEXT itself does in this box */
div.problem { clear: both; background-color: #E0E0E0; color: black; }
=20
/* jsMath emits this class when appropriate math fonts aren't available =
*/
div.NoFontMessage {
- padding: 10;
+ padding: 10px;
border-style: solid;
- border-width:3;
+ border-width: 3px;
border-color: #DD0000;
+ color: inherit;
background-color: #FFF8F8;
width: 75%;
text-align: left;
@@ -462,13 +468,13 @@
}
=20
/* text colors for published and unpublished sets */
-font.Published { font-style: normal; font-weight: normal; color: #0000=
00; } /* black */
-font.Unpublished { font-style: italic; font-weight: normal; color: #aaaa=
aa; } /* light grey */
+font.Published { font-style: normal; font-weight: normal; color: #0000=
00; background-color: inherit; } /* black */
+font.Unpublished { font-style: italic; font-weight: normal; color: #aaaa=
aa; background-color: inherit; } /* light grey */
=20
/* styles used when editing a temporary file */
-.temporaryFile { color: #F60; font-style: italic; }
+.temporaryFile { font-style: italic; color: #F60; background-color: inhe=
rit; }
=20
/* text colors for Auditing, Current, and Dropped students */
-.Audit { font-style: normal; color: purple; }
-.Enrolled { font-weight: normal; color: black; }
-.Drop { font-style: italic; color: grey; }
+.Audit { font-style: normal; color: purple; background-color: inherit; }
+.Enrolled { font-weight: normal; color: black; background-color: inherit=
; }
+.Drop { font-style: italic; color: gray; background-color: inherit; }
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-23 21:25:42
|
Log Message:
-----------
forward port: (fix width issues with info box.
restrict width of info box to exactly 40% of the page width. we can't
use "max-width" because MSIE doesn't support it.
set "overflow:auto" to enable scroll bars when the content can't be
wrapped to 40%. this is a little nicer than the contents running over
the border of the box, but MSIE makes bad choices about how to size the
box so as to avoid unnecessary scroll bars. (it sizes the element first
and then adds scroll bars, so it adding a horizontal scroll makes the
content area smaller than the content, necessitating a vertical scroll
bar as well. pretty annoying.)
Tested this in WinIE, Firefox, and Safari.)
Modified Files:
--------------
webwork2/htdocs/css:
math.css
Revision Data
-------------
Index: math.css
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/css/math.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lhtdocs/css/math.css -Lhtdocs/css/math.css -u -r1.4 -r1.5
--- htdocs/css/math.css
+++ htdocs/css/math.css
@@ -380,7 +380,7 @@
/* the info escape emits a DIV with this id. (not that the same DIV has class
* "info-box" which is given above in the "template styles" section. Regardless,
* it is emitted by WW code! */
-#InfoPanel { font-size: smaller; float: right; max-width: 40%; }
+#InfoPanel { font-size: smaller; float: right; width: 40%; overflow: auto; }
/* tables used for laying out form fields shouldn't have a border */
table.FormLayout { border: 0; }
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-23 21:25:04
|
Log Message:
-----------
fix width issues with info box.
restrict width of info box to exactly 40% of the page width. we can't
use "max-width" because MSIE doesn't support it.
set "overflow:auto" to enable scroll bars when the content can't be
wrapped to 40%. this is a little nicer than the contents running over
the border of the box, but MSIE makes bad choices about how to size the
box so as to avoid unnecessary scroll bars. (it sizes the element first
and then adds scroll bars, so it adding a horizontal scroll makes the
content area smaller than the content, necessitating a vertical scroll
bar as well. pretty annoying.)
Tested this in WinIE, Firefox, and Safari.
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2/htdocs/css:
math.css
Revision Data
-------------
Index: math.css
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/css/math.css,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lhtdocs/css/math.css -Lhtdocs/css/math.css -u -r1.1.2.3 -r1.1.2.4
--- htdocs/css/math.css
+++ htdocs/css/math.css
@@ -380,7 +380,7 @@
/* the info escape emits a DIV with this id. (not that the same DIV has class
* "info-box" which is given above in the "template styles" section. Regardless,
* it is emitted by WW code! */
-#InfoPanel { font-size: smaller; float: right; max-width: 40%; }
+#InfoPanel { font-size: smaller; float: right; width: 40%; overflow: auto; }
/* tables used for laying out form fields shouldn't have a border */
table.FormLayout { border: 0; }
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 03:55:06
|
Log Message:
-----------
updated for 2.2-pre2.
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2:
LICENSE
README
Revision Data
-------------
Index: README
===================================================================
RCS file: /webwork/cvs/system/webwork2/README,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -LREADME -LREADME -u -r1.12.2.1 -r1.12.2.2
--- README
+++ README
@@ -1,14 +1,19 @@
WeBWorK
Online Homework Delivery System
- Version 2.2-pre1
+ Version 2.2-pre2
Copyright 2000-2006, The WeBWorK Project
All rights reserved.
Introduction
- This is a test prerelease of the upcoming WeBWorK 2.2. It contains
- numerous improvements over WeBWorK 2.1.3. Some changes are as follows:
+ This is a test prerelease of the upcoming WeBWorK 2.2. It is believed
+ to be stable. However, there may be quirks and cosmetic problems at
+ this point. Please report any problem you have installing, upgrading
+ to, or using this version of WeBWorK.
+
+ WeBWorK 2.2 contains numerous improvements over WeBWorK 2.1.3. Some
+ changes are as follows:
Removal of deprecated database layouts: The gdbm and sql database
layouts have been removed. If you have existing courses that use
@@ -22,7 +27,7 @@
complete a version, and whether a proctor is required to
authenticate before a version is completed.
- jsMath 3.0: See
+ jsMath 3.1: See
[2]http://www.math.union.edu/~dpvc/jsMath/changes.html for details.
Status system: The status system maps status names (like
@@ -64,60 +69,79 @@
And of course, many UI improvements and bug fixes.
+ In addition, the following has changed since the release of WeBWorK
+ 2.2-pre1:
+
+ * Fix for a security issue in which a privileged user could execute
+ arbitrary commands in the security context of the web server.
+ * Improvements to math.template.
+ * Fix for the behavior of the floating "info" box: display is more
+ robust, box is not shown if there is no info to report.
+ * Improvements to the PG problem editor's handling of temporary
+ files and browser windows.
+ * Help file for the PG problem editor.
+ * jsMath 3.1
+ * Fix for an error message triggered by selecting "the following
+ files" in the Classlist Editor import options. (See bug_small.gif
+ [3]Bug #944.)
+ * Fix for a warning message triggered by missing permission levels
+ when importing users from a classlist file. (See bug_small.gif
+ [4]Bug #942.)
+ * Converted error messages to warning messages when renaming a
+ course and a directory cannot be moved. Added pre-checks to avoid
+ this situation in the first place. (See bug_small.gif [5]Bug
+ #943.)
+
Availability
- WeBWorK 2.2-pre1 is available from our CVS repository. Read
- [3]WeBWorKCVSReadOnly for more information on how to set up a CVS
+ WeBWorK 2.2-pre2 is available from our CVS repository. Read
+ [6]WeBWorKCVSReadOnly for more information on how to set up a CVS
connection. For those who already have a CVS connection, this update
- can be obtained by updating to the tag rel-2-2-pre1.
+ can be obtained by updating to the tag rel-2-2-pre2.
- WeBWorK 2.2-pre1 is also available as a tarball from our SourceForge
+ WeBWorK 2.2-pre2 is also available as a tarball from our SourceForge
project page:
- [4]http://sourceforge.net/project/showfiles.php?group_id=93112
+ [7]http://sourceforge.net/project/showfiles.php?group_id=93112
- You must also install [5]PGLanguageRelease2pt2pre1 at the same time
- you install WeBWorK 2.2-pre1.
+ You must also have [8]PGLanguageRelease2pt2pre1 installed. The
+ [9]installation manual covers installing PG.
Installation
Installation instructions are available from
- [6]InstallationManualV2pt2.
+ [10]InstallationManualV2pt2.
+
+ If you are upgrading from WeBWorK 2.1.x, please read the section
+ [11]Upgrading WeBWorK, paying special attention to the subsections
+ [12]Before you upgrade and [13]Making changes for the new release.
- If you are upgrading, please read the section [7]Upgrading WeBWorK,
- paying special attention to the subsections [8]Before you upgrade and
- [9]Making changes for the new release.
+ No changes are necessary when upgrading from 2.2-pre1.
Help
If you need help installing or using WeBWorK 2.2, visit the
- [10]WeBWorK discussion group and post your question there. The
+ [14]WeBWorK discussion group and post your question there. The
developers monitor this forum.
Bug Reports & Feature Requests
- Submit bug reports and feature requests at
- [11]http://bugs.webwork.rochester.edu/. We can't fix bugs and add
- features if you don't tell us about them!
-
-Patches
-
- While we welcome patches of any sort, by patching against the latest
- CVS code, you save us and yourself time. A bug in this release may be
- fixed in CVS, and we can more easily handle patches against the latest
- code. Check out the latest development version from CVS and patch
- against that. Consult the [12]WeBWorKCVS topic for more information.
+ Please submit bug reports and feature requests at
+ [15]http://bugs.webwork.rochester.edu/.
References
1. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2#Before_you_upgrade
2. http://www.math.union.edu/~dpvc/jsMath/changes.html
- 3. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVSReadOnly
- 4. http://sourceforge.net/project/showfiles.php?group_id=93112
- 5. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGLanguageRelease2pt2pre1
- 6. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2
- 7. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2#Upgrading_WeBWorK
- 8. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2#Before_you_upgrade
- 9. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2#Making_changes_for_the_new_relea
- 10. http://webhost.math.rochester.edu/webworkdocs/discuss/
- 11. http://bugs.webwork.rochester.edu/
- 12. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVS
+ 3. http://bugs.webwork.rochester.edu/show_bug.cgi?id=944
+ 4. http://bugs.webwork.rochester.edu/show_bug.cgi?id=942
+ 5. http://bugs.webwork.rochester.edu/show_bug.cgi?id=943
+ 6. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVSReadOnly
+ 7. http://sourceforge.net/project/showfiles.php?group_id=93112
+ 8. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGLanguageRelease2pt2pre1
+ 9. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2
+ 10. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2
+ 11. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2#Upgrading_WeBWorK
+ 12. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2#Before_you_upgrade
+ 13. http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/InstallationManualV2pt2#Making_changes_for_the_new_relea
+ 14. http://webhost.math.rochester.edu/webworkdocs/discuss/
+ 15. http://bugs.webwork.rochester.edu/
Index: LICENSE
===================================================================
RCS file: /webwork/cvs/system/webwork2/LICENSE,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -LLICENSE -LLICENSE -u -r1.5.4.1 -r1.5.4.2
--- LICENSE
+++ LICENSE
@@ -1,6 +1,6 @@
WeBWorK
Online Homework Delivery System
- Version 2.2-pre1
+ Version 2.2-pre2
Copyright 2000-2006, The WeBWorK Project
All rights reserved.
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 03:12:16
|
Log Message:
-----------
forward-port: (use darker foreground colors instead of bright background
color for message classes for now.)
Modified Files:
--------------
webwork2/htdocs/css:
math.css
Revision Data
-------------
Index: math.css
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/css/math.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lhtdocs/css/math.css -Lhtdocs/css/math.css -u -r1.3 -r1.4
--- htdocs/css/math.css
+++ htdocs/css/math.css
@@ -398,9 +398,9 @@
/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }*/
/* background styles for success and failure messages */
-div.ResultsWithoutError { background-color: #66ff99 } /* light green */
-div.ResultsWithError { background-color: #ffcccc } /* light red */
-div.ResultsAlert { background-color: yellow } /* yellow */
+div.ResultsWithoutError { color: #096; } /* green */
+div.ResultsWithError { color: #C33; } /* red */
+div.ResultsAlert { color: #F60; } /* orange */
/* styles used by WeBWorK::HTML::ScrollingRecordList */
div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thin solid gray; }
@@ -466,7 +466,7 @@
font.Unpublished { font-style: italic; font-weight: normal; color: #aaaaaa; } /* light grey */
/* styles used when editing a temporary file */
-.temporaryFile { background-color: #ff9900 ; font-style: italic; }
+.temporaryFile { color: #F60; font-style: italic; }
/* text colors for Auditing, Current, and Dropped students */
.Audit { font-style: normal; color: purple; }
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 03:12:06
|
Log Message:
-----------
use darker foreground colors instead of bright background color for
message classes for now.
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2/htdocs/css:
math.css
Revision Data
-------------
Index: math.css
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/css/math.css,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lhtdocs/css/math.css -Lhtdocs/css/math.css -u -r1.1.2.2 -r1.1.2.3
--- htdocs/css/math.css
+++ htdocs/css/math.css
@@ -398,9 +398,9 @@
/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }*/
/* background styles for success and failure messages */
-div.ResultsWithoutError { background-color: #66ff99 } /* light green */
-div.ResultsWithError { background-color: #ffcccc } /* light red */
-div.ResultsAlert { background-color: yellow } /* yellow */
+div.ResultsWithoutError { color: #096; } /* green */
+div.ResultsWithError { color: #C33; } /* red */
+div.ResultsAlert { color: #F60; } /* orange */
/* styles used by WeBWorK::HTML::ScrollingRecordList */
div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thin solid gray; }
@@ -466,7 +466,7 @@
font.Unpublished { font-style: italic; font-weight: normal; color: #aaaaaa; } /* light grey */
/* styles used when editing a temporary file */
-.temporaryFile { background-color: #ff9900 ; font-style: italic; }
+.temporaryFile { color: #F60; font-style: italic; }
/* text colors for Auditing, Current, and Dropped students */
.Audit { font-style: normal; color: purple; }
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 02:59:23
|
Log Message:
-----------
forward-port: (update info() for new stylesheet.)
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
ProblemSet.pm
ProblemSets.pm
Revision Data
-------------
Index: ProblemSets.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -u -r1.69 -r1.70
--- lib/WeBWorK/ContentGenerator/ProblemSets.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSets.pm
@@ -48,6 +48,7 @@
if (defined $course_info and $course_info) {
my $course_info_path = $ce->{courseDirs}->{templates} . "/$course_info";
+ print CGI::start_div({class=>"info-box", id=>"InfoPanel"});
print CGI::h2("Course Info");
# deal with instructor crap
@@ -77,6 +78,8 @@
print CGI::div(CGI::a({href=>$editorURL, target=>"WW_Editor"}, "[edit]"));
}
+ print CGI::end_div();
+
return "";
}
}
Index: ProblemSet.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v
retrieving revision 1.74
retrieving revision 1.75
diff -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -u -r1.74 -r1.75
--- lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -243,7 +243,8 @@
},
);
- print CGI::p(CGI::b("Set Info"));
+ print CGI::start_div({class=>"info-box", id=>"InfoPanel"});
+ print CGI::h2("Set Info");
my $editorURL;
if (defined($set) and $authz->hasPermissions($userID, "modify_problem_sets")) {
@@ -262,6 +263,8 @@
print CGI::div(CGI::a({href=>$editorURL, target=>"WW_Editor"}, "[edit]"));
}
+ print CGI::end_div();
+
return "";
}
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 02:59:13
|
Log Message:
-----------
update info() for new stylesheet.
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
ProblemSet.pm
ProblemSets.pm
Revision Data
-------------
Index: ProblemSets.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm,v
retrieving revision 1.65.2.4
retrieving revision 1.65.2.5
diff -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -u -r1.65.2.4 -r1.65.2.5
--- lib/WeBWorK/ContentGenerator/ProblemSets.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSets.pm
@@ -48,6 +48,7 @@
if (defined $course_info and $course_info) {
my $course_info_path = $ce->{courseDirs}->{templates} . "/$course_info";
+ print CGI::start_div({class=>"info-box", id=>"InfoPanel"});
print CGI::h2("Course Info");
# deal with instructor crap
@@ -77,6 +78,8 @@
print CGI::div(CGI::a({href=>$editorURL, target=>"WW_Editor"}, "[edit]"));
}
+ print CGI::end_div();
+
return "";
}
}
Index: ProblemSet.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v
retrieving revision 1.70.2.5
retrieving revision 1.70.2.6
diff -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -u -r1.70.2.5 -r1.70.2.6
--- lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -243,7 +243,8 @@
},
);
- print CGI::p(CGI::b("Set Info"));
+ print CGI::start_div({class=>"info-box", id=>"InfoPanel"});
+ print CGI::h2("Set Info");
my $editorURL;
if (defined($set) and $authz->hasPermissions($userID, "modify_problem_sets")) {
@@ -262,6 +263,8 @@
print CGI::div(CGI::a({href=>$editorURL, target=>"WW_Editor"}, "[edit]"));
}
+ print CGI::end_div();
+
return "";
}
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 02:57:48
|
Log Message:
-----------
forward-port: (use info() from Login.pm)
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
LoginProctor.pm
Revision Data
-------------
Index: LoginProctor.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -Llib/WeBWorK/ContentGenerator/LoginProctor.pm -Llib/WeBWorK/ContentGenerator/LoginProctor.pm -u -r1.3 -r1.4
--- lib/WeBWorK/ContentGenerator/LoginProctor.pm
+++ lib/WeBWorK/ContentGenerator/LoginProctor.pm
@@ -40,35 +40,61 @@
return !$arg;
}
-# FIXME This needs to be updated for LoginProctor
sub info {
my ($self) = @_;
my $r = $self->r;
my $ce = $r->ce;
- my $login_info = $ce->{courseFiles}->{login_info};
+ my $result;
+ # This section should be kept in sync with the Home.pm version
+ my $site_info = $ce->{webworkFiles}->{site_info};
+ if (defined $site_info and $site_info) {
+ # deal with previewing a temporary file
+ if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
+ and defined $r->param("editFileSuffix")) {
+ $site_info .= $r->param("editFileSuffix");
+ }
+
+ if (-f $site_info) {
+ my $text = eval { readFile($site_info) };
+ if ($@) {
+ $result .= CGI::h2("Site Information");
+ $result .= CGI::div({class=>"ResultsWithError"}, $@);
+ } elsif ($text =~ /\S/) {
+ $result .= CGI::h2("Site Information");
+ $result .= $text;
+ }
+ }
+ }
+
+ # FIXME this is basically the same code as above... TIME TO REFACTOR!
+ my $login_info = $ce->{courseFiles}->{login_info};
if (defined $login_info and $login_info) {
- my $login_info_path = $ce->{courseDirs}->{templates} . "/$login_info";
+ # login info is relative to the templates directory, apparently
+ $login_info = $ce->{courseDirs}->{templates} . "/$login_info";
# deal with previewing a temporary file
if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
and defined $r->param("editFileSuffix")) {
- $login_info_path .= $r->param("editFileSuffix");
+ $login_info .= $r->param("editFileSuffix");
}
- if (-f $login_info_path) {
- my $text = eval { readFile($login_info_path) };
+ if (-f $login_info) {
+ my $text = eval { readFile($login_info) };
if ($@) {
- print CGI::div({class=>"ResultsWithError"},
- CGI::p("$@"),
- );
- } else {
- print CGI::h2("Login Info");
- print $text;
+ $result .= CGI::h2("Login Info");
+ $result .= CGI::div({class=>"ResultsWithError"}, $@);
+ } elsif ($text =~ /\S/) {
+ $result .= CGI::h2("Login Info");
+ $result .= $text;
}
}
-
+ }
+
+ if (defined $result and $result ne "") {
+ return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
+ } else {
return "";
}
}
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 02:57:25
|
Log Message:
-----------
use info() from Login.pm
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
LoginProctor.pm
Revision Data
-------------
Index: LoginProctor.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -Llib/WeBWorK/ContentGenerator/LoginProctor.pm -Llib/WeBWorK/ContentGenerator/LoginProctor.pm -u -r1.2.2.1 -r1.2.2.2
--- lib/WeBWorK/ContentGenerator/LoginProctor.pm
+++ lib/WeBWorK/ContentGenerator/LoginProctor.pm
@@ -40,35 +40,61 @@
return !$arg;
}
-# FIXME This needs to be updated for LoginProctor
sub info {
my ($self) = @_;
my $r = $self->r;
my $ce = $r->ce;
- my $login_info = $ce->{courseFiles}->{login_info};
+ my $result;
+ # This section should be kept in sync with the Home.pm version
+ my $site_info = $ce->{webworkFiles}->{site_info};
+ if (defined $site_info and $site_info) {
+ # deal with previewing a temporary file
+ if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
+ and defined $r->param("editFileSuffix")) {
+ $site_info .= $r->param("editFileSuffix");
+ }
+
+ if (-f $site_info) {
+ my $text = eval { readFile($site_info) };
+ if ($@) {
+ $result .= CGI::h2("Site Information");
+ $result .= CGI::div({class=>"ResultsWithError"}, $@);
+ } elsif ($text =~ /\S/) {
+ $result .= CGI::h2("Site Information");
+ $result .= $text;
+ }
+ }
+ }
+
+ # FIXME this is basically the same code as above... TIME TO REFACTOR!
+ my $login_info = $ce->{courseFiles}->{login_info};
if (defined $login_info and $login_info) {
- my $login_info_path = $ce->{courseDirs}->{templates} . "/$login_info";
+ # login info is relative to the templates directory, apparently
+ $login_info = $ce->{courseDirs}->{templates} . "/$login_info";
# deal with previewing a temporary file
if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
and defined $r->param("editFileSuffix")) {
- $login_info_path .= $r->param("editFileSuffix");
+ $login_info .= $r->param("editFileSuffix");
}
- if (-f $login_info_path) {
- my $text = eval { readFile($login_info_path) };
+ if (-f $login_info) {
+ my $text = eval { readFile($login_info) };
if ($@) {
- print CGI::div({class=>"ResultsWithError"},
- CGI::p("$@"),
- );
- } else {
- print CGI::h2("Login Info");
- print $text;
+ $result .= CGI::h2("Login Info");
+ $result .= CGI::div({class=>"ResultsWithError"}, $@);
+ } elsif ($text =~ /\S/) {
+ $result .= CGI::h2("Login Info");
+ $result .= $text;
}
}
-
+ }
+
+ if (defined $result and $result ne "") {
+ return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
+ } else {
return "";
}
}
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 02:56:36
|
Log Message:
-----------
forward-port: (Don't output DIV tag in info() unless there's something
to display.)
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
Login.pm
Revision Data
-------------
Index: Login.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Login.pm,v
retrieving revision 1.36
retrieving revision 1.37
diff -Llib/WeBWorK/ContentGenerator/Login.pm -Llib/WeBWorK/ContentGenerator/Login.pm -u -r1.36 -r1.37
--- lib/WeBWorK/ContentGenerator/Login.pm
+++ lib/WeBWorK/ContentGenerator/Login.pm
@@ -87,7 +87,11 @@
}
}
- return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
+ if (defined $result and $result ne "") {
+ return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
+ } else {
+ return "";
+ }
}
sub body {
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 02:56:18
|
Log Message:
-----------
Don't output DIV tag in info() unless there's something to display.
Tags:
----
rel-2-2-dev
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
Login.pm
Revision Data
-------------
Index: Login.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Login.pm,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -Llib/WeBWorK/ContentGenerator/Login.pm -Llib/WeBWorK/ContentGenerator/Login.pm -u -r1.35.2.1 -r1.35.2.2
--- lib/WeBWorK/ContentGenerator/Login.pm
+++ lib/WeBWorK/ContentGenerator/Login.pm
@@ -87,7 +87,11 @@
}
}
- return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
+ if (defined $result and $result ne "") {
+ return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
+ } else {
+ return "";
+ }
}
sub body {
|
|
From: Sam H. v. a. <we...@ma...> - 2006-01-22 02:46:05
|
Log Message:
-----------
forward-port (Don't output DIV tag in info() unless there's something to
display.)
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
Home.pm
Revision Data
-------------
Index: Home.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Home.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -Llib/WeBWorK/ContentGenerator/Home.pm -Llib/WeBWorK/ContentGenerator/Home.pm -u -r1.14 -r1.15
--- lib/WeBWorK/ContentGenerator/Home.pm
+++ lib/WeBWorK/ContentGenerator/Home.pm
@@ -46,18 +46,21 @@
}
if (-f $site_info) {
- $result .= CGI::h2("Site Information");
-
my $text = eval { readFile($site_info) };
if ($@) {
- $result .= CGI::div({class=>"ResultsWithError"}, $@);
+ $result = CGI::div({class=>"ResultsWithError"}, $@);
} elsif ($text =~ /\S/) {
- $result .= $text;
+ $result = $text;
}
}
}
- return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
+ if (defined $result and $result ne "") {
+ return CGI::div({class=>"info-box", id=>"InfoPanel"},
+ CGI::h2("Site Information"), $result);
+ } else {
+ return "";
+ }
}
sub body {
|
2 messages has been excluded from this view by a project administrator.
