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

Commit

Permalink
Merge pull request #695 from 18F/content-edits
Browse files Browse the repository at this point in the history 
Content edits
  • Loading branch information
Noah Manger committed Sep 17, 2015
2 parents ad318ba + 7b3e439 commit 41e3a2e
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 101 deletions.
6 changes: 3 additions & 3 deletions templates/committees-single.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ <h1 class="entity__name">{{ name }}</h1>
<nav class="page-tabs">
<ul class="page-tabs__list" role="tablist" data-name="tab">
{% if committee_type not in ['C', 'E'] %}
<li role="presentation" class="page-tabs__item"><a role="tab" data-name="summary" tabindex="0" aria-controls="panel1" aria-selected="true" href="#section-1">Financial Summary</a></li>
<li role="presentation" class="page-tabs__item"><a role="tab" data-name="receipts" tabindex="-1" aria-controls="panel2" href="#section-2">Receipts from Individuals</a></li>
<li role="presentation" class="page-tabs__item"><a role="tab" data-name="summary" tabindex="0" aria-controls="panel1" aria-selected="true" href="#section-1">Financial summary</a></li>
<li role="presentation" class="page-tabs__item"><a role="tab" data-name="receipts" tabindex="-1" aria-controls="panel2" href="#section-2">Receipts from individuals</a></li>
<li role="presentation" class="page-tabs__item"><a role="tab" data-name="disbursements" tabindex="-1" aria-controls="panel3" href="#section-3">Disbursements</a></li>
<li role="presentation" class="page-tabs__item"><a role="tab" data-name="transfers" tabindex="-1" aria-controls="panel4" href="#section-4">Between Committees</a></li>
<li role="presentation" class="page-tabs__item"><a role="tab" data-name="transfers" tabindex="-1" aria-controls="panel4" href="#section-4">Between committees</a></li>
<li role="presentation" class="page-tabs__item"><a role="tab" data-name="filings" tabindex="-1" aria-controls="panel5" href="#section-5">Filings</a></li>
{% endif %}
</ul>
Expand Down
42 changes: 21 additions & 21 deletions templates/partials/committee-report-house-senate.html
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{% with committee=context() %}

