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

Updating election widgets and nav #615

Merged
merged 2 commits into from
Sep 10, 2015
Merged

Updating election widgets and nav #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da8c365
Updating election widgets and nav
Sep 10, 2015
b1a04fb
Updating error page search test
Sep 10, 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
12 changes: 6 additions & 6 deletions templates/election-lookup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ <h2 class="t-ruled--bottom t-ruled--bold">Search</h2>
<div class="search-controls__row">
<div class="search-controls__either">
<label for="zip" class="label">Find by zip code</label>
<div class="combo">
<input class="combo__input" type="text" id="zip" name="zip" placeholder="e.g. 10001">
<button type="submit" class="combo__button button--search button--neutral"><span class="u-visually-hidden">Search</span></button>
</div>
<input class="form-element--inline" type="text" id="zip" name="zip" placeholder="e.g. 10001">
<button type="submit" class="form-element--inline button--search--text button--neutral">Search</button>
</div>
<div class="search-controls__or search-controls__or--vertical">or</div>
<div class="search-controls__either">
<span class="label">Find by state and district</span>
<div class="row">
<div class="content__section">
<select class="form-element--inline" id="state" name="state" aria-label="Select a state">
<option value="">Select state</option>
{% for value, label in constants.states.items() %}
<option value="{{ value }}">{{ label }}</option>
{% endfor %}
</select>
</div>
<div class="row">
<select class="form-element--inline" id="district" name="district" aria-label="Select a district">
<option value="">Select district</option>
{% for value in range(1, 100) %}
Expand All @@ -43,7 +43,7 @@ <h2 class="t-ruled--bottom t-ruled--bold">Search</h2>
{% endwith %}
{% endfor %}
</select>
<button type="submit" class="form-element--inline button--search button--neutral"><span class="u-visually-hidden">Search</span></button>
<button type="submit" class="form-element--inline button--search--text button--neutral">Search</button>
</div>
</div>
</div>
Expand Down
19 changes: 11 additions & 8 deletions templates/partials/navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,33 @@
<label for="dropdown-toggle-1" class="site-nav__link nav-toggle__label">Campaign finance data</label>
<ul class="site-nav__dropdown">
<li class="site-nav__item u-under-lg-only">
<a class="site-nav__link" href="/">Campaign finance data home &raquo;</a>
<a class="site-nav__link" href="/">Campaign finance data home</a>
</li>
<li class="site-nav__item">
<a class="site-nav__link" href="/elections">Search elections by location &raquo;</a>
<a class="site-nav__link" href="/elections">Search elections by location</a>
</li>
<li class="site-nav__item">
<a class="site-nav__link" href="{{ url_for('candidates', cycle=default_cycles) }}">Browse candidates &raquo;</a>
<span class="h3 site-nav__subtitle">Browse:</span>
</li>
<li class="site-nav__item">
<a class="site-nav__link" href="{{ url_for('committees', cycle=default_cycles) }}">Browse committees &raquo;</a>
<a class="site-nav__link" href="{{ url_for('candidates', cycle=default_cycles) }}">Candidates</a>
</li>
<li class="site-nav__item">
<a class="site-nav__link" href="{{ url_for('filings') }}">Browse filings &raquo;</a>
<a class="site-nav__link" href="{{ url_for('committees', cycle=default_cycles) }}">Committees</a>
</li>
<li class="site-nav__item">
<a class="site-nav__link" href="{{ url_for('receipts', is_individual='true') }}">Browse receipts &raquo;</a>
<a class="site-nav__link" href="{{ url_for('filings') }}">Filings</a>
</li>
<li class="site-nav__item">
<a class="site-nav__link" href="{{ url_for('disbursements') }}">Browse disbursements &raquo;</a>
<a class="site-nav__link" href="{{ url_for('receipts', is_individual='true') }}">Receipts</a>
</li>
<li class="site-nav__item">
<a class="site-nav__link" href="{{ url_for('disbursements') }}">Disbursements</a>
</li>
</ul>
</li>
<li class="site-nav__item">
<a href="{{ cms_url }}/registration-and-reporting" class="site-nav__link">Registration &amp; reporting</a>
<a href="{{ cms_url }}/registration-and-reporting" class="site-nav__link">Registration and reporting</a>
</li>
<li class="site-nav__item">
<a href="#" class="site-nav__link is-disabled">Calendar</a>
Expand Down
115 changes: 59 additions & 56 deletions templates/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,73 +65,76 @@ <h2 class="card__title">Disbursement Data</h2>
</div>
</div>
</div>

