From 2ce860f33b0e68888ea6342e83f3ee3b3c34c4d4 Mon Sep 17 00:00:00 2001 From: Orestis <orestis.malaspinas@hesge.ch> Date: Fri, 30 Oct 2020 09:10:43 +0100 Subject: [PATCH] added submodule --- .gitmodules | 3 +++ hakyll-bootstrap/Main.hs | 27 ++++++++++++++++++++++++--- hakyll-bootstrap/cours/math_tech_info | 1 + hakyll-bootstrap/pages/team.html | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) create mode 160000 hakyll-bootstrap/cours/math_tech_info diff --git a/.gitmodules b/.gitmodules index 822f448..08191a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "css/tufte-css"] path = css/tufte-css url = https://github.com/edwardtufte/tufte-css.git +[submodule "hakyll-bootstrap/cours/math_tech_info"] + path = hakyll-bootstrap/cours/math_tech_info + url = ssh://git@ssh.hesge.ch:10572/orestis.malaspin/math_tech_info.git diff --git a/hakyll-bootstrap/Main.hs b/hakyll-bootstrap/Main.hs index 79b8597..b69f6ee 100644 --- a/hakyll-bootstrap/Main.hs +++ b/hakyll-bootstrap/Main.hs @@ -115,8 +115,8 @@ archive = do >>= loadAndApplyTemplate "templates/archive.html" (archiveCtx posts) >>= relativizeUrls -cours :: Rules () -cours = do +cours_conc :: Rules () +cours_conc = do match "cours/*" $ do route $ setExtension "html" -- compile $ myPandocCompiler @@ -134,6 +134,25 @@ conc = do >>= loadAndApplyTemplate "templates/archive.html" (courseCtx posts "Programmation concurrente") >>= relativizeUrls +cours_mti :: Rules () +cours_mti = do + match "cours/math_tech_info/02*.md" $ do + route $ setExtension "html" + -- compile $ myPandocCompiler + compile $ bibtexCompiler + >>= loadAndApplyTemplate "templates/post.html" postCtx + >>= relativizeUrls + +mti :: Rules () +mti = do + create ["math_tech_info.html"] $ do + route idRoute + compile $ do + posts <- recentFirst =<< loadAll "cours/math_tech_info/*" + makeItem "" + >>= loadAndApplyTemplate "templates/archive.html" (courseCtx posts "Mathématiques en technologie de l'information") + >>= relativizeUrls + index :: Rules () index = do match "index.html" $ do @@ -210,8 +229,10 @@ main :: IO () main = hakyllWith cfg $ do pages posts - cours + cours_conc conc + cours_mti + mti archive index templates diff --git a/hakyll-bootstrap/cours/math_tech_info b/hakyll-bootstrap/cours/math_tech_info new file mode 160000 index 0000000..295d1cb --- /dev/null +++ b/hakyll-bootstrap/cours/math_tech_info @@ -0,0 +1 @@ +Subproject commit 295d1cbf15822d9d22bc282c4acb3f13aee6290c diff --git a/hakyll-bootstrap/pages/team.html b/hakyll-bootstrap/pages/team.html index bd7d02a..c4281fa 100644 --- a/hakyll-bootstrap/pages/team.html +++ b/hakyll-bootstrap/pages/team.html @@ -1,4 +1,4 @@ -<h2>Team</h2> +<h2>Research group and collaborations</h2> <hr class="featurette-divider"> -- GitLab