From c95740a2933aae45f23f12a259a50645ead5db8a Mon Sep 17 00:00:00 2001
From: Orestis <orestis.malaspinas@pm.me>
Date: Sat, 19 Feb 2022 22:53:26 +0100
Subject: [PATCH] hopefully this works now
---
hakyll-bootstrap/Main.hs | 15 +++++++--------
hakyll-bootstrap/Makefile | 5 ++++-
hakyll-bootstrap/templates/static_course.html | 3 +--
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/hakyll-bootstrap/Main.hs b/hakyll-bootstrap/Main.hs
index 65b91ad..e14ddf3 100644
--- a/hakyll-bootstrap/Main.hs
+++ b/hakyll-bootstrap/Main.hs
@@ -136,19 +136,18 @@ main = hakyllWith config $ do
-- >>= loadAndApplyTemplate "templates/reveal.html" postCtx
-- >>= relativizeUrls
- match "cours/algo/slides/index.md" $ do
- route $ setExtension "html"
- compile $ pandocCompiler
- >>= loadAndApplyTemplate "templates/post.html" postCtx
- >>= relativizeUrls
+ -- match "cours/algo/slides/index.md" $ do
+ -- route $ setExtension "html"
+ -- compile $ pandocCompiler
+ -- >>= loadAndApplyTemplate "templates/post.html" postCtx
+ -- >>= relativizeUrls
-- Prog seq post list
create ["cours/algo.html"] $ do
route idRoute
compile $ do
- posts <- recentFirst =<< loadAll "cours/algo/slides/index.md"
makeItem ""
- >>= loadAndApplyTemplate "templates/archive.html" (courseCtx posts "Les slides d'Algorithmique en PDF" "algo/slides/index.html")
+ >>= loadAndApplyTemplate "templates/static_course.html" (noPostCtx "Les slides d'Algorithmique en PDF" "algo/slides/index.html")
>>= relativizeUrls
-- Team description
@@ -226,7 +225,7 @@ main = hakyllWith config $ do
where
staticPages =
[ "pages/contact.md"
- -- , "cours/algo/slides/index.md"
+ , "cours/algo/slides/index.md"
]
-- Used to compile to PDF
diff --git a/hakyll-bootstrap/Makefile b/hakyll-bootstrap/Makefile
index a94b139..1d7318d 100644
--- a/hakyll-bootstrap/Makefile
+++ b/hakyll-bootstrap/Makefile
@@ -11,7 +11,7 @@ build: update Main.hs cours/math_tech_info/*.md cours/isc_physics/*.md
make -C cours/isc_physics
make markdown -C cours/prog_seq/slides
# make markdown -C cours/algo/slides
- make puppeteer -C cours/algo/slides
+ make puppeteer -C cours/algo/slides SHELL=bash
make -C cours/algo/slides
make index -C cours/algo/slides
stack build --allow-different-user && stack exec --allow-different-user blog -- build
@@ -26,6 +26,9 @@ build_revealjs:
update:
make update -C ..
+clean_site:
+ rm -rf _cache _site
+
clean:
rm -rf _cache _site
make clean -C cours/math_tech_info
diff --git a/hakyll-bootstrap/templates/static_course.html b/hakyll-bootstrap/templates/static_course.html
index 89f31e8..e091123 100644
--- a/hakyll-bootstrap/templates/static_course.html
+++ b/hakyll-bootstrap/templates/static_course.html
@@ -24,9 +24,8 @@
<div class="container">
<h1>$title$</h1>
$if(pdfurl)$
- <h3><a href="$pdfurl$">Le polycopié en entier [pdf]</a></h3>
+ <h3><a href="$pdfurl$">Les slides du cours [pdf]</a></h3>
$endif$
- <h2>Les chapitres</h2>
$partial("templates/footer.html")$
</div>
--
GitLab