Menu
▾
▴
[WWcvs] webwork2: Changed the way the stylesheet is referred to from system.template Link directly to the location for the corresponding
|
From: Mike G. v. a. <we...@ma...> - 2008-06-25 03:53:24
|
Log Message:
-----------
Changed the way the stylesheet is referred to from system.template
Link directly to the location for the corresponding .css file
Commented out the webworkURLs->{stylesheet}= ... $defaultTheme.css value in global.conf
since the theme can be overridden in simple.conf by the Config page but by then
it's too late to change the stylesheet page.
Tags:
----
rel-2-4-patches
Modified Files:
--------------
webwork2/conf:
global.conf.dist
webwork2/conf/templates/union:
system.template
webwork2/conf/templates/ur:
system.template
Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.189.2.7.2.2
retrieving revision 1.189.2.7.2.3
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.189.2.7.2.2 -r1.189.2.7.2.3
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -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";
Index: system.template
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/templates/union/system.template,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lconf/templates/union/system.template -Lconf/templates/union/system.template -u -r1.1.2.1 -r1.1.2.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.3.4.1
retrieving revision 1.3.4.1.2.1
diff -Lconf/templates/ur/system.template -Lconf/templates/ur/system.template -u -r1.3.4.1 -r1.3.4.1.2.1
--- 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">
|
