From ecca686b73ad7f59bebdffad92fa468a1c91ad49 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 09:37:22 +0300
Subject: [PATCH] Cassius -> Lucius

---
 yesod/Scaffolding/Scaffolder.hs                             | 6 +++---
 yesod/scaffold/Foundation.hs.cg                             | 4 ++--
 yesod/scaffold/cassius/default-layout.cassius.cg            | 3 ---
 yesod/scaffold/lucius/default-layout.lucius.cg              | 4 ++++
 .../homepage.cassius.cg => lucius/homepage.lucius.cg}       | 6 ++++--
 yesod/scaffold/tiny/Foundation.hs.cg                        | 4 ++--
 yesod/yesod.cabal                                           | 4 ++--
 7 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 yesod/scaffold/cassius/default-layout.cassius.cg
 create mode 100644 yesod/scaffold/lucius/default-layout.lucius.cg
 rename yesod/scaffold/{cassius/homepage.cassius.cg => lucius/homepage.lucius.cg} (64%)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index ddede346..bb3dadc2 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -143,8 +143,8 @@ scaffold = do
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
     writeFile' "Settings.hs" $ ifTiny $(codegen "tiny/Settings.hs") $(codegen "Settings.hs")
     writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs")
-    writeFile' "cassius/default-layout.cassius"
-        $(codegen "cassius/default-layout.cassius")
+    writeFile' "lucius/default-layout.lucius"
+        $(codegen "lucius/default-layout.lucius")
     writeFile' "hamlet/default-layout.hamlet"
         $(codegen "hamlet/default-layout.hamlet")
     writeFile' "hamlet/boilerplate-layout.hamlet"
@@ -153,7 +153,7 @@ scaffold = do
         $(codegen "lucius/normalize.lucius")
     writeFile' "hamlet/homepage.hamlet" $(codegen "hamlet/homepage.hamlet")
     writeFile' "config/routes" $ ifTiny $(codegen "tiny/config/routes") $(codegen "config/routes")
-    writeFile' "cassius/homepage.cassius" $(codegen "cassius/homepage.cassius")
+    writeFile' "lucius/homepage.lucius" $(codegen "lucius/homepage.lucius")
     writeFile' "julius/homepage.julius" $(codegen "julius/homepage.julius")
     unless isTiny $ writeFile' "config/models" $(codegen "config/models")
   
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 42d81293..11c82fa5 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -84,8 +84,8 @@ instance Yesod ~sitearg~ where
         mmsg <- getMessage
         pc <- widgetToPageContent $ do
             widget
-            addLucius $(luciusFile "normalize")
-            addCassius $(cassiusFile "default-layout")
+            toWidget $(luciusFile "normalize")
+            toWidget $(luciusFile "default-layout")
         hamletToRepHtml $(hamletFile "default-layout")
 
     -- This is done to provide an optimization for serving static files from
diff --git a/yesod/scaffold/cassius/default-layout.cassius.cg b/yesod/scaffold/cassius/default-layout.cassius.cg
deleted file mode 100644
index 77177469..00000000
--- a/yesod/scaffold/cassius/default-layout.cassius.cg
+++ /dev/null
@@ -1,3 +0,0 @@
-body
-    font-family: sans-serif
-
diff --git a/yesod/scaffold/lucius/default-layout.lucius.cg b/yesod/scaffold/lucius/default-layout.lucius.cg
new file mode 100644
index 00000000..799dec4f
--- /dev/null
+++ b/yesod/scaffold/lucius/default-layout.lucius.cg
@@ -0,0 +1,4 @@
+body {
+    font-family: sans-serif;
+}
+
diff --git a/yesod/scaffold/cassius/homepage.cassius.cg b/yesod/scaffold/lucius/homepage.lucius.cg
similarity index 64%
rename from yesod/scaffold/cassius/homepage.cassius.cg
rename to yesod/scaffold/lucius/homepage.lucius.cg
index 2ac20924..e8cf5292 100644
--- a/yesod/scaffold/cassius/homepage.cassius.cg
+++ b/yesod/scaffold/lucius/homepage.lucius.cg
@@ -1,5 +1,7 @@
-h1
+h1 {
     text-align: center
-h2##{h2id}
+}
+h2##{h2id} {
     color: #990
+}
 
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 38152df9..d80e957e 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -68,8 +68,8 @@ instance Yesod ~sitearg~ where
         mmsg <- getMessage
         pc <- widgetToPageContent $ do
             widget
-            addLucius $(luciusFile "normalize")
-            addCassius $(cassiusFile "default-layout")
+            toWidget $(luciusFile "normalize")
+            toWidget $(luciusFile "default-layout")
         hamletToRepHtml $(hamletFile "default-layout")
 
     -- This is done to provide an optimization for serving static files from
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 08543eab..4e43b436 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -17,8 +17,8 @@ homepage:        http://www.yesodweb.com/
 
 extra-source-files:
   input/*.cg
-  scaffold/cassius/default-layout.cassius.cg
-  scaffold/cassius/homepage.cassius.cg
+  scaffold/lucius/default-layout.lucius.cg
+  scaffold/lucius/homepage.lucius.cg
   scaffold/Model.hs.cg
   scaffold/Foundation.hs.cg
   scaffold/LICENSE.cg