From 6956872a80693cf48bf14a9120b97f61b019a969 Mon Sep 17 00:00:00 2001 From: Christian Kremitzl Date: Tue, 24 Mar 2020 12:53:18 +0100 Subject: [PATCH 1/2] Execute bits for scripts. --- autocompile.sh | 0 main.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 autocompile.sh mode change 100644 => 100755 main.py diff --git a/autocompile.sh b/autocompile.sh old mode 100755 new mode 100644 diff --git a/main.py b/main.py old mode 100644 new mode 100755 From c9aefdee8bab47d26434b846748ab62647bb98aa Mon Sep 17 00:00:00 2001 From: Christian Kremitzl Date: Tue, 24 Mar 2020 15:06:53 +0100 Subject: [PATCH 2/2] Layout-independent todo annotations. --- chapters.py | 7 +++++-- slides.py | 5 ++++- test/slides/chapter1.de.md | 14 ++++++++++++++ test/slides/chapter1.en.md | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/chapters.py b/chapters.py index 04cded5..f02f27e 100644 --- a/chapters.py +++ b/chapters.py @@ -53,7 +53,10 @@ def compile_chapter(chapter, no_cache): slides = [delimiter + slide for slide in chapter_input][1:] chapter_content = '' for slide in slides: - chapter_content += '
\n' + slides_helper.compile_slide(slide, root) + '\n
\n' + chapter_content +=\ + '
\n' +\ + slides_helper.compile_slide(slide, root) + '\n' +\ + '
\n' cache.store_cached_chapter(root, lang, chapter, chapter_content) - return chapter_content \ No newline at end of file + return chapter_content diff --git a/slides.py b/slides.py index 521d830..225ec13 100644 --- a/slides.py +++ b/slides.py @@ -14,6 +14,9 @@ def compile_slide(slide, root_directory): slide_metadata = get_slide_metadata(slide) slide_data = get_slide_data(slide) slide = get_slide_layout(slide_metadata['layout']) + if 'todo' in slide_data.keys(): + # TODO: Move the css into a global onpoint.css file + slide = '' + slide for key, value in slide_data.items(): placeholder = '@' + key filler = convert_slide_content(value) @@ -65,4 +68,4 @@ def convert_slide_content(content): content, 'html', format='md', extra_args=pdoc_args, - filters=filters) \ No newline at end of file + filters=filters) diff --git a/test/slides/chapter1.de.md b/test/slides/chapter1.de.md index ba4700e..eee2a9c 100644 --- a/test/slides/chapter1.de.md +++ b/test/slides/chapter1.de.md @@ -14,3 +14,17 @@ Wirklich auf den Punkt! * ++ Stichpunkt 3 * ++ Stichpunkt 4 + +@slide + +@title +Folie mit Todo + +@todo +Das ist das Todo. + +* Stichpunkt + +@content +Diese Folie ist noch nicht fertig. + diff --git a/test/slides/chapter1.en.md b/test/slides/chapter1.en.md index 42c5f87..c5c94ad 100644 --- a/test/slides/chapter1.en.md +++ b/test/slides/chapter1.en.md @@ -13,3 +13,18 @@ OnPoint for real! * bullet point 2 * bullet point 3 * bullet point 4 + + +@slide + +@title +Slide with todo + +@todo +This is the todo. + +* bullet point + +@content +This slide is not done yet. +