Skip to content
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

Migrate Private Django Flat Blocks to HTMLs #711

Merged
merged 8 commits into from
Oct 26, 2017

Conversation

GoFroggyRun
Copy link
Contributor

@GoFroggyRun GoFroggyRun commented Oct 24, 2017

This PR addresses issue #588.

Previously, contents on the ospc.org are stored in private Django flatblocks, and is not open. All those flatblocks are now migrated into HTML files on PolicyBrain page.

@hdoupe
Copy link
Collaborator

hdoupe commented Oct 25, 2017

@GoFroggyRun would you mind naming this something more informative and adding a [WIP] label?

@GoFroggyRun GoFroggyRun changed the title Do Not Merge [WIP] Migrate Private Django Flat Blocks to HTMLs Oct 25, 2017
@GoFroggyRun
Copy link
Contributor Author

@hdoupe thanks for the reminder.

@hdoupe
Copy link
Collaborator

hdoupe commented Oct 25, 2017

@GoFroggyRun Thanks for updating the title

@GoFroggyRun GoFroggyRun changed the title [WIP] Migrate Private Django Flat Blocks to HTMLs Migrate Private Django Flat Blocks to HTMLs Oct 26, 2017
@hdoupe
Copy link
Collaborator

hdoupe commented Oct 26, 2017

@GoFroggyRun there are a couple merge conflicts. Can you take a look at those?

@GoFroggyRun
Copy link
Contributor Author

@hdoupe should be good now.

@hdoupe hdoupe merged commit 2fa70f4 into ospc-org:master Oct 26, 2017
@@ -73,8 +149,26 @@ <h2 class="sr-only">TaxBrain</h2>

<div id="get-started" class="inputs-block inputs-block-intro">
<div class="inputs-block-header">
<h1>Macroeconomic Elasticity Simulation</h1>
{% flatblock "dynamic_elasticity_get_started_blurb" %}
Copy link
Collaborator

@hdoupe hdoupe Oct 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoFroggyRun Here's where "Macroeconomic Elasticity Simulation" got removed. Fixed in #722

@@ -7,8 +7,7 @@

{% block content %}
<div class="inputs-block-header">
<h1>Macroeconomic Parameter</h1>
{% flatblock "taxbrain_dynamic_blurb" %}
<h1>Macroeconomic Parameters</h1>
Copy link
Collaborator

@hdoupe hdoupe Oct 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoFroggyRun And here's where the "s" got added back on. Fixed in #722

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hdoupe right. Git automatically takes care of some conflicts. That's why changes got reverted.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants