diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cf0ce2f --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.pyc +*~ +.DS_Store +.ipynb +.ipynb_checkpoints +.sass-cache +.jekyll-cache/ +__pycache__ +_site +.Rproj.user +.Rhistory +.RData +.idea/ +_site/ +venv/ diff --git a/Makefile b/Makefile index d291abe..74e4e24 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,10 @@ JEKYLL=jekyll JEKYLL_VERSION=3.8.5 PARSER=bin/markdown_ast.rb DST=_site +SLIDES_DIR=slides +SLIDES_MD=$(wildcard $(SLIDES_DIR)/[0-9][0-9]-*.md) +SLIDES_HTML=$(patsubst %.md, %.html, $(SLIDES_MD)) +SLIDES_THEME=white # Controls .PHONY : commands clean files @@ -22,11 +26,11 @@ docker-serve : docker run --rm -it -v ${PWD}:/srv/jekyll -p 127.0.0.1:4000:4000 jekyll/jekyll:${JEKYLL_VERSION} make serve ## serve : run a local server. -serve : lesson-md +serve : lesson-md slides ${JEKYLL} serve ## site : build files but do not run a server. -site : lesson-md +site : lesson-md slides ${JEKYLL} build # repo-check : check repository settings. @@ -38,6 +42,8 @@ clean : @rm -rf ${DST} @rm -rf .sass-cache @rm -rf bin/__pycache__ + @rm -f ${SLIDES_HTML} + @rm -f ${SLIDES_DIR}/index.html @find . -name .DS_Store -exec rm {} \; @find . -name '*~' -exec rm {} \; @find . -name '*.pyc' -exec rm {} \; @@ -119,3 +125,23 @@ lesson-fixme : #------------------------------------------------------------------------------- -include commands.mk + +.PHONY: slides +slides: $(SLIDES_HTML) $(SLIDES_DIR)/index.html + +$(SLIDES_DIR)/index.html: $(SLIDES_DIR)/index.md + @cd $(SLIDES_DIR) + pandoc $< -o $@ -s + @cd .. + +$(SLIDES_DIR)/%.html: $(SLIDES_DIR)/%.md + @cd $(SLIDES_DIR) + pandoc -t revealjs -s -o $@ $< -V theme=$(SLIDES_THEME) + @cd .. + +.PHONY: variables +variables: + @echo SLDIES_MD: $(SLIDES_MD) + @echo SLIDES_HTML: $(SLIDES_HTML) + @echo THEME: $(THEME) + diff --git a/_config.yml b/_config.yml index 3c3f4f2..0b7a9a2 100644 --- a/_config.yml +++ b/_config.yml @@ -29,7 +29,7 @@ kind: "lesson" repository: / # Email address, no mailto: -email: "team@carpentries.org" +email: "s.crouch@software.ac.uk" # Sites. amy_site: "https://amy.software-carpentry.org/workshops" @@ -62,7 +62,7 @@ instructor_post_survey: "https://www.surveymonkey.com/r/instructor_training_post # Start time in minutes (0 to be clock-independent, 540 to show a start at 09:00 am). -start_time: 0 +start_time: 570 # Specify that things in the episodes collection should be output. collections: @@ -96,6 +96,7 @@ exclude: - Makefile - bin/ - .Rproj.user/ + - venv/ # Turn on built-in syntax highlighting. highlighter: rouge diff --git a/_includes/carpentries.html b/_includes/carpentries.html index c032bd5..2c0ab98 100644 --- a/_includes/carpentries.html +++ b/_includes/carpentries.html @@ -27,7 +27,7 @@
- Software Carpentry logo + Software Carpentry logo

Since 1998, Software Carpentry has diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html index 03091a7..18e2eb9 100644 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@ -7,39 +7,17 @@