Skip to content
This repository has been archived by the owner on Dec 23, 2017. It is now read-only.

Glossary links #788

Merged
merged 76 commits into from
Oct 15, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
6e74d86
Update candidates.hbs
emileighoutlaw Sep 27, 2015
fab3510
Update parties.html
emileighoutlaw Sep 27, 2015
3b69d0a
Update candidates.hbs
emileighoutlaw Sep 27, 2015
20b3418
Update committees.hbs
emileighoutlaw Sep 27, 2015
8924620
Update candidates-table.html
emileighoutlaw Sep 27, 2015
8c18de4
Update candidates-table.html
emileighoutlaw Sep 27, 2015
5e12093
Update committees-table.html
emileighoutlaw Sep 27, 2015
b6e740c
Update search-results-candidate.html
emileighoutlaw Sep 27, 2015
b198f1e
Update receipts.hbs
emileighoutlaw Sep 27, 2015
eac06c6
Update committees-single.html
emileighoutlaw Sep 27, 2015
ac690d5
Update candidate-comparison-tab.html
emileighoutlaw Sep 27, 2015
5d3a46b
Update districts.html
emileighoutlaw Sep 27, 2015
4b5e756
Update districts.hbs
emileighoutlaw Sep 27, 2015
ceefe17
Update candidates.hbs
emileighoutlaw Sep 27, 2015
7460c8a
Update electionZipWarning.hbs
emileighoutlaw Sep 27, 2015
ca00acd
Update elections.html
emileighoutlaw Sep 27, 2015
522512b
Update candidates-table.html
emileighoutlaw Sep 27, 2015
88910aa
Update election-lookup.html
emileighoutlaw Sep 27, 2015
214b193
Update candidates-single.html
emileighoutlaw Sep 27, 2015
7623619
Update committees.hbs
emileighoutlaw Sep 27, 2015
e117103
Update committees-table.html
emileighoutlaw Sep 27, 2015
2086c35
Update disbursements-tab.html
emileighoutlaw Sep 27, 2015
4b05be2
Update committees.hbs
emileighoutlaw Sep 27, 2015
1d926a1
Update committee-totals-house-senate.html
emileighoutlaw Sep 27, 2015
41825d2
Update committee-charts.html
emileighoutlaw Sep 27, 2015
d1489a3
Update between-committees-tab.html
emileighoutlaw Sep 27, 2015
75be247
Update candidate.hbs
emileighoutlaw Sep 27, 2015
f8ee806
Update pac.hbs
emileighoutlaw Sep 27, 2015
fee5be1
Update committee-totals-pac-party.html
emileighoutlaw Sep 27, 2015
30149e2
Update filings-tab.html
emileighoutlaw Sep 27, 2015
6938664
Update ie-chart.html
emileighoutlaw Sep 28, 2015
1e2409a
Update candidate-comparison-tab.html
emileighoutlaw Sep 28, 2015
2d62e41
Update committee-totals-house-senate.html
emileighoutlaw Sep 28, 2015
213e745
Update committee-charts.html
emileighoutlaw Sep 28, 2015
84c9262
Update candidate.hbs
emileighoutlaw Sep 28, 2015
2f80ae7
Update pac.hbs
emileighoutlaw Sep 28, 2015
d3d3487
Update committee-totals-pac-party.html
emileighoutlaw Sep 28, 2015
e372fba
Update candidate-comparison-tab.html
emileighoutlaw Sep 28, 2015
0bc2991
Update candidate.hbs
emileighoutlaw Sep 28, 2015
cee7985
Update pac.hbs
emileighoutlaw Sep 28, 2015
46ff8a5
Update committee-charts.html
emileighoutlaw Sep 28, 2015
9c1f396
Update committee-charts.html
emileighoutlaw Sep 28, 2015
a5c6dc2
Update committee-totals-ie-only.html
emileighoutlaw Sep 28, 2015
27cdf7a
Update committee-types.html
emileighoutlaw Sep 28, 2015
a38f2ca
Update financial-summary.html
emileighoutlaw Sep 28, 2015
7ce4e50
Update disbursements-tab.html
emileighoutlaw Sep 28, 2015
c91b0ab
Update financial-summary.html
emileighoutlaw Sep 28, 2015
d209653
Update filings-tab.html
emileighoutlaw Sep 28, 2015
261d4e5
Update receipts-tab.html
emileighoutlaw Sep 28, 2015
5e82735
Update receipts-filter.html
emileighoutlaw Sep 28, 2015
5757c04
Update committees-single.html
emileighoutlaw Sep 28, 2015
77f9d73
Update committees-single.html
emileighoutlaw Sep 28, 2015
87a8bf1
Update filings-tab-candidate.html
emileighoutlaw Sep 28, 2015
3fdd1ce
Update 404.html
emileighoutlaw Sep 28, 2015
ec5db13
Update search.html
emileighoutlaw Sep 28, 2015
f7a408b
Update search.html
emileighoutlaw Sep 28, 2015
7f642f2
Update other-spending-tab.html
emileighoutlaw Sep 28, 2015
e6cdfd9
Merge branch 'develop' into glossary-links
Oct 2, 2015
ed5d33f
Update candidates.hbs
emileighoutlaw Oct 7, 2015
2328664
Update committees.hbs
emileighoutlaw Oct 7, 2015
d67bf20
Update candidates-table.html
emileighoutlaw Oct 7, 2015
fa9cdb4
Update committees-table.html
emileighoutlaw Oct 7, 2015
7215e63
Update candidates.hbs
emileighoutlaw Oct 7, 2015
537163e
Update receipts-filter.html
emileighoutlaw Oct 7, 2015
00d4cde
Update committee-types.html
emileighoutlaw Oct 7, 2015
5efb7d3
Update committee-charts.html
emileighoutlaw Oct 7, 2015
42a0f69
Update pac.hbs
emileighoutlaw Oct 7, 2015
a3456af
Update filings-tab.html
emileighoutlaw Oct 7, 2015
2ae71c7
Update candidate-comparison-tab.html
emileighoutlaw Oct 7, 2015
7dba870
Update candidate.hbs
emileighoutlaw Oct 7, 2015
f94701c
Update districts.hbs
emileighoutlaw Oct 8, 2015
bb29c16
Update committees-single.html
emileighoutlaw Oct 8, 2015
e19bbe9
Update elections.html
emileighoutlaw Oct 8, 2015
d3574e3
Update committees-table.html
emileighoutlaw Oct 8, 2015
ebccfd9
Merge branch 'develop' into glossary-links
Oct 8, 2015
01a5bef
Merge branch 'develop' into glossary-links
Oct 15, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion static/templates/electionZipWarning.hbs
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>
2 changes: 1 addition & 1 deletion static/templates/receipts.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<td class="panel__data"><a href="{{basePath}}/committee/{{ committee.committee_id }}/">{{ committee.name }}</a></td>
</tr>
<tr>
<td class="panel__term">Political party</td>
<td class="panel__term"><span class="term" data-term="party">Political party</span></td>
<td class="panel__data">{{ committee.party_full }}</td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="content__section">
<h1 class="message__title">Oops!</h1>
<p>We couldn't find what you're looking for. Please double-check the URL and try again.</p>
<p>To find a specific candidate or committee, try searching by name:</p>
<p>To find a specific candidate or <span class="term" data-term="Committee">committee</span>, try searching by name:</p>
{{ search.search('404', button_color="button--neutral") }}
</div>
<div class="message--alert__bottom">
Expand Down
2 changes: 1 addition & 1 deletion templates/candidates-single.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h1 class="entity__name">{{ name }}</h1>
<span class="entity__term__data">{% if incumbent_challenge_full %}{{ incumbent_challenge_full|title }}{% endif %}</span>
</li>
<li class="entity__term">
<span class="entity__term__label">District</span>
<span class="entity__term__label"><span class="term" data-term="District">District</span></span>
<span class="entity__term__data">
{% if district %}
<a href="{{ election_url(context(), cycle) }}">{{ state }} - {{ district }}</a>
Expand Down
4 changes: 2 additions & 2 deletions templates/committees-single.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% import 'macros/cycle-select.html' as select %}

{% block title %}
{{ name }} - Committee overview
{{ name }} - committee overview
{% endblock %}

{% block body %}
Expand Down Expand Up @@ -32,7 +32,7 @@ <h1 class="entity__name">{{ name }}</h1>
<ul class="entity__info">
{% if party_full %}
<li class="entity__term">
<span class="entity__term__label">Political party</span>
<span class="entity__term__label"><span class="term" data-term="Party">Political party</span></span>
<span class="entity__term__data">{{ party_full }}</span>
</li>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion templates/election-lookup.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h2 class="t-ruled--bottom t-ruled--bold">Search</h2>
<div class="search-controls__or search-controls__or--vertical">or</div>
<div class="search-controls__either">
<fieldset>
<legend class="label">Find by state and district</span></legend>
<legend class="label">Find by state and <span class="term" data-term="District">district</span></span></legend>
<div class="search-controls__state">
<select id="state" name="state" aria-label="Select a state">
<option value="">Select state</option>
Expand Down
2 changes: 1 addition & 1 deletion templates/partials/candidate/financial-summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h2 class="heading__title">
Financial summary
</h2>
</div>
<p class="usa-width-two-thirds">Candidates receive and spend money through committees. These are the <strong>combined financial totals</strong> for all of this candidate's authorized committees. You can learn more about each committee's fundraising and spending on its page.</p>
<p class="usa-width-two-thirds">Candidates receive and spend money through <span class="term" data-term="Committee">committees</span>. These are the <strong>combined financial totals</strong> for all of this candidate's <span class="term" data-term="Authorized committee">authorized committees</span>. You can learn more about each committee's fundraising and spending on its page.</p>
</div>
{% if committees_authorized %}

Expand Down
8 changes: 4 additions & 4 deletions templates/partials/committee-charts.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h5 class="chart-series__bar__tooltip__title">{{ key|replace('_', ' ')|title }}<
<div class="chart__header">
<h3 class="chart__title">Receipts and disbursements</h3>
<ul class="chart__key list--flat">
<li class="chart__key__item"><span class="swatch data--receipts"></span> Total receipts</li>
<li class="chart__key__item"><span class="swatch data--disbursements"></span> Total disbursements</li>
<li class="chart__key__item"><span class="swatch data--receipts"></span>Total receipts</li>
<li class="chart__key__item"><span class="swatch data--disbursements"></span>Total disbursements</li>
</ul>
</div>
{{ charts.chart_series_grouped(reports | reverse | list, ('total_receipts_period', 'total_disbursements_period'),
Expand All @@ -31,8 +31,8 @@ <h3 class="chart__title">Receipts and disbursements</h3>
<div class="chart__header">
<h3 class="chart__title">Cash and debt</h3>
<ul class="chart__key list--flat">
<li class="chart__key__item"><span class="swatch data--cash"></span> Ending cash on hand</li>
<li class="chart__key__item"><span class="swatch data--debt"></span> Debt</li>
<li class="chart__key__item"><span class="swatch data--cash"></span>Ending cash on hand</li>
<li class="chart__key__item"><span class="swatch data--debt"></span>Debt</li>
</ul>
</div>
{{ charts.chart_series_grouped(reports | reverse | list, ('cash_on_hand_end_period', 'debts_owed_by_committee'),
Expand Down
4 changes: 2 additions & 2 deletions templates/partials/committee-totals-house-senate.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
(totals.0.other_receipts, 'Other receipts'),
]
%}
{{ totals_table('Total Receipts', totals.0.receipts, table_data,
{{ totals_table('Total receipts', totals.0.receipts, table_data,
committee.report_year, header_description='Money received by the committee' ) }}

{% set table_data = [
Expand All @@ -35,7 +35,7 @@
]
%}

{{ 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 %}
4 changes: 2 additions & 2 deletions templates/partials/committee-totals-ie-only.html
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 %}
76 changes: 38 additions & 38 deletions templates/partials/committee-totals-pac-party.html
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 %}
2 changes: 1 addition & 1 deletion templates/partials/committee/disbursements-tab.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="container">
<div class="section__heading">
<h2 class="heading__title" id="section-2-heading">
Money spent by this committee
Money spent by this <span class="term" data-term="Committee">committee</span>
</h2>
<a class="heading__action button--neutral button--browse"
href="{{ url_for(
Expand Down
2 changes: 1 addition & 1 deletion templates/partials/committee/financial-summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2 class="heading__title" id="section-1-heading">
Financial summary
</h2>
</div>
<p>Get the full picture of all of the money received and spent by this committee.</p>
<p>Get the full picture of all of the money received and spent by this <span class="term" data-term="Committee">committee</span>.</p>
</div>
{% if reports and totals %}
<div class="content__section">
Expand Down
2 changes: 1 addition & 1 deletion templates/partials/committee/receipts-tab.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="container">
<div class="section__heading">
<h2 class="heading__title" id="section-2-heading">
Money received by the committee
Money received by the <span class="term" data-term="Committee">committee</span>
</h2>
<a class="heading__action button--neutral button--browse" href="{{ url_for('receipts', committee_id=committee_id, cycle=cycle, is_individual='true') }}">All receipts data</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/partials/filings-tab-candidate.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h2 class="heading__title">All candidate filings</h2>
</div>
<div class="row">
<p class="usa-width-two-thirds">Candidates are required to file a <strong>Statement of Candidacy</strong> every time they run for office. Financial reports from committees are available on committee pages.</p>
<p class="usa-width-two-thirds">Candidates are required to file a <strong>Statement of Candidacy</strong> every time they run for office. Financial reports from <span class="term" data-term="Committee">committees</span> are available on committee pages.</p>
</div>
<table class="data-table" data-type="filing" data-candidate="{{ candidate_id }}">
<thead>
Expand Down
2 changes: 1 addition & 1 deletion templates/partials/filters/districts.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="filter">
<fieldset class="js-dropdown">
<legend class="label" for="district">District</legend>
<legend class="label" for="district"><span class="term" data-term="District">District</span></legend>
<ul class="dropdown__selected"></ul>
<div class="dropdown">
<button type="button" class="dropdown__button button--neutral">More</button>
Expand Down
2 changes: 1 addition & 1 deletion templates/partials/filters/parties.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{ checkbox.checkbox_dropdown(
'party',
'Political Party',
'Political party',
selected=constants.parties,
options=constants.parties_extended,
) }}
6 changes: 3 additions & 3 deletions templates/partials/ie-chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ <h5 class="chart-series__bar__tooltip__title">{{ key|replace('_', ' ')|title }}<
<div class="row">
<figure class="chart-container chart--r-d">
<div class="chart__header">
<h4 class="chart__title">Independent Contributions and Independent Expenditures</h4>
<h4 class="chart__title">Independent contributions and independent expenditures</h4>
<ul class="chart__key list--flat">
<li class="chart__key__item"><span class="swatch data--receipts"></span> Total Independent Contributions</li>
<li class="chart__key__item"><span class="swatch data--disbursements"></span> Total Independent Expenditures</li>
<li class="chart__key__item"><span class="swatch data--receipts"></span> Total independent contributions</li>
<li class="chart__key__item"><span class="swatch data--disbursements"></span> Total independent expenditures</li>
</ul>
</div>
{{ charts.chart_series_grouped(reports | reverse | list, ('independent_contributions_period', 'independent_expenditures_period'),
Expand Down
6 changes: 3 additions & 3 deletions templates/partials/search-results-candidate.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h3 class="result__title">
</div>
<div class="row">
<ul class="result__column">
<li>Office Sought: {{ candidate.office_full }}</li>
<li>Party: {{ candidate.party_full }}</li>
<li>Office sought: {{ candidate.office_full }}</li>
<li><span class="term" data-term="party">Party:</span> {{ candidate.party_full }}</li>
</ul>
<ul class="result__column">
<li>State: {{ candidate.state or 'N/A' }}</li>
Expand All @@ -26,7 +26,7 @@ <h3 class="result__title">
<div class="result__column">
{% if candidate.principal_committees %}
{% with committee=candidate.principal_committees[0] %}
<span class="t-block t-bold">Principal Campaign Committee:</span>
<span class="t-block t-bold">Principal campaign committee:</span>
Copy link
Contributor

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?

Copy link

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.

Copy link
Contributor Author

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

Works for me!

<a class="tst-result-link" title="{{ committee.name }}"
href="{{ url_for('committee_page', c_id=committee.committee_id) }}">
{{ committee.name }}
Expand Down
6 changes: 3 additions & 3 deletions templates/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ <h2 class="card__title">Candidate data</h2>
<div class="card card--wide">
<div class="card__image__container">
<img class="card__image icon--complex" src="{{ url_for('static', filename='img/i-committees--neutral.svg') }}" alt="Icon representing committees">
<h2 class="card__title">Committee data</h2>
<h2 class="card__title"><span class="term" data-term="Committee">Committee</span> data</h2>
</div>
<div class="card__content">
<h2 class="card__title">Committee data</h2>
<ul class="card__links list--bulleted">
<li><a href="{{ url_for('committees', cycle=2016) }}">Most recent committees &raquo;</a></li>
<li><a href="{{ url_for('committees', cycle=2016, designation=['B', 'D'], committee_type=['N', 'Q', 'V', 'W']) }}">All PACs active 20152016 &raquo;</a></li>
<li><a href="{{ url_for('committees', cycle=2016, committee_type=['I', 'O', 'U']) }}">All independent expenditure committees active 20152016 &raquo;</a></li>
<li><a href="{{ url_for('committees', cycle=2016, designation=['B', 'D'], committee_type=['N', 'Q', 'V', 'W']) }}">All PACs active 2015-2016 &raquo;</a></li>
<li><a href="{{ url_for('committees', cycle=2016, committee_type=['I', 'O', 'U']) }}">All <span class="term" data-term="Independent expenditure">independent expenditure</span> committees active 2015-2016 &raquo;</a></li>
</ul>
<a class="button--neutral button--browse" href="{{ url_for('committees', cycle=default_cycles) }}">All committee data</a>
</div>
Expand Down