-
-
Notifications
You must be signed in to change notification settings - Fork 184
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Chapter page #236
Chapter page #236
Conversation
* added chapter template * refactor methodology page to share CSS styles with chapter page
Got some error after merge with master
Will try to fix this first |
Ok, all good now. It should be safe. |
@@ -1,26 +1,36 @@ | |||
{# IMPORTANT! | |||
{{# IMPORTANT! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @tyohan, the changes that were made to the chapter.html
in #222 were so that we can use Node + Showdown + EJS to statically generate the templates - because mistune wasn't generating tables (amongst other potential problems).
If we add the extra curly braces back, it will break the ejs rendering of the markdown. The work done in #232 is supposed to try and help with this, but I'm not sure how best to proceed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mikegeyser sorry accidentally click re-request review button.
Noted on showdown. Let me try to work around this thing and see if we can combine our works.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should only maintain one markdown parsing script and given that mistune doesn't support markdown tables within HTML, we should deprecate this mistune version in favor of the showdown script @mikegeyser is building.
Sorry that you put so much work into this script and for any confusion as we migrated tools. Having only one script will simplify things a lot.
@rviscomi there are 2 ways to merge my code and @mikegeyser :
WDYT? |
@@ -1,9 +1,44 @@ | |||
argh==0.26.2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow this is a lot of new requirements! Where did they all come from?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was installing the mistune contrib module and trying to update the the requirements but didn't realized it somehow generated all of these :|
@@ -0,0 +1,24 @@ | |||
{% for author in authors %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rather than individual template files for each of these components, we can generate them in the existing chapter template file.
Similar to the render_byline macro in base_chapter.html.
@@ -0,0 +1,25 @@ | |||
<nav id="chapter-navigation"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need to generate these as part of the markdown rendering. We have the chapter info in 2019.json
and we can render them server-side.
Also we might not launch with all 20 chapters, so some are marked todo
in the config. These links should go to the next/previous sequential chapter that isn't still marked "todo". That should be done dynamically on the server-side because it could change after the markdown is initially rendered.
@@ -0,0 +1,24 @@ | |||
{% for author in authors %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to update Japanese templates, we can leave that for the final translation step.
@@ -1,26 +1,36 @@ | |||
{# IMPORTANT! | |||
{{# IMPORTANT! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should only maintain one markdown parsing script and given that mistune doesn't support markdown tables within HTML, we should deprecate this mistune version in favor of the showdown script @mikegeyser is building.
Sorry that you put so much work into this script and for any confusion as we migrated tools. Having only one script will simplify things a lot.
@tyohan any progress on this PR? I think most of the TOC work can be reverted (sorry) and we can proceed with the markup/style changes. |
Noted, i'll push in a few hours. |
I have a new PR #251. Feel free to delete this branch. |
Notes on this PR: