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

Combine data partials and shared partials #2159

Merged
merged 9 commits into from
Nov 23, 2015

Conversation

chrisroos
Copy link
Contributor

We had shared partials in both the smart_answer_flows/data_partials/ and smart_answer_flows/shared/ directories, which was confusing.

The smart_answer_flows/data_partials/ directory is a hangover from the days before ERB templates and all partials should now live in the smart_answer_flows/shared/ directory.

@floehopper floehopper self-assigned this Nov 19, 2015
@floehopper
Copy link
Contributor

LGTM 👍

The smart_answer_flows/data_partials directory is a hangover from before the
introduction of ERB templates. The smart_answer_flows/shared directory is where
shared partials now live.

This partial is only used by the register-a-birth and register-a-death Smart
Answers so I've placed it in the shared/births_and_deaths_registration
directory.

I've added the .govspeak extension so that it's name is consistent with the
other partials in this shared directory.
Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
    register-a-birth \
    lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb
Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
    register-a-death \
    lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb
The smart_answer_flows/data_partials directory is a hangover from before the
introduction of ERB templates. The smart_answer_flows/shared directory is where
shared partials now live.

This partial is used by 5 Smart Answers so I've placed it in the shared/
directory rather than a subdirectory of shared/.

I've added the .govspeak extension so that it's name is consistent with the
other partials in this shared directory.
Now that overseas_passports_embassies has moved.

Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
    marriage-abroad \
    lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb
Now that overseas_passports_embassies has moved.

Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
    overseas-passports \
    lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb
Now that overseas_passports_embassies has moved.

Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
    register-a-birth \
    lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb
Now that overseas_passports_embassies has moved.

Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
    register-a-death \
    lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb
Now that overseas_passports_embassies has moved.

Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
    report-a-lost-or-stolen-passport \
    lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb
@chrisroos chrisroos force-pushed the combine-data-partials-and-shared-partials branch from a6f1d9a to 61b152b Compare November 23, 2015 11:00
@chrisroos
Copy link
Contributor Author

I've rebased on master and force pushed in preparation for merging.

chrisroos added a commit that referenced this pull request Nov 23, 2015
…ed-partials

Combine data partials and shared partials
@chrisroos chrisroos merged commit 71253f6 into master Nov 23, 2015
@chrisroos chrisroos deleted the combine-data-partials-and-shared-partials branch November 23, 2015 11:03
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