Merge branch 'master' of git.laquadrature.net:la-quadrature-du-net/respect-my-net into nav

ed762815 · Okhin · f4f44026 · 51b2a3ea · ed762815 · ed762815
Commit ed762815 authored Feb 18, 2016 by Okhin
14 changed files
--- a/bt/forms.py
+++ b/bt/forms.py
@@ -66,3 +66,6 @@ class SearchViolation(SearchForm):
           sqs = sqs.filter(country=self.cleaned_data['country'])

       return sqs
+
+class QuickSearchViolation(forms.Form):
+    query = forms.CharField(required='True', max_length=256, label=_("Search"), help_text=_('Search for an existing violation'))
--- a/bt/views.py
+++ b/bt/views.py
@@ -145,7 +145,7 @@ class JSONMixin(object):
    def get(self, request, *args, **kwargs):
        qs = self.get_queryset()
        if qs.count():
-            return HttpResponse(json.dumps(sorted([(x.object.id, x.object.resource_name) for x in qs])))
+            return HttpResponse(json.dumps(sorted([(x.id, x.resource_name) for x in qs])))
        else:
            return HttpResponse('')


--- a/nnmon/static/img/org.png
+++ b/nnmon/static/img/org.png
--- a/nnmon/static/img/xnet.png
+++ b/nnmon/static/img/xnet.png
--- a/nnmon/static/js/d3.min.js
+++ b/nnmon/static/js/d3.min.js
--- a/nnmon/static/js/datamaps.js
+++ b/nnmon/static/js/datamaps.js
--- a/nnmon/static/js/jquery-1.11.3.min.js
+++ b/nnmon/static/js/jquery-1.11.3.min.js
--- a/nnmon/static/js/jquery-1.12.0.min.js
+++ b/nnmon/static/js/jquery-1.12.0.min.js
--- a/nnmon/static/js/jquery.min.js
+++ b/nnmon/static/js/jquery.min.js
-jquery-1.11.3.min.js
\ No newline at end of file
+jquery-1.12.0.min.js
\ No newline at end of file
--- a/nnmon/static/js/jquery.tablesorter.js
+++ b/nnmon/static/js/jquery.tablesorter.js
--- a/nnmon/templates/about.html
+++ b/nnmon/templates/about.html
-{% extends "base.html" %}
-{% load bt %}
-{% load i18n %}
-{% block active_tab_contact %}id="current"{% endblock %}
-{% block content %}
-<div id='global'>
-   <p>{% trans "RespectMyNet.eu is an online platform enabling citizens to become the watchmen of the Internet by reporting Net Neutrality violations. Everyone is invited to report undue blocking or throttling of their Internet access, and help  name and shame operators' harmful practices." %}</p>
-<p>{% trans "This platform is a joint project by La Quadrature du Net, Bits of Freedom and individual contributors. It was launched on September 22nd, 2011." %}</p>
-<p>{% trans "Organisations will submit reports to national and EU regulatory authorities if appropriate." %}</p>
-<p>{% trans "For enquiries about the project, please contact:" %}</p>
-<ul class="with-disc">
-<li>{% trans "France" %}: <a href="http://www.laquadrature.net/">La Quadrature du Net</a> &ndash; contact[a]laquadrature.net</li>
-<li>{% trans "Netherlands" %}: <a href="https://www.bof.nl/">Bits of Freedom</a> &ndash; info[a]bof.nl</li>
-</ul>
-<h3>{% trans "Initiators" %}</h3>
-<ul>
-   <li class="logo-org"><img alt="BoF logo" src="/static/img/bof.png" /><a href="https://www.bof.nl">Bits of Freedom</a></li>
-   <li class="logo-org"><img alt="LQDN logo" src="/static/img/lqdn.png" /><a href="https://www.laquadrature.net/">La Quadrature du Net</a></li>
-   <li class="logo-org"><img alt="ORG logo" src="/static/img/org.png" /><a href="https://www.openrightsgroup.org/">Open Rights Group</a></li>
-   <li class="logo-org"><img alt="NURPA logo" src="/static/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="/static/img/xnet.png" /><a href="https://xnet-x.net/">X&nbsp;Net</a></li>
-   <li class="logo-org"><img alt="EDRI logo" src="/static/img/edri.png" /><a href="https://edri.org/">X&nbsp;Net</a></li>
-</ul>
-</div>
-{% endblock %}
--- a/nnmon/templates/base.html
+++ b/nnmon/templates/base.html
-{% load i18n %}{% load bt %}<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-/W3C/DTD XHTML 1.0 Strict/EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="{{LANGUAGE_CODE}}" xml:lang="{{LANGUAGE_CODE}}">
+{% load i18n %}
+{% load bt %}
+<html>
 <head>
    <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
    <meta http-equiv="content-language" content="en" />
