Menu
▾
▴
[WWcvs] webwork2: forward ports from rel-2-4-5
|
From: Mike G. v. a. <we...@ma...> - 2008-06-26 15:14:11
|
Log Message:
-----------
forward ports from rel-2-4-5
Modified Files:
--------------
webwork2/conf/snippets:
blankProblem2.pg
webwork2/conf/templates/math:
system.template
webwork2/htdocs/css:
math.css
Revision Data
-------------
Index: blankProblem2.pg
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/snippets/blankProblem2.pg,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lconf/snippets/blankProblem2.pg -Lconf/snippets/blankProblem2.pg -u -r1.2 -r1.3
--- conf/snippets/blankProblem2.pg
+++ conf/snippets/blankProblem2.pg
@@ -56,8 +56,7 @@
\{$pi->ans_rule\}
END_TEXT
-
-
+Context()->normalStrings;
##############################################################
#
Index: system.template
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/templates/math/system.template,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lconf/templates/math/system.template -Lconf/templates/math/system.template -u -r1.9 -r1.10
--- conf/templates/math/system.template
+++ conf/templates/math/system.template
@@ -1,5 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
<!--
################################################################################
# WeBWorK Online Homework Delivery System
Index: math.css
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/css/math.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lhtdocs/css/math.css -Lhtdocs/css/math.css -u -r1.12 -r1.13
--- htdocs/css/math.css
+++ htdocs/css/math.css
@@ -153,6 +153,9 @@
margin-right: .5em;
}
+.Message {
+background-color:#ddd;
+}
/* --- Fisheye view (id) ---------------------------------------------------- */
/* The "fisheye" view: a hierarchical view of the website to show the
@@ -237,7 +240,7 @@
padding: 0;
color: #fff;
border: 1px solid #000;
- background-color: #000038;
+ background-color: #038;
/* [ww] we could have some sort of spider web image here. */
/*background-image: url("/images/mandel-wide.jpg");*/
background-repeat: repeat-x;
@@ -281,6 +284,9 @@
margin: 1ex .5em .1ex .1em;
font-size: smaller;
}
+#masthead #loginstatus #Nav {
+ padding: 1ex;
+}
/* "big-wrapper" contains everything other than the masthead. It's merely
* a relatively positioned div that allows us to use absolute positioning
@@ -390,9 +396,9 @@
* (These are mostly copied from ur.css right atm.)
*/
-/* the info escape emits a DIV with this id. (not that the same DIV has class
+/* the info escape emits a DIV with this id. (note that the same DIV has class
* "info-box" which is given above in the "template styles" section. Regardless,
- * it is emitted by WW code! */
+ * it is emitted by WW code in ProblemSet.pl (not in system.template) ! */
#InfoPanel {
font-size: smaller;
float: right;
@@ -418,6 +424,7 @@
/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }*/
/* background styles for success and failure messages */
+div.WarningMessage { background-color: #ffcccc; padding: 3px 3px 3px 3px; }
div.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
div.ResultsWithError { color: #C33; background-color: inherit; } /* red */
div.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
|
