From: Jason Woofenden <jason@jasonwoof.com>
Date: Mon, 9 Jun 2014 05:22:46 +0000 (-0400)
Subject: auto css-bumping!
X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl-cms.git;a=commitdiff_plain;h=3a7b73338492c387b55cbbe7c451a6e41624119c

auto css-bumping!
---

diff --git a/.htaccess b/.htaccess
index 763f1ab..e8dd622 100644
--- a/.htaccess
+++ b/.htaccess
@@ -8,8 +8,6 @@ DirectoryIndex disabled
 AddDefaultCharset UTF-8
 RewriteEngine  on
 RewriteRule    ^[^/.]*$  /run.php [L]
-RewriteRule    ^style_[0-9]*.css$  /style.css [L]
-RewriteRule    ^style_[0-9]*.less$  /style.less [L]
 
 <FilesMatch "\.(css|jpg|png)$">
 	ExpiresActive On
diff --git a/admin_pages.html b/admin_pages.html
index 214cfce..dba6950 100644
--- a/admin_pages.html
+++ b/admin_pages.html
@@ -8,7 +8,7 @@
 	<script type="text/javascript">
 		function make_wysiwyg(name) {
 			CKEDITOR.replace(name, {
-				'contentsCss': 'style_01.css',
+				'contentsCss': 'style.css?m=~style.css mtime~',
 				'allowedContent': true,
 				'stylesSet': [
 					{ name: 'Paragraph', element: 'p'},
diff --git a/code/wfpl b/code/wfpl
index 571c58f..d678dac 160000
--- a/code/wfpl
+++ b/code/wfpl
@@ -1 +1 @@
-Subproject commit 571c58fff7b139f590b5c4862761092bc1045436
+Subproject commit d678dac1ba23e7618e5497b24e046f1f7fa74e5a
diff --git a/template.html b/template.html
index e48e96d..8021810 100644
--- a/template.html
+++ b/template.html
@@ -8,7 +8,7 @@
 		~$running_locally {~<script src="/javascript/html5.js"></script>~}~
 		~$running_locally unset {~<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>~}~
 	<![endif]-->
-	<link rel="stylesheet~$running_locally {~/less~}~" href="style_01.~$running_locally {~less~}~~$running_locally unset {~css~}~" /><!--~$running_locally {~--><script>less = {env:'development'};</script><script src="/javascript/less/less.min.js"></script><!--~}~-->
+	<link rel="stylesheet~$running_locally {~/less~}~" href="style.~$running_locally {~less?m=~style.less mtime~~}~~$running_locally unset {~css?m=~style.css mtime~~}~" /><!--~$running_locally {~--><script>less = {env:'development'};</script><script src="/javascript/less/less.min.js"></script><!--~}~-->
 	<!--~$head~-->
 </head>