Simplify candidate/committee 2-year-select macros

fecgov · Aug 29, 2018 · a9c5787 · a9c5787
1 parent 909c1b1
commit a9c5787
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 23 deletions.
diff --git a/fec/data/templates/macros/cycle-select.jinja b/fec/data/templates/macros/cycle-select.jinja
@@ -27,22 +27,7 @@
 {% endif %}
 {% endmacro %}
 
-{% macro candidate_cycle_select(cycles, cycle=none, id='') %}
-{% set cycle = cycle | int %}
-  <div class="content__section">
-    <label for="{{id}}-cycle" class="label cycle-select__label">Election</label>
-    <select id="{{id}}-cycle" class="js-cycle" name="cycle" data-cycle-location="query" data-election-full="False">
-      {% for each in cycles | sort(reverse=True) %}
-        <option
-            value="{{ each }}"
-            {% if cycle and cycle <= each and cycle > (each - 2) %}selected{% endif %}
-          >{{ each }}</option>
-      {% endfor %}
-    </select>
-  </div>
-{% endmacro %}
-
-{% macro committee_cycle_select(cycles, cycle=none, id='') %}
+{% macro two_year_select(cycles, cycle=none, id='') %}
 {% set cycle = cycle | int %}
   <div class="row content__section">
     <div class="cycle-select">

diff --git a/fec/data/templates/partials/candidate/raising.jinja b/fec/data/templates/partials/candidate/raising.jinja
@@ -5,7 +5,7 @@
 
   <div class="slab slab--inline slab--neutral u-padding--left u-padding--right">
 
-    {{ select.candidate_cycle_select(cycles, cycle, id="cycle-5") }}
+    {{ select.two_year_select(cycles, cycle, id="cycle-5") }}
 
     {% if committee_groups['P'] or committee_groups['A']%}
       <span class="t-sans t-bold">Data is included from these committees:</span>

diff --git a/fec/data/templates/partials/candidate/spending.jinja b/fec/data/templates/partials/candidate/spending.jinja
@@ -7,7 +7,7 @@
 
   <div class="slab slab--inline slab--neutral u-padding--left u-padding--right">
 
-    {{ select.candidate_cycle_select(cycles, cycle, id="cycle-4") }}
+    {{ select.two_year_select(cycles, cycle, id="cycle-4") }}
 
     {% if committee_groups['P'] or committee_groups['A']%}
     <span class="t-sans t-bold">Data is included from these committees:</span>

diff --git a/fec/data/templates/partials/committee/about-committee.jinja b/fec/data/templates/partials/committee/about-committee.jinja
@@ -3,7 +3,7 @@
 <section id="section-2" role="tabpanel" aria-hidden="true" aria-labelledby="section-2-heading">
   <h2 id="section-2-heading">About this committee</h2>
   <div class="slab slab--inline slab--neutral u-padding--left u-padding--right">
-    {{ select.committee_cycle_select(cycles, cycle, 'about')}}
+    {{ select.two_year_select(cycles, cycle, 'about')}}
     <div class="entity__figure row">
       <h3 class="heading--section">Committee information</h3>
       <table class="t-sans usa-width-three-fourths">

diff --git a/fec/data/templates/partials/committee/filings.jinja b/fec/data/templates/partials/committee/filings.jinja
@@ -6,7 +6,7 @@
     Committee filings
   </h2>
   <div class="slab slab--inline slab--neutral u-padding--left u-padding--right">
-    {{ select.committee_cycle_select(cycles, cycle, 'filings')}}
+    {{ select.two_year_select(cycles, cycle, 'filings')}}
     {% if has_raw_filings %}
       {{ entity.raw_filings_table(cycle, committee_id, min_receipt_date) }}
     {% endif %}

diff --git a/fec/data/templates/partials/committee/financial-summary.jinja b/fec/data/templates/partials/committee/financial-summary.jinja
@@ -5,7 +5,7 @@
 <section id="section-1" role="tabpanel" aria-hidden="true" aria-labelledby="section-1-heading">
   <h2 id="section-1-heading">Financial summary</h2>
   <div class="slab slab--inline slab--neutral u-padding--left u-padding--right">
-    {{ select.committee_cycle_select(cycles, cycle, 'summary')}}
+    {{ select.two_year_select(cycles, cycle, 'summary')}}
     {% if reports and totals %}
       {% if committee_type == 'I' %}
         <div class="entity__figure">

diff --git a/fec/data/templates/partials/committee/raising.jinja b/fec/data/templates/partials/committee/raising.jinja
@@ -13,7 +13,7 @@
 <section id="section-3" role="tabpanel" aria-hidden="true" aria-labelledby="section-3-heading">
   <h2 id="section-3-heading">Raising</h2>
   <div class="slab slab--inline slab--neutral u-padding--left u-padding--right">
-    {{ select.committee_cycle_select(cycles, cycle, 'receipts')}}
+    {{ select.two_year_select(cycles, cycle, 'receipts')}}
     {% if totals and committee_type not in ['C', 'E', 'I'] %}
       <div id="total-receipts" class="entity__figure row">
         <div class="heading--section heading--with-action">

diff --git a/fec/data/templates/partials/committee/spending.jinja b/fec/data/templates/partials/committee/spending.jinja
@@ -12,7 +12,7 @@
 <section id="section-4" role="tabpanel" aria-hidden="true" aria-labelledby="section-4-heading">
   <h2 id="section-4-heading">Spending</h2>
   <div class="slab slab--inline slab--neutral u-padding--left u-padding--right">
-    {{ select.committee_cycle_select(cycles, cycle, 'disbursements')}}
+    {{ select.two_year_select(cycles, cycle, 'disbursements')}}
 
     {% if totals and committee_type not in ['C', 'E', 'I'] %}
     <div id="total-disbursements" class="entity__figure row">