Menu
▾
▴
[WWcvs] webwork2: Adding missing pages.
|
From: Mike G. v. a. <we...@ma...> - 2008-06-24 15:39:11
|
Log Message:
-----------
Adding missing pages.
Tags:
----
rel-2-4-patches
Modified Files:
--------------
webwork2/conf:
global.conf.dist
webwork2/conf/snippets:
blankProblem2.pg
webwork2/conf/templates/math:
system.template
webwork2/htdocs/css:
math.css
webwork2/htdocs/helpFiles:
instructor_links.html
webwork2/htdocs/jsMath:
jsMath-ww.js
webwork2/lib/WeBWorK/DB:
Record.pm
Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.189.2.7
retrieving revision 1.189.2.7.2.1
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.189.2.7 -r1.189.2.7.2.1
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -895,6 +895,8 @@
[qw(VectorField)],
[qw(Parser Value)],
[qw(Parser::Legacy)],
+# [qw(SaveFile)],
+ [qw(Applet FlashApplet)],
];
##### Answer evaluatior defaults
Index: blankProblem2.pg
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/snippets/blankProblem2.pg,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -Lconf/snippets/blankProblem2.pg -Lconf/snippets/blankProblem2.pg -u -r1.1.2.1 -r1.1.2.1.2.1
--- conf/snippets/blankProblem2.pg
+++ conf/snippets/blankProblem2.pg
@@ -46,6 +46,7 @@
END_TEXT
+Context()->normalStrings;
##############################################################
#
Index: system.template
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/templates/math/system.template,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.1.2.1
diff -Lconf/templates/math/system.template -Lconf/templates/math/system.template -u -r1.6.2.1 -r1.6.2.1.2.1
--- conf/templates/math/system.template
+++ conf/templates/math/system.template
@@ -24,7 +24,7 @@
<title><!--#path style="text" text=" : " textonly="1"--></title>
<!--#head-->
</head>
-<body bgcolor="white">
+<body bgcolor="white" onload="if (typeof(initializeAction) == 'function') {initializeAction()}">
<div id="masthead">
<div id="loginstatus">
@@ -39,40 +39,47 @@
<div id="breadcrumbs">
<!--#path style="text" text=" → "-->
</div>
- <div id="content">
-
- <!--#if can="info"-->
- <!--<div id="page-info">-->
- <!--<div class="info-box" id="fisheye">-->
+ <div id="content" >
+
+ <!--#if can="title"-->
+ <span style="font-size:larger; color:#00F; float:left; width:60%; "><!--#title--></span>
+ <!--#endif-->
+ <!--#if can="message"-->
+ <span class="Message" style=" float:right; width:40%; right:0;">
+ <!--#message-->
+ </span>
+ <!--#endif-->
+
+ <hr style="clear:both"/>
+ <!--#if can="info"-->
+ <!-- styles could be different for different pages so they are not set here -->
<!--#info-->
- <!--</div>-->
- <!--</div>-->
- <!--#endif-->
-
+ <!--#endif-->
+
<!--#if can="nav"-->
<div class="Nav">
<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator=" "-->
</div>
<!--#endif-->
- <!--#if can="title"-->
- <h1><!--#title--></h1>
- <!--#endif-->
-
- <!--#if can="message"-->
- <div class="Message">
- <!--#message-->
- </div>
- <!--#endif-->
-
- <!--#if can="body"-->
- <div class="Body">
- <!--#body-->
- </div>
- <!--#endif-->
+ <!--#if can="body"-->
+ <!--#if warnings="1"-->
+ <div class="Body" style="background-color:#ffcccc">
+ <p style="font-size:larger">
+ Warning -- there may be something wrong with this question. Please inform your instructor
+ including the warning messages below.
+ </p>
+ <!--#else-->
+ <div class="Body" style="background-color:#ffffff">
+ <!--#endif-->
+
+ <!--#body-->
+ </div>
+ <!--#endif-->
<!--#if warnings="1"-->
- <hr>
+
+ <hr/>
<div class="Warnings">
<!--#warnings-->
</div>
@@ -84,7 +91,7 @@
</div>
<!--#endif-->
- </div> <!-- content -->
+
<hr class="for-broken-browsers"/>
<div id="footer">
<p id="last-modified">Page generated at <!--#timestamp--></p>
@@ -109,6 +116,8 @@
</div>
<!--#endif-->
</div>
+
+</div><!--content-->
</div> <!-- big-wrapper -->
</body>
Index: math.css
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/css/math.css,v
retrieving revision 1.9.4.3
retrieving revision 1.9.4.3.2.1
diff -Lhtdocs/css/math.css -Lhtdocs/css/math.css -u -r1.9.4.3 -r1.9.4.3.2.1
--- 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 */
Index: instructor_links.html
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/helpFiles/instructor_links.html,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.2.2.1
diff -Lhtdocs/helpFiles/instructor_links.html -Lhtdocs/helpFiles/instructor_links.html -u -r1.5.4.2 -r1.5.4.2.2.1
--- htdocs/helpFiles/instructor_links.html
+++ htdocs/helpFiles/instructor_links.html
@@ -27,10 +27,8 @@
<h3>Instructor Links Help Page</h3>
-<hr/>
-<b>For help with an item on a specific page</b><br/>
-click the <a href="instructor_links.html"><img src="/webwork2_files/images/question_mark.png"></a> icon.
-
+Click the icon <a href="instructor_links.html"><img src="/webwork2_files/images/question_mark.png"></a> for
+page and item specific help.
<hr/>
<dl>
Index: jsMath-ww.js
===================================================================
RCS file: /webwork/cvs/system/webwork2/htdocs/jsMath/jsMath-ww.js,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.1.2.1
diff -Lhtdocs/jsMath/jsMath-ww.js -Lhtdocs/jsMath/jsMath-ww.js -u -r1.6.2.1 -r1.6.2.1.2.1
--- htdocs/jsMath/jsMath-ww.js
+++ htdocs/jsMath/jsMath-ww.js
@@ -10,7 +10,7 @@
var jsMath = {
styles: {
- '.math': 'font-family: serif; font-style: normal; color: grey33; font-size: 75%'
+ '.math': 'font-family: serif; font-style: normal; color: grey; font-size: 75%'
},
Controls: {cookie: {scale: 133}},
Parser: {prototype: {macros: {
Index: Record.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/DB/Record.pm,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.1.2.1
diff -Llib/WeBWorK/DB/Record.pm -Llib/WeBWorK/DB/Record.pm -u -r1.12.4.1 -r1.12.4.1.2.1
--- lib/WeBWorK/DB/Record.pm
+++ lib/WeBWorK/DB/Record.pm
@@ -1,5 +1,3 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
# $CVSHeader$
#
@@ -164,4 +162,14 @@
}
}
+sub _initial_records {
+ my $invocant = shift;
+ my $class = ref $invocant || $invocant;
+ my @initializers = @_;
+
+ no strict 'refs';
+ *{$class."::INITIAL_RECORDS"} = sub { return @initializers };
+}
+
1;
+
|