@@ -23,27 +23,36 @@
 <div id="header">
   <h1><a href="{% url 'homepage' %}">Respect My Net <span>{% trans "name and shame operators restricting access to the Internet" %}</span></a></h1>

-  <div id="user"><p>
-	{% if user.is_authenticated %}
-		{{ user.username }},
-      <a href="{%root_url%}/accounts/logout">{% trans "Logout" %}</a>
-      <span>or</span>
-      <a href="{%root_url%}/admin/">{% trans "Admin" %}</a>
-      {% block adminext %}
-      {% endblock %}
-	{% else %}
-      <a href="{%root_url%}/admin/" id="login">{% trans "Login" %}</a>
-   {% endif %}
-  </p></div>
+  <div id="user">
+    <p>
+      {% if user.is_authenticated %}
+	{{ user.username }},
+        <a href="{%root_url%}/accounts/logout">{% trans "Logout" %}</a>
+        <span>or</span>
+        <a href="{%root_url%}/admin/">{% trans "Admin" %}</a>
+        {% block adminext %}
+        {% endblock %}
+      {% else %}
+        <a href="{%root_url%}/admin/" id="login">{% trans "Login" %}</a>
+      {% endif %}
+    </p>
+  </div>

  <ul id="nav">
-     <li><a {% block active_tab_home %}{% endblock %} href="{% url 'homepage' %}">{% trans "Home" %}</a></li>
     <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>
+     <li>
+       <form action="/search/" method="get">
+         <span>
+           <label for="quick_q" class="quick"></label>
+           <input name="q" id="quick_q" class="quick">
+           <input type="submit" value="Search">
+	 </span>
+       </form>
+     </li>
+  </ul>
+</div>
 </div>
 </div>

@@ -53,6 +62,15 @@
 {% endblock %}
 <div id='footer'>
 {% block footer %}
+  <p>{% trans "RespectMyNet.eu is an online platform enabling citizens to become the watchmen of the Internet by reporting Net Neutrality violations. Everyone is invited to report undue blocking or throttling of their Internet access, and help  name and shame operators' harmful practices." %}</p>
+  <ul>
+    <li class="logo-org"><img alt="BoF logo" src="/static/img/bof.png" /><a href="https://www.bof.nl">Bits of Freedom</a></li>
+    <li class="logo-org"><img alt="LQDN logo" src="/static/img/lqdn.png" /><a href="https://www.laquadrature.net/">La Quadrature du Net</a></li>
+    <li class="logo-org"><img alt="ORG logo" src="/static/img/org.png" /><a href="https://www.openrightsgroup.org/">Open Rights Group</a></li>
+    <li class="logo-org"><img alt="NURPA logo" src="/static/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="/static/img/xnet.png" /><a href="https://xnet-x.net/">X&nbsp;Net</a></li>
+    <li class="logo-org"><img alt="EDRI logo" src="/static/img/edri.png" /><a href="https://edri.org/">EDRI</a></li>
+  </ul>
 {% endblock %}
 </div>
 {% block scripts %}

--- a/nnmon/templates/list.html
+++ b/nnmon/templates/list.html
@@ -16,17 +16,17 @@
     var country="{{country}}";
     $(document).ready(function() {
       $.tablesorter.addParser({
-           / set a unique id
+           /// set a unique id
           id: 'stateparser',
           is: function(s) {
-               / return false so this parser is not auto detected
+               // return false so this parser is not auto detected
               return false;
           },
           format: function(s) {
-               / format your data for normalization
+               // format your data for normalization
               return s{% for s, translation in status %}.replace(/{{translation}}/,{{forloop.counter}}){% endfor %};
           },
-           / set type, either numeric or text
+           // set type, either numeric or text
           type: 'numeric'
       });
       $("#sortedlist").tablesorter({

--- a/nnmon/urls.py
+++ b/nnmon/urls.py
@@ -72,8 +72,6 @@ urlpatterns = patterns('',
        TemplateView.as_view(template_name='nn.html')),
    url(r'^start/$',
        TemplateView.as_view(template_name='start.html')),
-    url(r'^contact/$',
-        TemplateView.as_view(template_name='about.html')),
    url(r'^captcha/',
        include('captcha.urls')),
    url(r'^admin/',