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

Content edits #695

Merged
merged 7 commits into from
Sep 17, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions candidate.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,51 @@
<h5>Report coverage: {{datetime coverage_start_date}} - {{datetime coverage_end_date}}</h5>
<table>
<tr>
<td>Total Receipts</td>
<td>Total receipts</td>
<td>{{{currency total_receipts_period}}}</td>
</tr>
<tr>
<td>Total Disbursements</td>
<td>Total disbursements</td>
<td>{{{currency total_disbursements_period}}}</td>
</tr>
<tr>
<td>Transfers to Authorized Committees</td>
<td>Transfers to authorized committees</td>
<td>{{{currency transfers_to_other_authorized_committee_period}}}</td>
</tr>
<tr>
<td>Individual Contributions</td>
<td>Individual contributions</td>
<td>{{{currency total_individual_contributions_period}}}</td>
</tr>
<tr>
<td>Itemized Individual Contributions</td>
<td>Itemized individual contributions</td>
<td>{{{currency individual_itemized_contributions_period}}}</td>
</tr>
<tr>
<td>Unitemized Individual Contributions</td>
<td>Unitemized individual contributions</td>
<td>{{{currency individual_unitemized_contributions_period}}}</td>
</tr>
<tr>
<td>Loan Repayments</td>
<td>Loan repayments</td>
<td>{{{currency total_loan_repayments_made_period}}}</td>
</tr>
<tr>
<td>Beginning Cash on Hand</td>
<td>Beginning cash on hand</td>
<td>{{{currency cash_on_hand_beginning_period}}}</td>
</tr>
<tr>
<td>Ending Cash on Hand</td>
<td>Ending cash on hand</td>
<td>{{{currency cash_on_hand_end_period}}}</td>
</tr>
<tr>
<td>Net Contributions</td>
<td>Net contributions</td>
<td>{{{currency net_contributions_period}}}</td>
</tr>
<tr>
<td>Net Operating Expenditures</td>
<td>Net operating expenditures</td>
<td>{{{currency net_operating_expenditures_period}}}</td>
</tr>
<tr>
<td>Debts Owed by Committee</td>
<td>Debts owed by committee</td>
<td>{{{currency debts_owed_by_committee}}}</td>
</tr>
</table>
Expand Down
6 changes: 3 additions & 3 deletions static/js/modules/columns.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ var decoders = require('./decoders');

var sizeInfo = {
0: {limits: [0, 199.99], label: 'Under $200'},
200: {limits: [200, 499.99], label: '$200 - $499'},
500: {limits: [500, 999.99], label: '$500 - $999'},
1000: {limits: [1000, 1999.99], label: '$1000 - $1999'},
200: {limits: [200, 499.99], label: '$200$499'},
500: {limits: [500, 999.99], label: '$500$999'},
1000: {limits: [1000, 1999.99], label: '$1000$1999'},
2000: {limits: [2000, null], label: 'Over $2000'},
};

