Skip to content
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
36 changes: 18 additions & 18 deletions public/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@
),
re_path(r"^person/.*\-(?P<person_id>[0-9A-Za-z]+)/$", person, name="person-detail"),
# bills
re_path(
r"^(?P<state>{})/bills/$".format(state_abbr_pattern),
BillList.as_view(),
name="bills",
),
# has trailing slash for consistency
re_path(
r"^(?P<state>{})/bills/feed/$".format(state_abbr_pattern),
BillListFeed.as_view(),
name="bills_feed",
),
re_path(
r"^(?P<state>{})/bills/(?P<session>[-\w ]+)/(?P<bill_id>[-\w\. ]+)/$".format(
state_abbr_pattern
),
bill,
name="bill",
),
# re_path(
# r"^(?P<state>{})/bills/$".format(state_abbr_pattern),
# BillList.as_view(),
# name="bills",
# ),
# # has trailing slash for consistency
# re_path(
# r"^(?P<state>{})/bills/feed/$".format(state_abbr_pattern),
# BillListFeed.as_view(),
# name="bills_feed",
# ),
# re_path(
# r"^(?P<state>{})/bills/(?P<session>[-\w ]+)/(?P<bill_id>[-\w\. ]+)/$".format(
# state_abbr_pattern
# ),
# bill,
# name="bill",
# ),
re_path(r"^vote/(?P<vote_id>[-0-9a-f]+)/$", vote, name="vote-detail"),
# fallbacks
path("reportcard/", fallback),
Expand Down
34 changes: 0 additions & 34 deletions templates/public/components/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,7 @@
{% if state_nav != "disabled" %}
<div class="navigation">
<div class="grid-container">
<div class="navigation__container">

<div class="navigation__section navigation__select-wrapper">
<select class="navigation__select" onchange="window.location.href = '/' + this.value">
{% if not state %}
<option value="">Select a state</option>
{% endif %}
{% for st in states %}
<option value="{{ st.abbr|lower }}" {% if st.abbr|lower == state %}selected{% endif %}>{{ st.name }}</option>
{% endfor %}
</select>
</div>

<ul class="navigation__section navigation__menu">
{% if state %}
<li><a {% if state_nav == "overview" %} class="is-active" {% endif %} href="{% url 'state' state %}">Overview </a></li>
<li><a {% if state_nav == "legislators" %} class="is-active" {% endif %} href="{% url 'legislators' state %}">Legislators</a></li>
<li><a {% if state_nav == "bills" %} class="is-active" {% endif %} href="{% url 'bills' state %}">Bills</a></li>
{% endif %}
</ul>

<form action="/search/" id="header__search">
<div class="input-group">
<input class="input-group-field" type="search" placeholder="Search bills and legislators..." name="query">
{% if state %}
<input type="hidden" name="state" value="{{ state }}">
{% endif %}
<div class="input-group-button">
<button type="submit" class="button button--secondary">
Search
</button>
</div>
</div>
</form>
</div>
</div>

</div>
Expand Down
46 changes: 9 additions & 37 deletions templates/public/views/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,50 +15,22 @@
<section class="section" id="homepage-section">
<div class="homepage-hero">
<div style="padding: .75rem 1.25rem; border: 1px solid #ffeeba; background-color: #fff3cd; margin-bottom: 1rem;">
Open States is now Plural! The Open States website is now available at <a>open.pluralpolicy.com</a>.<br>
You are welcome to continue using these tools while we prepare a migration process to help you adopt our new tools.<br>
You can try out an account using those new and improved tools now, at <a>https://pluralpolicy.com/get-started/</a>
Open States is now Plural / SAI360!<br>
This site still exists primarily for Open API users to manage API key registration.<br>
Most other tools here are now disabled, in favor of our newer policy tracking application.<br>
You can try out an account using those new and improved tools now, at <a href="https://pluralpolicy.com/get-started/">Get Started with Plural</a><br>
<br>
Free <strong>Bill Search</strong> and <strong>Find Your Legislator</strong> features still available at <a href="https://pluralpolicy.com/open/"><strong>Plural Open</strong></a>
</div>
<h1 class="heading--large">Discover Politics In Your State and Congress</h1>
<p class="heading--small">Track bills, review upcoming legislation, and see how your local and federal representatives are voting.</p>
<p class="heading--small">Open States is the leading source for truly open data on policy-making process and legislation.</p>
<!-- <h1 class="heading&#45;&#45;large">Discover Politics In Your State and Congress</h1>-->
<!-- <p class="heading&#45;&#45;small">Track bills, review upcoming legislation, and see how your local and federal representatives are voting.</p>-->
<!-- <p class="heading&#45;&#45;small">Open States is the leading source for truly open data on policy-making process and legislation.</p>-->

<!-- <div class="site-alert"> </div> -->

</div>

<div class="homepage-grid">
<div class="text-center">
<h2 class="heading--medium">Search &amp; Track Legislation</h2>
<img src="{% static "images/nounproject/political_2003975.svg" %}">
<form action="/search/">
<div class="input-group">
<input class="input-group-field" type="search" placeholder="Coronavirus, Transportation, etc." name="query">
<div class="input-group-button">
<input type="submit" class="button button--primary" value="Search">
</div>
</div>
</form>
</div>

<div class="text-center">
<h2 class="heading--medium">Find Your Legislators</h2>
<img src="{% static "images/nounproject/people_2911761.svg" %}">
<form action="/find_your_legislator/">
<div class="fyl-row">
<div class="input-group">
<input class="input-group-field" type="search" placeholder="Enter Address" name="address">
<div class="input-group-button">
<input type="submit" class="button button--primary" value="Search">
</div>
</div>

<div class="fyl-locate">
<input type="submit" id="locate" class="button button--primary" name="geolocate" value="Use Current Location">
</div>
</div>
</form>
</div>

<div class="text-center">
<hr>
Expand Down
14 changes: 7 additions & 7 deletions web/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
),
path("tos/", TemplateView.as_view(template_name="flat/tos.html")),
path("api/registered/", TemplateView.as_view(template_name="flat/registered.html")),
re_path(
"^api/v1",
RedirectView.as_view(
url="https://docs.openstates.org/api-v3/",
permanent=True,
),
),
# re_path(
# "^api/v1",
# RedirectView.as_view(
# url="https://docs.openstates.org/api-v3/",
# permanent=True,
# ),
# ),
]


Expand Down
Loading