From 8d51cd57b1899681c2e6d1e62ebd35486d988847 Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Fri, 20 Jan 2012 16:31:33 +0100 Subject: [PATCH 1/2] Fixed template -> templates --- multi/blog/Yesod-tutorial-for-newbies.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/multi/blog/Yesod-tutorial-for-newbies.md b/multi/blog/Yesod-tutorial-for-newbies.md index 123650e55..53e0aa62d 100644 --- a/multi/blog/Yesod-tutorial-for-newbies.md +++ b/multi/blog/Yesod-tutorial-for-newbies.md @@ -343,7 +343,7 @@ If you take a look at them, the format is not %html but hamlet. It is time to change the default %css. -Add a file named `default-layout.lucius` inside the `template/` directory containing: +Add a file named `default-layout.lucius` inside the `templates/` directory containing: body { @@ -448,7 +448,7 @@ getEchoR theText = do Some %html (more precisely hamlet) is written directly inside our handler. We should put this part inside another file. -Create the new file `template/echo.hamlet` containing: +Create the new file `templates/echo.hamlet` containing:

#{theText} @@ -620,7 +620,7 @@ getBlogR = do -- Get the list of articles inside the database. articles <- runDB $ selectList [] [Desc ArticleTitle] -- We'll need the two "objects": articleWidget and enctype - -- to construct the form (see template/articles.hamlet). + -- to construct the form (see templates/articles.hamlet). ((_,articleWidget), enctype) <- generateFormPost entryForm defaultLayout $ do $(widgetFile "articles") @@ -708,7 +708,7 @@ getArticleR articleId = do The `get404` function try to do a get on the DB. If it fails it return a 404 page. The rest should be clear. -Here is the content of `template/article.hamlet`: +Here is the content of `templates/article.hamlet`:

#{articleTitle article} From 1a18ba7d5a16e5646af0082c75e6aae5f8a491c0 Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Fri, 20 Jan 2012 16:35:15 +0100 Subject: [PATCH 2/2] regeneration --- content/html/en/blog/Yesod-tutorial-for-newbies.md | 8 ++++---- content/html/fr/blog/Yesod-tutorial-for-newbies.md | 8 ++++---- .../Scratch/en/blog/Yesod-tutorial-for-newbies/index.html | 8 ++++---- .../Scratch/fr/blog/Yesod-tutorial-for-newbies/index.html | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/content/html/en/blog/Yesod-tutorial-for-newbies.md b/content/html/en/blog/Yesod-tutorial-for-newbies.md index 00afe47ec..1396f1e3e 100644 --- a/content/html/en/blog/Yesod-tutorial-for-newbies.md +++ b/content/html/en/blog/Yesod-tutorial-for-newbies.md @@ -337,7 +337,7 @@ If you take a look at them, the format is not %html but hamlet. It is time to change the default %css. -Add a file named `default-layout.lucius` inside the `template/` directory containing: +Add a file named `default-layout.lucius` inside the `templates/` directory containing: body { @@ -442,7 +442,7 @@ getEchoR theText = do Some %html (more precisely hamlet) is written directly inside our handler. We should put this part inside another file. -Create the new file `template/echo.hamlet` containing: +Create the new file `templates/echo.hamlet` containing:

#{theText} @@ -614,7 +614,7 @@ getBlogR = do -- Get the list of articles inside the database. articles <- runDB $ selectList [] [Desc ArticleTitle] -- We'll need the two "objects": articleWidget and enctype - -- to construct the form (see template/articles.hamlet). + -- to construct the form (see templates/articles.hamlet). ((_,articleWidget), enctype) <- generateFormPost entryForm defaultLayout $ do $(widgetFile "articles") @@ -702,7 +702,7 @@ getArticleR articleId = do The `get404` function try to do a get on the DB. If it fails it return a 404 page. The rest should be clear. -Here is the content of `template/article.hamlet`: +Here is the content of `templates/article.hamlet`:

#{articleTitle article} diff --git a/content/html/fr/blog/Yesod-tutorial-for-newbies.md b/content/html/fr/blog/Yesod-tutorial-for-newbies.md index 92b5ddeb7..5556eb240 100644 --- a/content/html/fr/blog/Yesod-tutorial-for-newbies.md +++ b/content/html/fr/blog/Yesod-tutorial-for-newbies.md @@ -338,7 +338,7 @@ If you take a look at them, the format is not %html but hamlet. It is time to change the default %css. -Add a file named `default-layout.lucius` inside the `template/` directory containing: +Add a file named `default-layout.lucius` inside the `templates/` directory containing: body { @@ -443,7 +443,7 @@ getEchoR theText = do Some %html (more precisely hamlet) is written directly inside our handler. We should put this part inside another file. -Create the new file `template/echo.hamlet` containing: +Create the new file `templates/echo.hamlet` containing:

#{theText} @@ -615,7 +615,7 @@ getBlogR = do -- Get the list of articles inside the database. articles <- runDB $ selectList [] [Desc ArticleTitle] -- We'll need the two "objects": articleWidget and enctype - -- to construct the form (see template/articles.hamlet). + -- to construct the form (see templates/articles.hamlet). ((_,articleWidget), enctype) <- generateFormPost entryForm defaultLayout $ do $(widgetFile "articles") @@ -703,7 +703,7 @@ getArticleR articleId = do The `get404` function try to do a get on the DB. If it fails it return a 404 page. The rest should be clear. -Here is the content of `template/article.hamlet`: +Here is the content of `templates/article.hamlet`:

#{articleTitle article} diff --git a/output/Scratch/en/blog/Yesod-tutorial-for-newbies/index.html b/output/Scratch/en/blog/Yesod-tutorial-for-newbies/index.html index 6ec6c6f9f..fbe80b0f4 100644 --- a/output/Scratch/en/blog/Yesod-tutorial-for-newbies/index.html +++ b/output/Scratch/en/blog/Yesod-tutorial-for-newbies/index.html @@ -421,7 +421,7 @@ If you take a look at them, the format is not html but h

It is time to change the default css. -Add a file named default-layout.lucius inside the template/ directory containing:

+Add a file named default-layout.lucius inside the templates/ directory containing:

➥ default-layout.lucius 
@@ -530,7 +530,7 @@ getEchoR theText = do
 
 
Some html (more precisely hamlet) is written directly inside our handler.
 We should put this part inside another file.
-Create the new file template/echo.hamlet containing:

+Create the new file templates/echo.hamlet containing:

 
 
 ➥ echo.hamlet 

 
@@ -712,7 +712,7 @@ getBlogR = do
     -- Get the list of articles inside the database.
     articles <- runDB $ selectList [] [Desc ArticleTitle]
     -- We'll need the two "objects": articleWidget and enctype
-    -- to construct the form (see template/articles.hamlet).
+    -- to construct the form (see templates/articles.hamlet).
     ((_,articleWidget), enctype) <- generateFormPost entryForm
     defaultLayout $ do
         $(widgetFile "articles")
@@ -804,7 +804,7 @@ getArticleR articleId = do
 
The get404 function try to do a get on the DB. 
 If it fails it return a 404 page.
 The rest should be clear. 
-Here is the content of template/article.hamlet:

+Here is the content of templates/article.hamlet:

 
 
 ➥ article.hamlet 

 
diff --git a/output/Scratch/fr/blog/Yesod-tutorial-for-newbies/index.html b/output/Scratch/fr/blog/Yesod-tutorial-for-newbies/index.html
index 8d01407c9..d88782187 100644
--- a/output/Scratch/fr/blog/Yesod-tutorial-for-newbies/index.html
+++ b/output/Scratch/fr/blog/Yesod-tutorial-for-newbies/index.html
@@ -422,7 +422,7 @@ If you take a look at them, the format is not html but h
 

 
 
It is time to change the default css. 
-Add a file named default-layout.lucius inside the template/ directory containing:

+Add a file named default-layout.lucius inside the templates/ directory containing:

 
 
 ➥ default-layout.lucius 

 
@@ -531,7 +531,7 @@ getEchoR theText = do
 
 
Some html (more precisely hamlet) is written directly inside our handler.
 We should put this part inside another file.
-Create the new file template/echo.hamlet containing:

+Create the new file templates/echo.hamlet containing:

 
 
 ➥ echo.hamlet 

 
@@ -713,7 +713,7 @@ getBlogR = do
     -- Get the list of articles inside the database.
     articles <- runDB $ selectList [] [Desc ArticleTitle]
     -- We'll need the two "objects": articleWidget and enctype
-    -- to construct the form (see template/articles.hamlet).
+    -- to construct the form (see templates/articles.hamlet).
     ((_,articleWidget), enctype) <- generateFormPost entryForm
     defaultLayout $ do
         $(widgetFile "articles")
@@ -805,7 +805,7 @@ getArticleR articleId = do
 
The get404 function try to do a get on the DB. 
 If it fails it return a 404 page.
 The rest should be clear. 
-Here is the content of template/article.hamlet:

+Here is the content of templates/article.hamlet:

 
 
 ➥ article.hamlet