Expand Down
24 changes: 12 additions & 12 deletions static/templates/filings/candidate.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,51 @@
</div>
<table>
<tr>
<td class="panel__term">Total Receipts</td>
<td class="panel__term">Total receipts</td>
<td>{{{currency total_receipts_period}}}</td>
</tr>
<tr>
<td class="panel__term">Total Disbursements</td>
<td class="panel__term">Total disbursements</td>
<td>{{{currency total_disbursements_period}}}</td>
</tr>
<tr>
<td class="panel__term">Transfers to Authorized Committees</td>
<td class="panel__term">Transfers to authorized committees</td>
<td>{{{currency transfers_to_other_authorized_committee_period}}}</td>
</tr>
<tr>
<td class="panel__term">Individual Contributions</td>
<td class="panel__term">Individual contributions</td>
<td>{{{currency total_individual_contributions_period}}}</td>
</tr>
<tr>
<td class="panel__term">Itemized Individual Contributions</td>
<td class="panel__term">Itemized individual contributions</td>
<td>{{{currency individual_itemized_contributions_period}}}</td>
</tr>
<tr>
<td class="panel__term">Unitemized Individual Contributions</td>
<td class="panel__term">Unitemized individual contributions</td>
<td>{{{currency individual_unitemized_contributions_period}}}</td>
</tr>
<tr>
<td class="panel__term">Loan Repayments</td>
<td class="panel__term">Loan repayments</td>
<td>{{{currency total_loan_repayments_made_period}}}</td>
</tr>
<tr>
<td class="panel__term">Beginning Cash on Hand</td>
<td class="panel__term">Beginning cash on hand</td>
<td>{{{currency cash_on_hand_beginning_period}}}</td>
</tr>
<tr>
<td class="panel__term">Ending Cash on Hand</td>
<td class="panel__term">Ending cash on hand</td>
<td>{{{currency cash_on_hand_end_period}}}</td>
</tr>
<tr>
<td class="panel__term">Net Contributions</td>
<td class="panel__term">Net contributions</td>
<td>{{{currency net_contributions_period}}}</td>
</tr>
<tr>
<td class="panel__term">Net Operating Expenditures</td>
<td class="panel__term">Net operating expenditures</td>
<td>{{{currency net_operating_expenditures_period}}}</td>
</tr>
<tr>
<td class="panel__term">Debts Owed by Committee</td>
<td class="panel__term">Debts owed by committee</td>
<td>{{{currency debts_owed_by_committee}}}</td>
</tr>
</table>
Expand Down
20 changes: 10 additions & 10 deletions static/templates/filings/pac.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,43 @@
</div>
<table>
<tr>
<td class="panel__term">Total Receipts</td>
<td class="panel__term">Total receipts</td>
<td>{{{currency total_receipts_period}}}</td>
</tr>
<tr>
<td class="panel__term">Total Disbursements</td>
<td class="panel__term">Total disbursements</td>
<td>{{{currency total_disbursements_period}}}</td>
</tr>
<tr>
<td class="panel__term">Individual Contributions</td>
<td class="panel__term">Individual contributions</td>
<td>{{{currency total_individual_contributions_period}}}</td>
</tr>
<tr>
<td class="panel__term">Itemized Individual Contributions</td>
<td class="panel__term">Itemized individual contributions</td>
<td>{{{currency individual_itemized_contributions_period}}}</td>
</tr>
<tr>
<td class="panel__term">Unitemized Individual Contributions</td>
<td class="panel__term">Unitemized individual contributions</td>
<td>{{{currency individual_unitemized_contributions_period}}}</td>
</tr>
<tr>
<td class="panel__term">Beginning Cash on Hand</td>
<td class="panel__term">Beginning cash on hand</td>
<td>{{{currency cash_on_hand_beginning_period}}}</td>
</tr>
<tr>
<td class="panel__term">Ending Cash on Hand</td>
<td class="panel__term">Ending cash on hand</td>
<td>{{{currency cash_on_hand_end_period}}}</td>
</tr>
<tr>
<td class="panel__term">Net Contributions</td>
<td class="panel__term">Net contributions</td>
<td>{{{currency net_contributions_period}}}</td>
</tr>
<tr>
<td class="panel__term">Net Operating Expenditures</td>
<td class="panel__term">Net operating expenditures</td>
<td>{{{currency net_operating_expenditures_period}}}</td>
</tr>
<tr>
<td class="panel__term">Debts Owed by Committee</td>
<td class="panel__term">Debts owed by committee</td>
<td>{{{currency debts_owed_by_committee}}}</td>
</tr>
</table>
Expand Down
6 changes: 3 additions & 3 deletions templates/committees-single.html
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
10 changes: 5 additions & 5 deletions templates/partials/committee-charts.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="content__section--extra">
<figure class="chart-container chart--r-d">
<div class="chart__header">
<h3 class="chart__title">Receipts and Disbursements</h3>
<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 @@ -29,9 +29,9 @@ <h3 class="chart__title">Receipts and Disbursements</h3>
<div class="content__section">
<figure class="chart-container chart--c-d">
<div class="chart__header">
<h3 class="chart__title">Cash and Debt</h3>
<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--cash"></span> Ending cash on hand</li>
<li class="chart__key__item"><span class="swatch data--debt"></span> Debt</li>
</ul>
</div>
Expand Down
28 changes: 14 additions & 14 deletions templates/partials/committee-financial-summaries.html
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
<section class="page-section" id="section-2" role="tabpanel" aria-hidden="true" aria-labelledby="section-2-header">
<div class="container">
<h2 id="section-2-header" tabindex="0">Financial Summaries</h2>
<h2 id="section-2-header" tabindex="0">Financial summaries</h2>
<div class="page-subsection">
<h3 class="figure__title">Reports filed in 2012-2014</h3>
<h3 class="figure__title">Reports filed 2012-2014</h3>
<table>
<thead>
<th class="sort-header">Report Year</th>
<th class="sort-header">Report Type</th>
<th class="sort-header">Total Receipts</th>
<th class="sort-header">Total Disbursements</th>
<th class="sort-header">Cash on Hand</th>
<th class="sort-header">Report year</th>
<th class="sort-header">Report type</th>
<th class="sort-header">Total receipts</th>
<th class="sort-header">Total disbursements</th>
<th class="sort-header">Cash on hand</th>
<th class="sort-header">Debt</th>
</thead>
<tbody>
<tr>
<td>2014</td>
<td><a href="#">Pre-General</a></td>
<td><a href="#">Pre-general</a></td>
<td>$0</td>
<td>$0</td>
<td>$0</td>
<td>$0</td>
</tr>
<tr>
<td>2014</td>
<td><a href="#">Pre-General</a></td>
<td><a href="#">Pre-general</a></td>
<td>$0</td>
<td>$0</td>
<td>$0</td>
<td>$0</td>
</tr>
<tr>
<td>2014</td>
<td><a href="#">Pre-General</a></td>
<td><a href="#">Pre-general</a></td>
<td>$0</td>
<td>$0</td>
<td>$0</td>
<td>$0</td>
</tr>
<tr>
<td>2014</td>
<td><a href="#">Pre-General</a></td>
<td><a href="#">Pre-general</a></td>
<td>$0</td>
<td>$0</td>
<td>$0</td>
Expand All @@ -51,14 +51,14 @@ <h3 class="figure__title">Reports filed in 2012-2014</h3>
<div class="page-subsection">
<div class="row">
<div class="chunk--half">
<h3>Report Summary</h3>
<h3>Report summary</h3>
<p class="text--lead">Detailed view of this committee’s finances in the selected time period.</p>
</div>
<div class="chunk--half meta-box figure-group__controls">
<div class="chunk--half">
<label>Select a reporting period</label>
<select class="chosen-select">
<option>Two-Year Summary</option>
<option>Two-year summary</option>
<option>October 2014</option>
</select>
</div>
Expand All @@ -72,4 +72,4 @@ <h3>Report Summary</h3>
</div>
</div>
</div>
</section>
</section>
42 changes: 21 additions & 21 deletions templates/partials/committee-report-house-senate.html
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
Loading