Log Message:
-----------
forward port of changes to rel-2-4-5
Modified Files:
--------------
webwork2/conf:
global.conf.dist
webwork.apache-config.dist
webwork2/conf/templates/union:
system.template
webwork2/conf/templates/ur:
system.template
Revision Data
-------------
Index: webwork.apache-config.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/webwork.apache-config.dist,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lconf/webwork.apache-config.dist -Lconf/webwork.apache-config.dist -u -r1.23 -r1.24
--- conf/webwork.apache-config.dist
+++ conf/webwork.apache-config.dist
@@ -109,7 +109,8 @@
$ENV{WEBWORK_ROOT} = $webwork_dir;
-#$PerlConfig .= <<EOF;
+$PerlConfig .= <<EOF;
+
# ##### Sam's WeBWorK::Request-based XML-RPC testbed #####
# #
# #PerlModule WeBWorK::RPC
@@ -182,7 +183,8 @@
# Order Allow,Deny
# Allow from All
# </Location>
-#EOF
+
+EOF
</Perl>
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.206
retrieving revision 1.207
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.206 -r1.207
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -42,7 +42,7 @@
# URL and path to courses directory.
$webwork_courses_url = "/webwork2_course_files";
-#$webwork_courses_dir = "/opt/webwork/courses";
+$webwork_courses_dir = "/opt/webwork/courses"; #(a typical place to put the course directory
################################################################################
# Paths to external programs
@@ -242,7 +242,11 @@
$webworkURLs{bugReporter} = "http://bugs.webwork.rochester.edu/";
# Location of CSS
-$webworkURLs{stylesheet} = "$webworkURLs{htdocs}/css/${defaultTheme}.css";
+# $webworkURLs{stylesheet} = "$webworkURLs{htdocs}/css/${defaultTheme}.css";
+# this is never used -- changing the theme from the config panel
+# doesn't appear to reset the theme in time?
+# It's better to refer directly to the .css file in the system.template
+# <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math.css"/>
# Location of jsMath script, used for the jsMath display mode.
$webworkURLs{jsMath} = "$webworkURLs{htdocs}/jsMath/jsMath-ww.js";
@@ -909,7 +913,8 @@
[qw(Parser Value)],
[qw(Parser::Legacy)],
# [qw(SaveFile)],
-# [qw(Applet FlashApplet)],
+ [qw(Chromatic)],
+ [qw(Applet FlashApplet)],
];
##### Answer evaluatior defaults
Index: system.template
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/templates/union/system.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconf/templates/union/system.template -Lconf/templates/union/system.template -u -r1.1 -r1.2
--- conf/templates/union/system.template
+++ conf/templates/union/system.template
@@ -24,7 +24,7 @@
<head>
<title><!--#path style="text" text=" : " textonly="1"--></title>
<!--#head-->
-<style type="text/css" media="all">@import "<!--#url type="webwork" name="stylesheet"-->";</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/union.css"/>
</head>
<body>
<table width="100%" cellpadding="10" cellspacing="0" border="0">
Index: system.template
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/templates/ur/system.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lconf/templates/ur/system.template -Lconf/templates/ur/system.template -u -r1.4 -r1.5
--- conf/templates/ur/system.template
+++ conf/templates/ur/system.template
@@ -25,7 +25,7 @@
<head>
<title><!--#path style="text" text=" : " textonly="1"--></title>
<!--#head-->
-<style type="text/css" media="all">@import "<!--#url type="webwork" name="stylesheet"-->";</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/ur.css"/>
</head>
<body>
<table width="100%" cellpadding="10" cellspacing="0" border="0">
|