{% set table_data = [
(reports.0.individual_itemized_contributions_period, 'Itemized Individual Contributions'),
(reports.0.individual_unitemized_contributions_period, 'Unitemized Individual Contributions'),
(reports.0.total_individual_contributions_period, 'Total Individual Contributions'),
(reports.0.political_party_committee_contributions_period,'Party Committee Contributions'),
(reports.0.other_political_committee_contributions_period,'Other Committee Contributions'),
(reports.0.candidate_contribution_period, 'Candidate Contributions'),
(reports.0.total_contributions_period, 'Total Contributions'),
(reports.0.transfers_from_other_authorized_committee_period, 'Transfer from Authorized Committees'),
(reports.0.loans_made_by_candidate_period, 'Loans Made by Candidate'),
(reports.0.all_other_loans_period, 'Other Loans'),
(reports.0.total_loans_received_period, 'Total Loans Received'),
(reports.0.offsets_to_operating_expenditures_period, 'Offsets to Operating Expenditures'),
(reports.0.other_receipts_period, 'Other Receipts'),
(reports.0.individual_itemized_contributions_period, 'Itemized individual contributions'),
(reports.0.individual_unitemized_contributions_period, 'Unitemized individual contributions'),
(reports.0.total_individual_contributions_period, 'Total individual contributions'),
(reports.0.political_party_committee_contributions_period,'Party committee contributions'),
(reports.0.other_political_committee_contributions_period,'Other committee contributions'),
(reports.0.candidate_contribution_period, 'Candidate contributions'),
(reports.0.total_contributions_period, 'Total contributions'),
(reports.0.transfers_from_other_authorized_committee_period, 'Transfer from authorized committees'),
(reports.0.loans_made_by_candidate_period, 'Loans made by candidate'),
(reports.0.all_other_loans_period, 'Other loans'),
(reports.0.total_loans_received_period, 'Total loans received'),
(reports.0.offsets_to_operating_expenditures_period, 'Offsets to operating expenditures'),
(reports.0.other_receipts_period, 'Other receipts'),
]
%}
{{ totals_table('Total Receipts', reports.0.total_receipts_period, table_data,
Expand All @@ -22,14 +22,14 @@
{% set table_data = [
(reports.0.operating_expenditures_period, 'Operating expenditures'),
(reports.0.transfers_to_other_authorized_committee_period, 'Transfers to authorized committees'),
(reports.0.loan_repayments_candidate_loans_period, 'Candidate Loan Repayments'),
(reports.0.loan_repayments_other_loans_period, 'Other Loan Repayments'),
(reports.0.total_loan_repayments_made_period, 'Total Loan Repayments'),
(reports.0.refunded_individual_contributions_period, 'Individual Refunds'),
(reports.0.refunded_political_party_committee_contributions_period, 'Political Party Refunds'),
(reports.0.refunded_other_political_committee_contributions_period, 'Other Committee Refunds'),
(reports.0.other_disbursements_period, 'Other Disbursements'),
(reports.0.total_contribution_refunds_period, 'Total Contribution refunds'),
(reports.0.loan_repayments_candidate_loans_period, 'Candidate loan repayments'),
(reports.0.loan_repayments_other_loans_period, 'Other loan repayments'),
(reports.0.total_loan_repayments_made_period, 'Total loan repayments'),
(reports.0.refunded_individual_contributions_period, 'Individual refunds'),
(reports.0.refunded_political_party_committee_contributions_period, 'Political party refunds'),
(reports.0.refunded_other_political_committee_contributions_period, 'Other committee refunds'),
(reports.0.other_disbursements_period, 'Other disbursements'),
(reports.0.total_contribution_refunds_period, 'Total contribution refunds'),
]
%}

Expand Down
52 changes: 26 additions & 26 deletions templates/partials/committee-report-presidential.html
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
{% with committee=context() %}
{% set table_data = [
(reports.0.federal_funds_period,'Federal Funds'),
(reports.0.individual_itemized_contributions_period, 'Itemized Individual Contributions'),
(reports.0.individual_unitemized_contributions_period, 'Unitemized Individual Contributions'),
(reports.0.total_individual_contributions_period, 'Total Individual Contributions'),
(reports.0.political_party_committee_contributions_period, 'Party Committee Contributions'),
(reports.0.other_political_committee_contributions_period, 'Other Committee Contributions'),
(reports.0.candidate_contribution_period, 'Candidate Contributions'),
(reports.0.total_contributions_period, 'Total Contributions'),
(reports.0.transfers_from_affiliated_committee_period, 'Transfer from Authorized Committees'),
(reports.0.loans_received_from_candidate_period, 'Loans Made by Candidate'),
(reports.0.other_loans_received_period, 'Other Loans'),
(reports.0.total_loans_received_period, 'Total Loans Received'),
(reports.0.offsets_to_operating_expenditures_period, 'Offsets to Operating Expenditures'),
(reports.0.offsets_to_fundraising_expenditures_period, 'Fundraising Offsets'),
(reports.0.offsets_to_legal_accounting_period, 'Legal and Accounting Offsets'),
(reports.0.total_offsets_to_operating_expenditures_period, 'Total Offsets'),
(reports.0.other_receipts_period, 'Other Receipts'),
(reports.0.individual_itemized_contributions_period, 'Itemized individual contributions'),
(reports.0.individual_unitemized_contributions_period, 'Unitemized individual contributions'),
(reports.0.total_individual_contributions_period, 'Total individual contributions'),
(reports.0.political_party_committee_contributions_period, 'Party committee contributions'),
(reports.0.other_political_committee_contributions_period, 'Other committee contributions'),
(reports.0.candidate_contribution_period, 'Candidate contributions'),
(reports.0.total_contributions_period, 'Total contributions'),
(reports.0.transfers_from_affiliated_committee_period, 'Transfer from authorized committees'),
(reports.0.loans_received_from_candidate_period, 'Loans made by candidate'),
(reports.0.other_loans_received_period, 'Other loans'),
(reports.0.total_loans_received_period, 'Total loans received'),
(reports.0.offsets_to_operating_expenditures_period, 'Offsets to operating expenditures'),
(reports.0.offsets_to_fundraising_expenditures_period, 'Fundraising offsets'),
(reports.0.offsets_to_legal_accounting_period, 'Legal and accounting offsets'),
(reports.0.total_offsets_to_operating_expenditures_period, 'Total offsets'),
(reports.0.other_receipts_period, 'Other receipts'),
]
%}
{{ totals_table('Total Receipts', reports.0.total_receipts_period, table_data,
committee.report_year, header_description='Money received by the committee' ) }}

{% set table_data = [
(reports.0.operating_expenditures_period, 'Operating Expenditures'),
(reports.0.transfers_to_other_authorized_committee_period, 'Transfers to Authorized Committees'),
(reports.0.repayments_loans_made_by_candidate_period, 'Candidate Loan Repayments'),
(reports.0.repayments_other_loans_period, 'Other Loan Repayments'),
(reports.0.total_loan_repayments_made_period, 'Total Loan Repayments'),
(reports.0.refunded_individual_contributions_period, 'Individual Refunds'),
(reports.0.refunded_political_party_committee_contributions_period, 'Political Party Refunds'),
(reports.0.refunded_other_political_committee_contributions_period, 'Other Committee Refunds'),
(reports.0.other_disbursements_period, 'Other Disbursements'),
(reports.0.total_contribution_refunds_period, 'Total Contribution refunds'),
(reports.0.operating_expenditures_period, 'Operating expenditures'),
(reports.0.transfers_to_other_authorized_committee_period, 'Transfers to authorized committees'),
(reports.0.repayments_loans_made_by_candidate_period, 'Candidate loan repayments'),
(reports.0.repayments_other_loans_period, 'Other loan repayments'),
(reports.0.total_loan_repayments_made_period, 'Total loan repayments'),
(reports.0.refunded_individual_contributions_period, 'Individual refunds'),
(reports.0.refunded_political_party_committee_contributions_period, 'Political party refunds'),
(reports.0.refunded_other_political_committee_contributions_period, 'Other committee refunds'),
(reports.0.other_disbursements_period, 'Other disbursements'),
(reports.0.total_contribution_refunds_period, 'Total contribution refunds'),

]
%}
Expand Down
44 changes: 22 additions & 22 deletions templates/partials/committee-totals-house-senate.html
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
{% 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 Committee Contributions'),
(totals.0.other_political_committee_contributions,'Other Committee Contributions'),
(totals.0.candidate_contribution, 'Candidate Contributions'),
(totals.0.contributions, 'Total Contributions'),
(totals.0.net_contributions, 'Net Contributions'),
(totals.0.transfers_from_other_authorized_committee, 'Transfer from Authorized Committees'),
(totals.0.loans_made_by_candidate, 'Loans Made by Candidate'),
(totals.0.all_other_loans, 'Other Loans'),
(totals.0.loans, 'Total Loans Received'),
(totals.0.offsets_to_operating_expenditures, 'Offsets to Operating Expenditures'),
(totals.0.other_receipts, 'Other Receipts'),
(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 committee contributions'),
(totals.0.other_political_committee_contributions,'Other committee contributions'),
(totals.0.candidate_contribution, 'Candidate contributions'),
(totals.0.contributions, 'Total contributions'),
(totals.0.net_contributions, 'Net contributions'),
(totals.0.transfers_from_other_authorized_committee, 'Transfer from authorized committees'),
(totals.0.loans_made_by_candidate, 'Loans made by candidate'),
(totals.0.all_other_loans, 'Other loans'),
(totals.0.loans, 'Total loans received'),
(totals.0.offsets_to_operating_expenditures, 'Offsets to operating expenditures'),
(totals.0.other_receipts, 'Other 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.operating_expenditures, 'Operating expenditures'),
(totals.0.net_operating_expenditures, 'Net Operating Expenditures'),
(totals.0.net_operating_expenditures, 'Net operating expenditures'),
(totals.0.transfers_to_other_authorized_committee, 'Transfers to authorized committees'),
(totals.0.loan_repayments_candidate_loans, 'Candidate Loan Repayments'),
(totals.0.loan_repayments_other_loans, 'Other Loan Repayments'),
(totals.0.refunded_individual_contributions, 'Individual Refunds'),
(totals.0.refunded_political_party_committee_contributions, 'Political Party Refunds'),
(totals.0.refunded_other_political_committee_contributions, 'Other Committee Refunds'),
(totals.0.other_disbursements, 'Other Disbursements'),
(totals.0.contribution_refunds, 'Total Contribution refunds'),
(totals.0.loan_repayments_candidate_loans, 'Candidate loan repayments'),
(totals.0.loan_repayments_other_loans, 'Other loan repayments'),
(totals.0.refunded_individual_contributions, 'Individual refunds'),
(totals.0.refunded_political_party_committee_contributions, 'Political party refunds'),
(totals.0.refunded_other_political_committee_contributions, 'Other committee refunds'),
(totals.0.other_disbursements, 'Other disbursements'),
(totals.0.contribution_refunds, 'Total contribution refunds'),
(totals.0.other_disbursements, 'Other disbursements'),
]
%}
Expand Down
54 changes: 27 additions & 27 deletions templates/partials/committee-totals-presidential.html
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
{% with committee=context() %}
{% set table_data = [
(totals.0.federal_funds,'Federal Funds'),
(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 Committee Contributions'),
(totals.0.other_political_committee_contributions,'Other Committee Contributions'),
(totals.0.candidate_contribution, 'Candidate Contributions'),
(totals.0.contributions, 'Total Contributions'),
(totals.0.transfers_from_affiliated_committee, 'Transfer from Affiliated Committees'),
(totals.0.loans_received_from_candidate, 'Loans Made by Candidate'),
(totals.0.other_loans_received, 'Other Loans'),
(totals.0.loans_received, 'Total Loans Received'),
(totals.0.offsets_to_operating_expenditures, 'Offsets to Operating Expenditures'),
(totals.0.offsets_to_fundraising_expenditures, 'Fundraising Offsets'),
(totals.0.offsets_to_legal_accounting, 'Legal and Accounting Offsets'),
(totals.0.total_offsets_to_operating_expenditures, 'Total Offsets'),
(totals.0.other_receipts, 'Other Receipts'),
(totals.0.federal_funds,'Federal funds'),
(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 committee contributions'),
(totals.0.other_political_committee_contributions,'Other committee contributions'),
(totals.0.candidate_contribution, 'Candidate contributions'),
(totals.0.contributions, 'Total contributions'),
(totals.0.transfers_from_affiliated_committee, 'Transfer from affiliated committees'),
(totals.0.loans_received_from_candidate, 'Loans made by candidate'),
(totals.0.other_loans_received, 'Other loans'),
(totals.0.loans_received, 'Total loans received'),
(totals.0.offsets_to_operating_expenditures, 'Offsets to operating expenditures'),
(totals.0.offsets_to_fundraising_expenditures, 'Fundraising offsets'),
(totals.0.offsets_to_legal_accounting, 'Legal and accounting offsets'),
(totals.0.total_offsets_to_operating_expenditures, 'Total offsets'),
(totals.0.other_receipts, 'Other 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.operating_expenditures, 'Operating Expenditures'),
(totals.0.transfers_to_other_authorized_committee, 'Transfers to Authorized Committees'),
(totals.0.repayments_loans_made_by_candidate, 'Candidate Loan Repayments'),
(totals.0.repayments_other_loans, 'Other Loan Repayments'),
(totals.0.loan_repayments_made, 'Total Loan Repayments'),
(totals.0.refunded_individual_contributions, 'Individual Refunds'),
(totals.0.refunded_political_party_committee_contributions, 'Political 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.operating_expenditures, 'Operating expenditures'),
(totals.0.transfers_to_other_authorized_committee, 'Transfers to authorized committees'),
(totals.0.repayments_loans_made_by_candidate, 'Candidate loan repayments'),
(totals.0.repayments_other_loans, 'Other loan repayments'),
(totals.0.loan_repayments_made, 'Total loan repayments'),
(totals.0.refunded_individual_contributions, 'Individual refunds'),
(totals.0.refunded_political_party_committee_contributions, 'Political 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'),

]
%}
Expand Down
4 changes: 2 additions & 2 deletions templates/partials/committee/financial-summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<div class="content__section">
<div class="section__heading">
<h2 class="heading__title" id="section-1-heading">
Financial Summary
Financial summary
{{ select.cycle_select(cycles, cycle) }}
</h2>
</div>
<p>Get the full picture of all of the money received and spent by this committee.</p>
</div>
{% if reports and totals %}
<div class="content__section">
<h3 class="results-info results-info--simple results-info__title">Detailed Summary {{ reports.0.cycle-1 }} - {{ reports.0.cycle }}</h3>
<h3 class="results-info results-info--simple results-info__title">Detailed summary {{ reports.0.cycle-1 }} - {{ reports.0.cycle }}</h3>
<div class="js-accordion">
{% if committee_type == 'P' %}
{% include 'partials/committee-totals-presidential.html' %}
Expand Down

0 comments on commit 41e3a2e

Please sign in to comment.