From 515338784b8fc2fb5435ee4e061c092ff754d6cf Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@softwarefreedom.org>
Date: Thu, 24 Oct 2013 15:34:15 -0400
Subject: Use newer persistent and newer Yesod

---
 Settings/StaticFiles.hs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'Settings')

diff --git a/Settings/StaticFiles.hs b/Settings/StaticFiles.hs
index 2510795..cb37905 100644
--- a/Settings/StaticFiles.hs
+++ b/Settings/StaticFiles.hs
@@ -5,6 +5,8 @@ import Yesod.Static
 import qualified Yesod.Static as Static
 import Settings (staticDir)
 import Settings.Development
+import Language.Haskell.TH (Q, Exp, Name)
+import Data.Default (def)
 
 -- | use this to create your static file serving site
 staticSite :: IO Static.Static
@@ -16,3 +18,18 @@ staticSite = if development then Static.staticDevel staticDir
 --   Warning: any files added to your static directory during run-time can't be
 --   accessed this way. You'll have to use their FilePath or URL to access them.
 $(staticFiles Settings.staticDir)
+
+combineSettings :: CombineSettings
+combineSettings = def
+
+-- The following two functions can be used to combine multiple CSS or JS files
+-- at compile time to decrease the number of http requests.
+-- Sample usage (inside a Widget):
+--
+-- > $(combineStylesheets 'StaticR [style1_css, style2_css])
+
+combineStylesheets :: Name -> [Route Static] -> Q Exp
+combineStylesheets = combineStylesheets' development combineSettings
+
+combineScripts :: Name -> [Route Static] -> Q Exp
+combineScripts = combineScripts' development combineSettings
-- 
cgit v1.2.3