This repository has been archived by the owner on Dec 23, 2017. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 31
Glossary links #788
Merged
Merged
Glossary links #788
Changes from all commits
Commits
Show all changes
76 commits
Select commit
Hold shift + click to select a range
6e74d86
Update candidates.hbs
emileighoutlaw fab3510
Update parties.html
emileighoutlaw 3b69d0a
Update candidates.hbs
emileighoutlaw 20b3418
Update committees.hbs
emileighoutlaw 8924620
Update candidates-table.html
emileighoutlaw 8c18de4
Update candidates-table.html
emileighoutlaw 5e12093
Update committees-table.html
emileighoutlaw b6e740c
Update search-results-candidate.html
emileighoutlaw b198f1e
Update receipts.hbs
emileighoutlaw eac06c6
Update committees-single.html
emileighoutlaw ac690d5
Update candidate-comparison-tab.html
emileighoutlaw 5d3a46b
Update districts.html
emileighoutlaw 4b5e756
Update districts.hbs
emileighoutlaw ceefe17
Update candidates.hbs
emileighoutlaw 7460c8a
Update electionZipWarning.hbs
emileighoutlaw ca00acd
Update elections.html
emileighoutlaw 522512b
Update candidates-table.html
emileighoutlaw 88910aa
Update election-lookup.html
emileighoutlaw 214b193
Update candidates-single.html
emileighoutlaw 7623619
Update committees.hbs
emileighoutlaw e117103
Update committees-table.html
emileighoutlaw 2086c35
Update disbursements-tab.html
emileighoutlaw 4b05be2
Update committees.hbs
emileighoutlaw 1d926a1
Update committee-totals-house-senate.html
emileighoutlaw 41825d2
Update committee-charts.html
emileighoutlaw d1489a3
Update between-committees-tab.html
emileighoutlaw 75be247
Update candidate.hbs
emileighoutlaw f8ee806
Update pac.hbs
emileighoutlaw fee5be1
Update committee-totals-pac-party.html
emileighoutlaw 30149e2
Update filings-tab.html
emileighoutlaw 6938664
Update ie-chart.html
emileighoutlaw 1e2409a
Update candidate-comparison-tab.html
emileighoutlaw 2d62e41
Update committee-totals-house-senate.html
emileighoutlaw 213e745
Update committee-charts.html
emileighoutlaw 84c9262
Update candidate.hbs
emileighoutlaw 2f80ae7
Update pac.hbs
emileighoutlaw d3d3487
Update committee-totals-pac-party.html
emileighoutlaw e372fba
Update candidate-comparison-tab.html
emileighoutlaw 0bc2991
Update candidate.hbs
emileighoutlaw cee7985
Update pac.hbs
emileighoutlaw 46ff8a5
Update committee-charts.html
emileighoutlaw 9c1f396
Update committee-charts.html
emileighoutlaw a5c6dc2
Update committee-totals-ie-only.html
emileighoutlaw 27cdf7a
Update committee-types.html
emileighoutlaw a38f2ca
Update financial-summary.html
emileighoutlaw 7ce4e50
Update disbursements-tab.html
emileighoutlaw c91b0ab
Update financial-summary.html
emileighoutlaw d209653
Update filings-tab.html
emileighoutlaw 261d4e5
Update receipts-tab.html
emileighoutlaw 5e82735
Update receipts-filter.html
emileighoutlaw 5757c04
Update committees-single.html
emileighoutlaw 77f9d73
Update committees-single.html
emileighoutlaw 87a8bf1
Update filings-tab-candidate.html
emileighoutlaw 3fdd1ce
Update 404.html
emileighoutlaw ec5db13
Update search.html
emileighoutlaw f7a408b
Update search.html
emileighoutlaw 7f642f2
Update other-spending-tab.html
emileighoutlaw e6cdfd9
Merge branch 'develop' into glossary-links
ed5d33f
Update candidates.hbs
emileighoutlaw 2328664
Update committees.hbs
emileighoutlaw d67bf20
Update candidates-table.html
emileighoutlaw fa9cdb4
Update committees-table.html
emileighoutlaw 7215e63
Update candidates.hbs
emileighoutlaw 537163e
Update receipts-filter.html
emileighoutlaw 00d4cde
Update committee-types.html
emileighoutlaw 5efb7d3
Update committee-charts.html
emileighoutlaw 42a0f69
Update pac.hbs
emileighoutlaw a3456af
Update filings-tab.html
emileighoutlaw 2ae71c7
Update candidate-comparison-tab.html
emileighoutlaw 7dba870
Update candidate.hbs
emileighoutlaw f94701c
Update districts.hbs
emileighoutlaw bb29c16
Update committees-single.html
emileighoutlaw e19bbe9
Update elections.html
emileighoutlaw d3574e3
Update committees-table.html
emileighoutlaw ebccfd9
Merge branch 'develop' into glossary-links
01a5bef
Merge branch 'develop' into glossary-links
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<div class="message message--alert"> | ||
<div class="message__content"> | ||
<p>ZIP code {{zip}} includes multiple congressional districts with elections in {{cycle}}.</p> | ||
<p>ZIP code {{zip}} includes multiple congressional <span class="term" data-term="District">districts</span> with elections in {{cycle}}.</p> | ||
<p class="t-sans">Find your district on <a href="https://www.house.gov">house.gov</a>.</p> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{% with committee=context() %} | ||
|
||
{{ totals_table('Independent Contributions', totals.0.total_independent_contributions) }} | ||
{{ totals_table('Independent Expenditures', totals.0.total_independent_expenditures) }} | ||
{{ totals_table('Independent contributions', totals.0.total_independent_contributions) }} | ||
{{ totals_table('Independent expenditures', totals.0.total_independent_expenditures) }} | ||
|
||
{% endwith %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,54 @@ | ||
{% with committee=context() %} | ||
|
||
{% set table_data = [ | ||
(totals.0.individual_itemized_contributions, 'Itemized Individual Contributions'), | ||
(totals.0.individual_unitemized_contributions, 'Unitemized Individual Contributions'), | ||
(totals.0.individual_contributions, 'Total Individual Contributions'), | ||
(totals.0.political_party_committee_contributions, 'Party Committees Contributions'), | ||
(totals.0.other_political_committee_contributions, 'Other Committees Contributions'), | ||
(totals.0.transfers_from_affiliated_party, 'Transfers from Affiliated Committees'), | ||
(totals.0.contributions, 'Total Contributions'), | ||
(totals.0.net_contributions, 'Net Contributions'), | ||
(totals.0.all_loans_received, 'Loans Received'), | ||
(totals.0.loan_repayments_received, 'Loan Repayments Received'), | ||
(totals.0.offsets_to_operating_expenditures, 'Offsets to Operating Expenditures'), | ||
(totals.0.fed_candidate_contribution_refunds, 'Candidate Refunds'), | ||
(totals.0.individual_itemized_contributions, 'Itemized individual contributions'), | ||
(totals.0.individual_unitemized_contributions, 'Unitemized individual contributions'), | ||
(totals.0.individual_contributions, 'Total individual contributions'), | ||
(totals.0.political_party_committee_contributions, 'Party committees contributions'), | ||
(totals.0.other_political_committee_contributions, 'Other committees contributions'), | ||
(totals.0.transfers_from_affiliated_party, 'Transfers from affiliated committees'), | ||
(totals.0.contributions, 'Total contributions'), | ||
(totals.0.net_contributions, 'Net contributions'), | ||
(totals.0.all_loans_received, 'Loans received'), | ||
(totals.0.loan_repayments_received, 'Loan repayments received'), | ||
(totals.0.offsets_to_operating_expenditures, 'Offsets to operating expenditures'), | ||
(totals.0.fed_candidate_contribution_refunds, 'Candidate refunds'), | ||
(totals.0.other_fed_receipts, 'Other Receipts'), | ||
(totals.0.transfers_from_nonfed_account, 'Non-Federal Transfers'), | ||
(totals.0.transfers_from_nonfed_levin, 'Levin Funds'), | ||
(totals.0.transfers_from_nonfed_account, 'Total Non-Federal Transfers'), | ||
(totals.0.fed_receipts, 'Total Federal Receipts'), | ||
(totals.0.transfers_from_nonfed_account, 'Non-federal transfers'), | ||
(totals.0.transfers_from_nonfed_levin, 'Levin funds'), | ||
(totals.0.transfers_from_nonfed_account, 'Total non-federal transfers'), | ||
(totals.0.fed_receipts, 'Total federal receipts'), | ||
] | ||
%} | ||
{{ totals_table('Total Receipts', totals.0.receipts, table_data, | ||
committee.report_year, header_description='Money received by the committee' ) }} | ||
|
||
{% set table_data = [ | ||
(totals.0.shared_fed_operating_expenditures, 'Federal Allocated Operating Expenditures'), | ||
(totals.0.shared_nonfed_operating_expenditures, 'Non-Federal Operating Expenditures'), | ||
(totals.0.other_fed_operating_expenditures, 'Other Federal Operating Expenditures'), | ||
(totals.0.operating_expenditures, 'Total Operating Expenditures'), | ||
(totals.0.net_operating_expenditures, 'Net Operating Expenditures'), | ||
(totals.0.transfers_to_affiliated_committee, 'Transfers to Affiliated Committees'), | ||
(totals.0.fed_candidate_committee_contributions, 'Contributions to Other Committees'), | ||
(totals.0.independent_expenditures, 'Independent Expenditures'), | ||
(totals.0.coordinated_expenditures_by_party_committee, 'Coordinated Party Expenditures'), | ||
(totals.0.loans_made, 'Loans Made'), | ||
(totals.0.loan_repayments_made, 'Loan Repayments Made'), | ||
(totals.0.shared_fed_operating_expenditures, 'Federal allocated operating expenditures'), | ||
(totals.0.shared_nonfed_operating_expenditures, 'Non-federal operating expenditures'), | ||
(totals.0.other_fed_operating_expenditures, 'Other federal operating expenditures'), | ||
(totals.0.operating_expenditures, 'Total operating expenditures'), | ||
(totals.0.net_operating_expenditures, 'Net operating expenditures'), | ||
(totals.0.transfers_to_affiliated_committee, 'Transfers to affiliated committees'), | ||
(totals.0.fed_candidate_committee_contributions, 'Contributions to other committees'), | ||
(totals.0.independent_expenditures, 'Independent expenditures'), | ||
(totals.0.coordinated_expenditures_by_party_committee, 'Coordinated party expenditures'), | ||
(totals.0.loans_made, 'Loans made'), | ||
(totals.0.loan_repayments_made, 'Loan repayments made'), | ||
|
||
(totals.0.refunded_individual_contributions, 'Individual Refunds'), | ||
(totals.0.refunded_political_party_committee_contributions, 'Politial Party Refunds'), | ||
(totals.0.refunded_other_political_committee_contributions, 'Other Committee Refunds'), | ||
(totals.0.contribution_refunds, 'Total Contribution refunds'), | ||
(totals.0.other_disbursements, 'Other Disbursements'), | ||
(totals.0.shared_fed_activity, 'Allocated Federal Election Activity - Federal Share'), | ||
(totals.0.allocated_federal_election_levin_share, 'Allocated Federal Election Activity - Levin Share'), | ||
(totals.0.non_allocated_fed_election_activity, 'Federal Election Activity - Federal Only'), | ||
(totals.0.fed_election_activity, 'Total Federal Election Activity'), | ||
(totals.0.fed_disbursements, 'Total Federal Disbursements'), | ||
(totals.0.refunded_individual_contributions, 'Individual refunds'), | ||
(totals.0.refunded_political_party_committee_contributions, 'Politial party refunds'), | ||
(totals.0.refunded_other_political_committee_contributions, 'Other committee refunds'), | ||
(totals.0.contribution_refunds, 'Total contribution refunds'), | ||
(totals.0.other_disbursements, 'Other disbursements'), | ||
(totals.0.shared_fed_activity, 'Allocated federal election activity - federal share'), | ||
(totals.0.allocated_federal_election_levin_share, 'Allocated federal election activity - Levin share'), | ||
(totals.0.non_allocated_fed_election_activity, 'Federal election activity - federal only'), | ||
(totals.0.fed_election_activity, 'Total federal election activity'), | ||
(totals.0.fed_disbursements, 'Total federal disbursements'), | ||
] | ||
%} | ||
{{ totals_table('Total Disbursements', totals.0.disbursements, table_data, | ||
{{ totals_table('Total disbursements', totals.0.disbursements, table_data, | ||
committee.report_year, header_description='Money spent by the committee' ) }} | ||
|
||
{% endwith %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Are you sure we're not capitalizing Principal campaign committees? Are they a proper noun?
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.
@noahmanger, @AmyKort and I have no preference and defer to @emileighoutlaw and whatever she thinks users will find most approachable/least off-putting. I believe Emily thought we should capitalize as little as possible.
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.
Yes! FEC.gov's current style is not capitalized, and I'm a huge fan of no caps whenever possible. People tend to read lots of big capital letters as scary and dictatorial, especially in a gov setting.
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.
Works for me!