<div class="content__section--extra">
<div id="election-preview" class="widget widget--neutral">
<div class="row">
<div class="icon-heading">
<img class="icon-heading__image" src="/static/img/i-elections--primary.svg" alt="Icon representing filings">
<h2 class="icon-heading__title widget__title"><span class="t-short">Find elections by location</span></h2>
</div>
</div>
<form action="{{ url_for('election_lookup') }}" class="widget__content">
</div>
<div class="content__section--extra">
<div class="slab slab--neutral">
<div class="container">
<div id="election-preview" class="widget widget--neutral">
<div class="row">
<label class="label" for="cycle-select">Choose an election cycle</label>
{{ select.cycle_select(cycles, location='form') }}
</div>
<div class="row content__section--ruled">
<label for="zip" class="label">Find by zip code</label>
<div class="combo">
<input class="combo__input" type="text" id="zip" name="zip" placeholder="e.g. 10001">
<button type="submit" class="combo__button button--search button--primary-contrast"><span class="u-visually-hidden">Search</span></button>
<div class="icon-heading">
<img class="icon-heading__image" src="/static/img/i-elections--primary.svg" alt="Icon representing filings">
<h2 class="icon-heading__title widget__title"><span class="t-short">Find elections by location</span></h2>
</div>
</div>
<div class="search-controls__or">or</div>
<div class="content__section">
<span class="label">Find by state and district</span>
<select class="form-element--inline" id="state" name="state" aria-label="Select a state">
<option value="">Select state</option>
{% for value, label in constants.states.items() %}
<option value="{{ value }}">{{ label }}</option>
{% endfor %}
</select>
</div>
<div class="row">
<select class="form-element--inline" id="district" name="district" aria-label="Select a district">
<option value="">Select district</option>
{% for value in range(1, 100) %}
{% with formatted = '{0:02d}'.format(value) %}
<option value="{{ formatted }}">{{ formatted }}</option>
{% endwith %}
{% endfor %}
</select>
<button type="submit" class="form-element--inline button--search button--primary-contrast"><span class="u-visually-hidden">Search</span></button>
</div>
<form action="{{ url_for('election_lookup') }}" class="widget__content">
<div class="row">
<label class="label" for="cycle-select">Choose an election cycle</label>
{{ select.cycle_select(cycles, location='form') }}
</div>
<div class="row content__section--ruled">
<label for="zip" class="label">Find by zip code</label>
<input class="form-element--inline" type="text" id="zip" name="zip" placeholder="e.g. 10001">
<button type="submit" class="form-element--inline button--search--text button--primary-contrast">Search</button>
</div>
<div class="search-controls__or">or</div>
<div class="content__section">
<span class="label">Find by state and district</span>
<select class="form-element--inline" id="state" name="state" aria-label="Select a state">
<option value="">Select state</option>
{% for value, label in constants.states.items() %}
<option value="{{ value }}">{{ label }}</option>
{% endfor %}
</select>
</div>
<div class="row">
<select class="form-element--inline" id="district" name="district" aria-label="Select a district">
<option value="">Select district</option>
{% for value in range(1, 100) %}
{% with formatted = '{0:02d}'.format(value) %}
<option value="{{ formatted }}">{{ formatted }}</option>
{% endwith %}
{% endfor %}
</select>
<button type="submit" class="form-element--inline button--search--text button--primary-contrast">Search</button>
</div>
</form>
</div>
</form>

<div class="widget widget--neutral">
<h2 class="widget__title"><span class="t-short">Right now in the 2016 presidential election:</span></h2>
<div class="widget__content">
<div>
<h5 class="t-data-header">Candidates Running</h5>
<span class="t-big-data">[number]</span>
</div>
<div>
<h5 class="t-data-header">Funds raised</h5>
<span class="t-big-data">$[number]</span>
</div>
<div>
<h5 class="t-data-header">Funds spent</h5>
<span class="t-big-data">$[number]</span>
<div class="widget widget--neutral">
<h2 class="widget__title"><span class="t-short">Right now in the 2016 presidential election:</span></h2>
<div class="widget__content">
<div>
<h5 class="t-data-header">Candidates Running</h5>
<span class="t-big-data">[number]</span>
</div>
<div>
<h5 class="t-data-header">Funds raised</h5>
<span class="t-big-data">$[number]</span>
</div>
<div>
<h5 class="t-data-header">Funds spent</h5>
<span class="t-big-data">$[number]</span>
</div>
<a href="" class="button--election button--neutral">Compare candidates in this election</a>
</div>
<a href="" class="button--election button--neutral">Compare candidates in this election</a>
</div>
</div>
</div>
</div>

<div class="container">
<div class="content__section--extra">
<div class="row">
<div class="row t-ruled--bottom">
<div class="icon-heading">
<img class="icon-heading__image" src="/static/img/i-filings--primary.svg" alt="Icon representing filings">
<h2 class="icon-heading__title">Most recent filings submitted</h2>
Expand Down
2 changes: 1 addition & 1 deletion tests/selenium/error_page_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ def testErrorPageSearch(self):
self.driver.get(self.url)
main = self.driver.find_element_by_tag_name('main')
main.find_element_by_class_name('js-search-input').send_keys('obama')
main.find_element_by_class_name('button--primary').click()
main.find_element_by_class_name('button--search').click()

self.elementExistsByClassName('tst-search_results')