Commit 72fd6fa1 authored by okhin's avatar okhin

Merge branch 'search' into 'master'

Updating the search form



See merge request !3
parents 590c397e 9753f518
......@@ -14,13 +14,14 @@
</ul>
<h3>{% trans "Initiators" %}</h3>
<ul>
<li class="logo-org"><img alt="BoF logo" src="{%media_url%}/img/bof.png" /><a href="http://www.bof.nl">Bits of Freedom</a></li>
<li class="logo-org"><img alt="BoF logo" src="{%media_url%}/img/bof.png" /><a href="https://www.bof.nl">Bits of Freedom</a></li>
<li class="logo-org"><img alt="LQDN logo" src="{%media_url%}/img/lqdn.png" /><a href="https://www.laquadrature.net/">La Quadrature du Net</a></li>
</ul>
<h3>{% trans "Supporters" %}</h3>
<ul>
<li class="logo-org"><img alt="ORG logo" src="{%media_url%}/img/org.png" /><a href="http://www.openrightsgroup.org/">Open Rights Group</a></li>
<li class="logo-org"><img alt="ORG logo" src="{%media_url%}/img/org.png" /><a href="https://www.openrightsgroup.org/">Open Rights Group</a></li>
<li class="logo-org"><img alt="NURPA logo" src="{%media_url%}/img/nurpa.png" width="80" style="text-align: center; background:#446688"/><br /><a href="http://nurpa.be"><small>Net Users' Rights Protection Association</small></a></li>
<li class="logo-org"><img alt="XNet logo" src="{%media_url%}/img/xnet.png" /><a href="https://xnet-x.net/">X&nbsp;Net</a></li>
</ul>
</div>
{% endblock %}
......@@ -41,6 +41,7 @@
<li><a {% block active_tab_cases %}{% endblock %} href="{% url 'list_violations' %}">{% trans "Cases" %}</a></li>
<li><a {% block active_tab_about %}{% endblock %} href="{%root_url%}/about">{% trans "What is Net Neutrality?" %}</a></li>
<li><a {% block active_tab_start %}{% endblock %} href="{%root_url%}/start">{% trans "Start Monitoring" %}</a></li>
<li><a {% block active_tab_search %}{% endblock %} href="{%root_url%}/search">{% trans "Search" %}</a></li>
<li><a {% block active_tab_contact %}{% endblock %} href="{%root_url%}/contact">{% trans "Contact" %}</a></li>
</ul></div>
</div>
......
{% extends 'base.html' %}
{% load bt %}
{% load i18n %}
{% block active_tab_home %}id="current"{% endblock %}
{% block active_tab_search %}id="current"{% endblock %}
{% block styles %}
<link rel="stylesheet" href="{{ MEDIA_URL }}/css/map.css" type="text/css" />
{% endblock %}
......@@ -75,15 +75,8 @@
{% trans "Search through cases" %}
<div id="map"> </div>
<form method="get" action=".">
<table>
{{ form.as_table }}
<tr>
<td>&nbsp;</td>
<td>
<input type="submit" value="Search">
</td>
</tr>
</table>
{{ form.as_p }}
<input type="submit" value="Search">
</form>
{% if query %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment