diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs index 8c1aa07f..a6d94f1d 100644 --- a/yesod/Scaffolding/Scaffolder.hs +++ b/yesod/Scaffolding/Scaffolder.hs @@ -126,6 +126,7 @@ scaffold = do mkDir "templates" mkDir "static" mkDir "static/css" + mkDir "static/img" mkDir "static/js" mkDir "config" mkDir "Model" @@ -156,8 +157,18 @@ scaffold = do writeFile' "Settings.hs" $(codegen "Settings.hs") writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs") writeFile' "Settings/Development.hs" $(codegen "Settings/Development.hs") + writeFile' "static/css/bootstrap.css" $(codegen "static/css/bootstrap.css") + S.writeFile (dir ++ "/static/img/glyphicons-halflings.png") + $(runIO (S.readFile "scaffold/static/img/glyphicons-halflings.png") >>= \bs -> do + pack <- [|S.pack|] + return $ pack `AppE` LitE (StringL $ S.unpack bs)) + S.writeFile (dir ++ "/static/img/glyphicons-halflings-white.png") + $(runIO (S.readFile "scaffold/static/img/glyphicons-halflings-white.png") >>= \bs -> do + pack <- [|S.pack|] + return $ pack `AppE` LitE (StringL $ S.unpack bs)) + writeFile' "templates/default-layout.hamlet" $(codegen "templates/default-layout.hamlet") writeFile' "templates/default-layout-wrapper.hamlet" diff --git a/yesod/scaffold/static/img/glyphicons-halflings-white.png b/yesod/scaffold/static/img/glyphicons-halflings-white.png new file mode 100644 index 00000000..3bf6484a Binary files /dev/null and b/yesod/scaffold/static/img/glyphicons-halflings-white.png differ diff --git a/yesod/scaffold/static/img/glyphicons-halflings.png b/yesod/scaffold/static/img/glyphicons-halflings.png new file mode 100644 index 00000000..79bc568c Binary files /dev/null and b/yesod/scaffold/static/img/glyphicons-halflings.png differ diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 36437628..ae787ef9 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -38,6 +38,8 @@ extra-source-files: scaffold/deploy/Procfile.cg scaffold/templates/homepage.hamlet.cg scaffold/static/css/bootstrap.css.cg + scaffold/static/img/glyphicons-halflings.png + scaffold/static/img/glyphicons-halflings-white.png scaffold/templates/default-layout.hamlet.cg scaffold/templates/homepage.julius.cg scaffold/templates/default-layout-wrapper.hamlet.cg